(svn r7554) -Fix (r7496): In Action 0xE, don't deactivate the current GRF (to be ported to 0.5)

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;
 		}
 	}
 }