gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-05 22:04:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r23232) -Change: move the "default" overrides out of the baseset in order to ensure they all use the same values

Browse Source
This commit is contained in:
rubidium 2011-11-15 20:30:58 +00:00
parent d7d032f70a
commit 88aaeb4092
7 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/baseset/openttd.grf
View File

Binary file not shown.

2
bin/baseset/orig_dos.obg
View File

@ -55,7 +55,7 @@ TRGI.GRF = da6a6c9dcc451eec88d79211437b76a8
TRGC.GRF = ed446637e034104c5559b32c18afe78d
TRGH.GRF = ee6616fb0e6ef6b24892c58c93d86fc9
TRGT.GRF = e30e8a398ae86c03dc534a8ac7dfb3b6
OPENTTD.GRF = 3cf1adad7d14765276e3fc1f4bd9aca2
OPENTTD.GRF = a789746234afc3f7891507d7f5696966
[origin]
default = You can find it on your Transport Tycoon Deluxe CD-ROM.

2
bin/baseset/orig_dos_de.obg
View File

@ -55,7 +55,7 @@ TRGI.GRF = da6a6c9dcc451eec88d79211437b76a8
TRGC.GRF = ed446637e034104c5559b32c18afe78d
TRGH.GRF = ee6616fb0e6ef6b24892c58c93d86fc9
TRGT.GRF = fcde1d7e8a74197d72a62695884b909e
OPENTTD.GRF = 3cf1adad7d14765276e3fc1f4bd9aca2
OPENTTD.GRF = a789746234afc3f7891507d7f5696966
[origin]
default = You can find it on your Transport Tycoon Deluxe CD-ROM.

2
bin/baseset/orig_win.obg
View File

@ -55,7 +55,7 @@ TRGIR.GRF = 0c2484ff6be49fc63a83be6ab5c38f32
TRGCR.GRF = 3668f410c761a050b5e7095a2b14879b
TRGHR.GRF = 06bf2b7a31766f048baac2ebe43457b1
TRGTR.GRF = de53650517fe661ceaa3138c6edb0eb8
OPENTTD.GRF = 3cf1adad7d14765276e3fc1f4bd9aca2
OPENTTD.GRF = a789746234afc3f7891507d7f5696966
[origin]
default = You can find it on your Transport Tycoon Deluxe CD-ROM.

3
media/extra_grf/openttd.nfo
View File

@ -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"

13
media/extra_grf/overrides.nfo
View File

@ -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

11
src/newgrf.cpp
View File

@ -8927,6 +8927,17 @@ void LoadNewGRF(uint load_index, uint file_index)
if (c->status == GCS_ACTIVATED) c->status = GCS_INITIALISED;
}
if (stage == GLS_RESERVE) {
static const uint32 overrides[][2] = {
{ 0x44442202, 0x44440111 }, // UKRS addons modifies UKRS
{ 0x6D620402, 0x6D620401 }, // DBSetXL ECS extension modifies DBSetXL
{ 0x4D656f20, 0x4D656F17 }, // LV4cut modifies LV4
};
for (size_t i = 0; i < lengthof(overrides); i++) {
SetNewGRFOverride(BSWAP32(overrides[i][0]), BSWAP32(overrides[i][1]));
}
}
uint slot = file_index;
_cur.stage = stage;