mirror of
https://github.com/JGRennison/OpenTTD-patches.git
synced 2024-10-31 15:20:10 +00:00
(svn r7554) -Fix (r7496): In Action 0xE, don't deactivate the current GRF (to be ported to 0.5)
This commit is contained in:
parent
2d769ff46b
commit
e93c00aa46
5
newgrf.c
5
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user