From 7893ef7b1c78d38914d86831f20733f95b737bac Mon Sep 17 00:00:00 2001 From: rubidium Date: Sun, 26 Feb 2012 08:23:32 +0000 Subject: (svn r23993) -Cleanup: remove some disable directives from the NFO as they aren't needed anymore with newer GRFCodec/NFORenum --- media/extra_grf/openttd.nfo | 7 ------- media/extra_grf/openttdgui.nfo | 11 ----------- media/extra_grf/shore.nfo | 14 -------------- 3 files changed, 32 deletions(-) (limited to 'media') diff --git a/media/extra_grf/openttd.nfo b/media/extra_grf/openttd.nfo index dea7bd803..e93b2066f 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 6fb2b7c5f..c0127a975 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 . -// -// -- 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 1ba298245..70fae8f4d 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 . -// - -// -// -- 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' -- -// -- cgit v1.2.3-54-g00ecf