summaryrefslogtreecommitdiff
path: root/media
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2012-02-26 08:23:32 +0000
committerrubidium <rubidium@openttd.org>2012-02-26 08:23:32 +0000
commit7893ef7b1c78d38914d86831f20733f95b737bac (patch)
treedeb1576e3c1dbf795a82d5793fb846c5f9962a45 /media
parent974a08bf60b430bce59c0ff5b41cd0876db60a37 (diff)
downloadopenttd-7893ef7b1c78d38914d86831f20733f95b737bac.tar.xz
(svn r23993) -Cleanup: remove some disable directives from the NFO as they aren't needed anymore with newer GRFCodec/NFORenum
Diffstat (limited to 'media')
-rw-r--r--media/extra_grf/openttd.nfo7
-rw-r--r--media/extra_grf/openttdgui.nfo11
-rw-r--r--media/extra_grf/shore.nfo14
3 files changed, 0 insertions, 32 deletions
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
@@ -15,13 +15,6 @@
//
//
-// -- 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.
//
0 * 4 00 00 00 00
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
@@ -6,12 +6,6 @@
// 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
@@ -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
@@ -7,13 +7,6 @@
// 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
@@ -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' --
-//