summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2006-12-14 19:10:46 +0000
committerpeter1138 <peter1138@openttd.org>2006-12-14 19:10:46 +0000
commitb14c526c9295582323ab3d8dd10a40319d09fe20 (patch)
tree31a659031641ab06a028a70a22ead0910ef7bd20
parent5772da18b2b6b43fcfa3e970a8c68fd8653509d0 (diff)
downloadopenttd-b14c526c9295582323ab3d8dd10a40319d09fe20.tar.xz
(svn r7496) -Codechange: [NewGRF] Skip processing a GRF if it deactivated itself.
-rw-r--r--newgrf.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/newgrf.c b/newgrf.c
index cdebe68f1..7a294c655 100644
--- a/newgrf.c
+++ b/newgrf.c
@@ -2957,6 +2957,9 @@ static void GRFInhibit(byte *buf, int len)
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;
}
}
}