petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r14979) -Fix: Disable a NewGRF from loading if it contains multiple Action 8s

Browse Source
This commit is contained in:
peter1138
2009-01-10 19:30:40 +00:00
parent 238c0a5d1f
commit 510e0ce083
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/newgrf.cpp
View File

@@ -4140,6 +4140,16 @@ static void GRFInfo(byte *buf, size_t len)
uint32 grfid = grf_load_dword(&buf);
const char *name = grf_load_string(&buf, len - 6);
if (_cur_stage < GLS_RESERVE && _cur_grfconfig->status != GCS_UNKNOWN) {
_cur_grfconfig->status = GCS_DISABLED;
_cur_grfconfig->error = CallocT<GRFError>(1);
_cur_grfconfig->error->severity = STR_NEWGRF_ERROR_MSG_FATAL;
_cur_grfconfig->error->message = STR_NEWGRF_ERROR_MULTIPLE_ACTION_8;
_skip_sprites = -1;
return;
}
_cur_grffile->grfid = grfid;
_cur_grffile->grf_version = version;
_cur_grfconfig->status = _cur_stage < GLS_RESERVE ? GCS_INITIALISED : GCS_ACTIVATED;