From 7893ef7b1c78d38914d86831f20733f95b737bac Mon Sep 17 00:00:00 2001
From: rubidium <rubidium@openttd.org>
Date: Sun, 26 Feb 2012 08:23:32 +0000
Subject: [PATCH] (svn r23993) -Cleanup: remove some disable directives from
 the NFO as they aren't needed anymore with newer GRFCodec/NFORenum

---
 config.lib                     | 12 ++++++------
 media/extra_grf/openttd.nfo    |  7 -------
 media/extra_grf/openttdgui.nfo | 11 -----------
 media/extra_grf/shore.nfo      | 14 --------------
 4 files changed, 6 insertions(+), 38 deletions(-)

diff --git a/config.lib b/config.lib
index d3de424866..422db110b8 100644
--- a/config.lib
+++ b/config.lib
@@ -3120,9 +3120,9 @@ detect_grfcodec() {
 	log 2 "  returned $version"
 	log 2 "  exit code $ret"
 
-	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "904" ]; then
-		if [ -n "$version" ] && [ "$version" -lt "904" ]; then
-			log 1 "checking grfcodec... needs at least version 5.1.4 (r904), disabled"
+	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "913" ]; then
+		if [ -n "$version" ] && [ "$version" -lt "913" ]; then
+			log 1 "checking grfcodec... needs at least version 5.1.4 (r913), disabled"
 		else
 			log 1 "checking grfcodec... not found"
 		fi
@@ -3162,9 +3162,9 @@ detect_nforenum() {
 	log 2 "  returned $version"
 	log 2 "  exit code $ret"
 
-	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "846" ]; then
-		if [ -n "$version" ] && [ "$version" -lt "846" ]; then
-			log 1 "checking nforenum... needs at least version 5.1.3 (r846), disabled"
+	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "913" ]; then
+		if [ -n "$version" ] && [ "$version" -lt "913" ]; then
+			log 1 "checking nforenum... needs at least version 5.1.4 (r913), disabled"
 		else
 			log 1 "checking nforenum... not found"
 		fi
diff --git a/media/extra_grf/openttd.nfo b/media/extra_grf/openttd.nfo
index dea7bd8035..e93b2066fb 100644
--- a/media/extra_grf/openttd.nfo
+++ b/media/extra_grf/openttd.nfo
@@ -14,13 +14,6 @@
 // allowing it to be used.
 //
 
-//
-// -- NFO Renum 'settings' --
-// Do not make nforenum warn about the fact that we use a reserved GRF ID
-// @@WARNING DISABLE 101
-// -- End of NFO Renum 'settings' --
-//
-
 //
 // Number of sprites, it is wrong, but GRFcodec automagically gets it right.
 //
diff --git a/media/extra_grf/openttdgui.nfo b/media/extra_grf/openttdgui.nfo
index 6fb2b7c5fa..c0127a9750 100644
--- a/media/extra_grf/openttdgui.nfo
+++ b/media/extra_grf/openttdgui.nfo
@@ -5,12 +5,6 @@
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 // See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
-//
-// -- NFO Renum 'settings' --
-// Do not make nforenum warn about the fact that we use more sprites.
-// We are the 'authority' on how many sprites may be used.
-// @@WARNING DISABLE 60
-// -- End of NFO Renum 'settings' --
 //
    -1 * 0	 0C "OpenTTD GUI graphics"
    -1 * 3	 05 15 A2
@@ -176,8 +170,3 @@
    -1 sprites/openttdgui.png 8bpp 194  440  13  10   0  -2 normal
    -1 sprites/openttdgui.png 8bpp 215  440   9  10   0   0 normal
    -1 sprites/openttdgui.png 8bpp 232  440   8  10   0   0 normal
-
-// -- NFO Renum 'settings' --
-// Undo disabling the warning
-// @@WARNING ENABLE 60
-// -- End of NFO Renum 'settings' --
diff --git a/media/extra_grf/shore.nfo b/media/extra_grf/shore.nfo
index 1ba298245f..70fae8f4d8 100644
--- a/media/extra_grf/shore.nfo
+++ b/media/extra_grf/shore.nfo
@@ -5,13 +5,6 @@
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 // See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
-//
-
-//
-// -- NFO Renum 'settings' --
-// Do not make nforenum warn about the fact that we use an incorrect number of shores
-// @@WARNING DISABLE 60
-// -- End of NFO Renum 'settings' --
 //
 
    -1 * 6	 07 83 01 \7! 00 0C
@@ -66,10 +59,3 @@
    -1 sprites/shore.png 8bpp  82  264  64  31 -31  -8 normal
    -1 sprites/shore.png 8bpp 162  264  64  32 -31  -1 normal
    -1 sprites/shore.png 8bpp 242  264  64  31 -31  -8 normal
-
-//
-// -- NFO Renum 'settings' --
-// Reset warning about incorrect number of shores
-// @@WARNING ENABLE 60
-// -- End of NFO Renum 'settings' --
-//