dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
peter1138
2006-12-24 19:20:28 +00:00
parent c820ae2502
commit 5cf3b8a1a9
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
newgrf.c
View File

@@ -2966,13 +2966,10 @@ static void GRFInhibit(byte *buf, int len)
GRFConfig *file = GetGRFConfig(grfid); GRFConfig *file = GetGRFConfig(grfid);
/* Unset activation flag */ /* Unset activation flag */
if (file != NULL) { if (file != NULL && file != _cur_grfconfig) {
grfmsg(GMS_NOTICE, "GRFInhibit: Deactivating file ``%s''", file->filename); grfmsg(GMS_NOTICE, "GRFInhibit: Deactivating file ``%s''", file->filename);
SETBIT(file->flags, GCF_DISABLED); SETBIT(file->flags, GCF_DISABLED);
CLRBIT(file->flags, GCF_ACTIVATED); CLRBIT(file->flags, GCF_ACTIVATED);
/* Skip processing if the GRF deactivated itself */
if (file == _cur_grfconfig) _skip_sprites = -1;
} }
} }
} }