Mercurial > hg > openttd

changeset 5334:47713bcb1cd4 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r7496) -Codechange: [NewGRF] Skip processing a GRF if it deactivated itself.
author peter1138 <peter1138@openttd.org>
date Thu, 14 Dec 2006 19:10:46 +0000
parents 0654c028aff5
children 44d93a124f3b
files newgrf.c
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/newgrf.c
+++ b/newgrf.c
@@ -2957,6 +2957,9 @@
 			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;
 		}
 	}
 }