cpp/openttd-patchpack/source Changeset - r19122:0c3af673433e

Changeset - r19122:0c3af673433e

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

rubidium - 12 years ago 2012-02-26 08:23:32
rubidium@openttd.org

(svn r23993) -Cleanup: remove some disable directives from the NFO as they aren't needed anymore with newer GRFCodec/NFORenum

4 files changed with 6 insertions and 38 deletions:

config.lib

media/extra_grf/openttd.nfo

media/extra_grf/openttdgui.nfo

media/extra_grf/shore.nfo

0 comments (0 inline, 0 general)

config.lib

➞

Show inline comments

@@ @@ -3111,27 +3111,27 @@ detect_grfcodec() { @@
 	if [ "$with_grfcodec" = "1" ] || [ "$with_grfcodec" = "" ] || [ "$with_grfcodec" = "2" ]; then
 		grfcodec="grfcodec"
 	else
 		grfcodec="$with_grfcodec"
 	fi
 	version=`$grfcodec -v 2>/dev/null | $awk '{print $3}' | sed 's/[rM]//g;s/-/0/'`
 	ret=$?
 	log 2 "executing grfcodec -v"
 	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
 		# It was forced, so it should be found.
 		if [ "$with_grfcodec" != "1" ]; then
 			log 1 "configure: error: grfcodec couldn't be found"
 			log 1 "configure: error: you supplied '$with_grfcodec', but it seems invalid"
 			exit 1
 		fi
 		grfcodec=""
@@ @@ -3153,27 +3153,27 @@ detect_nforenum() { @@
 	if [ "$with_nforenum" = "1" ] || [ "$with_nforenum" = "" ] || [ "$with_nforenum" = "2" ]; then
 		nforenum="nforenum"
 	else
 		nforenum="$with_nforenum"
 	fi
 	version=`$nforenum -v 2>/dev/null | $awk '{print $3}' | sed 's/[rM]//g;s/-/0/'`
 	ret=$?
 	log 2 "executing nforenum -v"
 	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
 		# It was forced, so it should be found.
 		if [ "$with_nforenum" != "1" ]; then
 			log 1 "configure: error: nforenum couldn't be found"
 			log 1 "configure: error: you supplied '$with_nforenum', but it seems invalid"
 			exit 1
 		fi
 		nforenum=""

media/extra_grf/openttd.nfo

➞

Show inline comments

@@ @@ -6,31 +6,24 @@ @@
 //
 // This file is part of OpenTTD.
 // 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/>.
 //
 // Sources for OpenTTD's required base graphics.
 // Checks whether the correct version of OpenTTD is used before
 // 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.
 //
 * 4	 00 00 00 00
 //
 // Check whether we are running OTTD or not.
 //
    -1 * 0	 07 9D 04 \7= 01 00 00 00 01
    -1 * 0	 0B 03 7F FF 80 " is not for TTDPatch. Use ttdpatch(w).grf." 00

media/extra_grf/openttdgui.nfo

➞

Show inline comments

 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // 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
    -1 sprites/openttdgui.png 8bpp  66    8  64  31 -31   7 normal
    -1 sprites/openttdgui.png 8bpp 146    8  64  31 -31   7 normal
    -1 sprites/openttdgui.png 8bpp 226    8  64  31 -31   7 normal
    -1 sprites/openttdgui.png 8bpp 306    8  64  31 -31   7 normal
    -1 sprites/openttdgui.png 8bpp 386    8  64  31 -31  -1 normal
    -1 sprites/openttdgui.png 8bpp 466    8  64  39 -31  -1 normal
    -1 sprites/openttdgui.png 8bpp 546    8  64  31 -31  -1 normal
    -1 sprites/openttdgui.png 8bpp 626    8  64  23 -31   7 normal
    -1 sprites/openttdgui.png 8bpp 706    8  64  31 -31   7 normal
    -1 sprites/openttdgui.png 8bpp   2   72  64  23 -31   7 normal
@@ @@ -167,17 +161,12 @@ @@
    -1 sprites/openttdgui.png 8bpp  34  440  14  13   4   4 normal
    -1 sprites/openttdgui.png 8bpp  66  440   7   8   0   0 normal
    -1 sprites/openttdgui.png 8bpp  82  440   7   8   0   0 normal
    -1 sprites/openttdgui.png 8bpp  98  440   7   8   0   0 normal
    -1 sprites/openttdgui.png 8bpp 114  440   8   8   0   0 normal
    -1 sprites/openttdgui.png 8bpp 130  440   8   8   0   0 normal
    -1 sprites/openttdgui.png 8bpp 146  440   8   8   0   0 normal
    -1 sprites/openttdgui.png 8bpp 162  440   8   8   0   0 normal
    -1 sprites/openttdgui.png 8bpp 178  440   8  10   0   0 normal
    -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' --

media/extra_grf/shore.nfo

➞

Show inline comments

 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // 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
    -1 * 54	 0C "Missing shore tile graphics for the temperate climate"
    -1 * 3	 05 0D 0A
    -1 sprites/shore.png 8bpp  82    8  64  15 -31   0 normal
    -1 sprites/shore.png 8bpp 162    8  64  31 -31  -8 normal
    -1 sprites/shore.png 8bpp 242    8  64  23 -31   0 normal
    -1 sprites/shore.png 8bpp 322    8  64  47 -31 -16 normal
    -1 sprites/shore.png 8bpp 402    8  64  31 -31  -8 normal
    -1 sprites/shore.png 8bpp 482    8  64  39 -31  -8 normal
    -1 sprites/shore.png 8bpp 562    8  64  31 -31  -8 normal
    -1 sprites/shore.png 8bpp 642    8  64  31 -31  -8 normal
    -1 sprites/shore.png 8bpp 722    8  64  32 -31  -1 normal
@@ @@ -57,19 +50,12 @@ @@
    -1 * 44	 0C "Missing shore tile graphics for the toyland climate"
    -1 * 3	 05 0D 0A
    -1 sprites/shore.png 8bpp 290  200  64  15 -31   0 normal
    -1 sprites/shore.png 8bpp 370  200  64  31 -31  -8 normal
    -1 sprites/shore.png 8bpp 450  200  64  23 -31   0 normal
    -1 sprites/shore.png 8bpp 530  200  64  47 -31 -16 normal
    -1 sprites/shore.png 8bpp 610  200  64  31 -31  -8 normal
    -1 sprites/shore.png 8bpp 690  200  64  39 -31  -8 normal
    -1 sprites/shore.png 8bpp   2  264  64  31 -31  -8 normal
    -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' --
 //

0 comments (0 inline, 0 general)