summaryrefslogtreecommitdiff
path: root/media
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2011-11-15 20:30:58 +0000
committerrubidium <rubidium@openttd.org>2011-11-15 20:30:58 +0000
commit88aaeb4092e563f9e894608fc27d507d4693f188 (patch)
tree4a9b4a9b1156645d484403a0eadf0ae822bdd6a4 /media
parentd7d032f70a68d221e10859a61d1154e49c8866d2 (diff)
downloadopenttd-88aaeb4092e563f9e894608fc27d507d4693f188.tar.xz
(svn r23232) -Change: move the "default" overrides out of the baseset in order to ensure they all use the same values
Diffstat (limited to 'media')
-rw-r--r--media/extra_grf/openttd.nfo3
-rw-r--r--media/extra_grf/overrides.nfo13
2 files changed, 1 insertions, 15 deletions
diff --git a/media/extra_grf/openttd.nfo b/media/extra_grf/openttd.nfo
index fa46f4b30..6e2ba93b3 100644
--- a/media/extra_grf/openttd.nfo
+++ b/media/extra_grf/openttd.nfo
@@ -67,7 +67,7 @@
00
// GRF ID, must start with FF so it gets ignored
- -1 * 0 08 07 FF "OTT"
+ -1 * 0 08 08 FF "OTT"
// Name of the GRF
"OpenTTD's base graphics " 00
@@ -103,7 +103,6 @@
#include "openttdgui.nfo"
#include "airport_preview.nfo"
#include "chars.nfo"
-#include "overrides.nfo"
#include "fix_graphics.nfo"
#include "rivers/rapids.nfo"
#include "rivers/temperate.nfo"
diff --git a/media/extra_grf/overrides.nfo b/media/extra_grf/overrides.nfo
deleted file mode 100644
index 882385932..000000000
--- a/media/extra_grf/overrides.nfo
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// $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/>.
-//
- -1 * 0 0C "NewGRF overrides"
- -1 * 30 00 08 01 03 00 11
- 44 44 22 02 44 44 01 11 // UKRS addons modifies UKRS
- 6D 62 04 02 6D 62 04 01 // DBSetXL ECS extension modifies DBSetXL
- 4D 65 6f 20 4D 65 6F 17 // LV4cut modifies LV4