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

(svn r23148) -Change: [NewGRF] Check the results of various callbacks for validness.

Browse Source
This commit is contained in:
frosch
2011-11-08 17:27:13 +00:00
parent ebf19d6219
commit a608cbab5d
8 changed files with 44 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/object_cmd.cpp
View File

@@ -93,7 +93,10 @@ void BuildObject(ObjectType type, TileIndex tile, CompanyID owner, Town *town, u
if (HasBit(spec->callback_mask, CBM_OBJ_COLOUR)) {
uint16 res = GetObjectCallback(CBID_OBJECT_COLOUR, o->colour, 0, spec, o, tile);
if (res != CALLBACK_FAILED) o->colour = GB(res, 0, 8);
if (res != CALLBACK_FAILED) {
if (res >= 0x100) ErrorUnknownCallbackResult(spec->grf_prop.grffile->grfid, CBID_OBJECT_COLOUR, res);
o->colour = GB(res, 0, 8);
}
}
assert(o->town != NULL);