mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r7495) -Fix (r7354): [NewGRF] Deactivate the target GRF, not the current GRF.

This commit is contained in:
peter1138 2006-12-14 15:14:29 +00:00
parent dd42d07d2a
commit 5772da18b2
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
newgrf.c
View File

@ -2950,13 +2950,13 @@ static void GRFInhibit(byte *buf, int len)
for (i = 0; i < num; i++) {
uint32 grfid = grf_load_dword(&buf);
GRFFile *file = GetFileByGRFID(grfid);
GRFConfig *file = GetGRFConfig(grfid);
/* Unset activation flag */
if (file != NULL) {
grfmsg(GMS_NOTICE, "GRFInhibit: Deactivating file ``%s''", file->filename);
SETBIT(_cur_grfconfig->flags, GCF_DISABLED);
CLRBIT(_cur_grfconfig->flags, GCF_ACTIVATED);
SETBIT(file->flags, GCF_DISABLED);
CLRBIT(file->flags, GCF_ACTIVATED);
}
}
}

2
newgrf_config.c
View File

@ -266,7 +266,7 @@ const GRFConfig *FindGRFConfig(uint32 grfid, uint8 *md5sum)
/* Retrieve a NewGRF from the current config by its grfid */
const GRFConfig *GetGRFConfig(uint32 grfid)
GRFConfig *GetGRFConfig(uint32 grfid)
{
GRFConfig *c;

2
newgrf_config.h
View File

@ -41,7 +41,7 @@ extern GRFConfig *_grfconfig_static;
void ScanNewGRFFiles(void);
const GRFConfig *FindGRFConfig(uint32 grfid, uint8 *md5sum);
const GRFConfig *GetGRFConfig(uint32 grfid);
GRFConfig *GetGRFConfig(uint32 grfid);
void ClearGRFConfig(GRFConfig *config);
void ClearGRFConfigList(GRFConfig *config);
void ResetGRFConfig(bool defaults);