Mercurial > hg > openttd
changeset 5333:0654c028aff5 draft
(svn r7495) -Fix (r7354): [NewGRF] Deactivate the target GRF, not the current GRF.
| author | peter1138 <peter1138@openttd.org> |
|---|---|
| date | Thu, 14 Dec 2006 15:14:29 +0000 |
| parents | 4c523eb85ced |
| children | 47713bcb1cd4 |
| files | newgrf.c newgrf_config.c newgrf_config.h |
| diffstat | 3 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/newgrf.c +++ b/newgrf.c @@ -2950,13 +2950,13 @@ 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); } } }
--- a/newgrf_config.c +++ b/newgrf_config.c @@ -266,7 +266,7 @@ /* Retrieve a NewGRF from the current config by its grfid */ -const GRFConfig *GetGRFConfig(uint32 grfid) +GRFConfig *GetGRFConfig(uint32 grfid) { GRFConfig *c;
--- a/newgrf_config.h +++ b/newgrf_config.h @@ -41,7 +41,7 @@ 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);