gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 14:27:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r7503) -Codechange: [NewGRF] Add bounds checking for spriteset cargo types. (NewCargo support will change this rule a bit...)

Browse Source
This commit is contained in:
peter1138 2006-12-18 10:46:06 +00:00
parent 37c45e44af
commit f010066c1b
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
newgrf.c
View File

@ -1843,6 +1843,11 @@ static void FeatureMapSpriteGroup(byte *buf, int len)
if (ctype == 0xFE) ctype = GC_DEFAULT_NA; if (ctype == 0xFE) ctype = GC_DEFAULT_NA;
if (ctype == 0xFF) ctype = GC_PURCHASE; if (ctype == 0xFF) ctype = GC_PURCHASE;
if (ctype >= NUM_GLOBAL_CID) {
grfmsg(GMS_WARN, "FeatureMapSpriteGroup: Cargo type %d out of range, skipping.", ctype);
continue;
}
statspec->spritegroup[ctype] = _cur_grffile->spritegroups[groupid]; statspec->spritegroup[ctype] = _cur_grffile->spritegroups[groupid];
} }
} }
@ -1919,6 +1924,11 @@ static void FeatureMapSpriteGroup(byte *buf, int len)
if (ctype == GC_INVALID) ctype = GC_PURCHASE; if (ctype == GC_INVALID) ctype = GC_PURCHASE;
if (ctype >= NUM_GLOBAL_CID) {
grfmsg(GMS_WARN, "FeatureMapSpriteGroup: Cargo type %d out of range, skipping.", ctype);
continue;
}
if (wagover) { if (wagover) {
SetWagonOverrideSprites(engine, ctype, _cur_grffile->spritegroups[groupid], last_engines, last_engines_count); SetWagonOverrideSprites(engine, ctype, _cur_grffile->spritegroups[groupid], last_engines, last_engines_count);
} else { } else {

5
newgrf_engine.c
View File

@ -77,6 +77,9 @@ void SetWagonOverrideSprites(EngineID engine, CargoID cargo, const SpriteGroup *
WagonOverrides *wos; WagonOverrides *wos;
WagonOverride *wo; WagonOverride *wo;
assert(engine < TOTAL_NUM_ENGINES);
assert(cargo < NUM_GLOBAL_CID);
wos = &_engine_wagon_overrides[engine]; wos = &_engine_wagon_overrides[engine];
wos->overrides_count++; wos->overrides_count++;
wos->overrides = realloc(wos->overrides, wos->overrides = realloc(wos->overrides,
@ -147,6 +150,8 @@ static const GRFFile *_engine_grf[TOTAL_NUM_ENGINES];
void SetCustomEngineSprites(EngineID engine, byte cargo, const SpriteGroup *group) void SetCustomEngineSprites(EngineID engine, byte cargo, const SpriteGroup *group)
{ {
assert(engine < TOTAL_NUM_ENGINES); assert(engine < TOTAL_NUM_ENGINES);
assert(cargo < NUM_GLOBAL_CID);
if (engine_custom_sprites[engine][cargo] != NULL) { if (engine_custom_sprites[engine][cargo] != NULL) {
DEBUG(grf, 6)("SetCustomEngineSprites: engine `%d' cargo `%d' already has group -- replacing.", engine, cargo); DEBUG(grf, 6)("SetCustomEngineSprites: engine `%d' cargo `%d' already has group -- replacing.", engine, cargo);
} }