summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaedhros <maedhros@openttd.org>2007-06-17 11:01:58 +0000
committermaedhros <maedhros@openttd.org>2007-06-17 11:01:58 +0000
commit5a9c7b58998dea385365f90c8fccd26263a2355e (patch)
treeb72ed4623a1077147916efa8b13f08240c249fae
parent94bd08fc17ec5d18325be743e0f7a56a52f10e82 (diff)
downloadopenttd-5a9c7b58998dea385365f90c8fccd26263a2355e.tar.xz
(svn r10178) -Fix: Don't deactivate newgrf files when skipping the rest of the file during the initialisation stage.
-rw-r--r--src/newgrf.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index dd29076d9..83031e5fa 100644
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -3279,7 +3279,9 @@ static void SkipIf(byte *buf, int len)
_skip_sprites = -1;
/* If an action 8 hasn't been encountered yet, disable the grf. */
- if (_cur_grfconfig->status != GCS_ACTIVATED) _cur_grfconfig->status = GCS_DISABLED;
+ if (_cur_grfconfig->status != GCS_ACTIVATED && _cur_grfconfig->status != GCS_INITIALISED) {
+ _cur_grfconfig->status = GCS_DISABLED;
+ }
}
}