Mercurial > hg > openttd

changeset 5369:ec386774e647 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r7554) -Fix (r7496): In Action 0xE, don't deactivate the current GRF (to be ported to 0.5)
author peter1138 <peter1138@openttd.org>
date Sun, 24 Dec 2006 19:20:28 +0000
parents 20a3839d1e01
children 3af42941e434
files newgrf.c
diffstat 1 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/newgrf.c
+++ b/newgrf.c
@@ -2966,13 +2966,10 @@
 		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;
 		}
 	}
 }