summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2010-11-10 17:04:32 +0000
committerrubidium <rubidium@openttd.org>2010-11-10 17:04:32 +0000
commit2df2c021dfcc990245345fcf1e7d4f86b4aba4f8 (patch)
tree56a95a890dc74670bb17405c7a10abf8df8fb490
parent016b9f289f1284eda23ba85aa41e5bad38344b4c (diff)
downloadopenttd-2df2c021dfcc990245345fcf1e7d4f86b4aba4f8.tar.xz
(svn r21131) -Codechange: show a (debug) warning when the GRF ID of a NewGRF differs between the file scan and other stages
-rw-r--r--src/newgrf.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index d8932c9f5..0cdeb6178 100644
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -5230,7 +5230,11 @@ static void GRFInfo(ByteReader *buf)
return;
}
- _cur_grffile->grfid = grfid;
+ if (_cur_grffile->grfid != grfid) {
+ DEBUG(grf, 0, "GRFInfo: GRFID %08X in FILESCAN stage does not match GRFID %08X in INIT/RESERVE/ACTIVATION stage", BSWAP32(_cur_grffile->grfid), BSWAP32(grfid));
+ _cur_grffile->grfid = grfid;
+ }
+
_cur_grffile->grf_version = version;
_cur_grfconfig->status = _cur_stage < GLS_RESERVE ? GCS_INITIALISED : GCS_ACTIVATED;