summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2006-12-24 19:20:28 +0000
committerpeter1138 <peter1138@openttd.org>2006-12-24 19:20:28 +0000
commit5cf3b8a1a92d604d2d3652d6b91bb8eeaf9031ac (patch)
tree562f9341a5acc5de0e0484dce4bfb472f3a2f51f
parentc820ae2502f68398d3f6276ba93e4ccdb4a31146 (diff)
downloadopenttd-5cf3b8a1a92d604d2d3652d6b91bb8eeaf9031ac.tar.xz
(svn r7554) -Fix (r7496): In Action 0xE, don't deactivate the current GRF (to be ported to 0.5)
-rw-r--r--newgrf.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/newgrf.c b/newgrf.c
index 73b900960..a664778f1 100644
--- a/newgrf.c
+++ b/newgrf.c
@@ -2966,13 +2966,10 @@ static void GRFInhibit(byte *buf, int len)
GRFConfig *file = GetGRFConfig(grfid);
/* Unset activation flag */
- if (file != NULL) {
+ if (file != NULL && file != _cur_grfconfig) {
grfmsg(GMS_NOTICE, "GRFInhibit: Deactivating file ``%s''", file->filename);
SETBIT(file->flags, GCF_DISABLED);
CLRBIT(file->flags, GCF_ACTIVATED);
-
- /* Skip processing if the GRF deactivated itself */
- if (file == _cur_grfconfig) _skip_sprites = -1;
}
}
}