diff options
author | peter1138 <peter1138@openttd.org> | 2006-12-18 10:46:06 +0000 |
---|---|---|
committer | peter1138 <peter1138@openttd.org> | 2006-12-18 10:46:06 +0000 |
commit | f010066c1b43489cc2e88df038c6c3e568114738 (patch) | |
tree | d0112ab3cc649e05c63c4ef8170ee40a5e356cb4 /newgrf_engine.c | |
parent | 37c45e44af207b1853a701363a49a298c5924893 (diff) | |
download | openttd-f010066c1b43489cc2e88df038c6c3e568114738.tar.xz |
(svn r7503) -Codechange: [NewGRF] Add bounds checking for spriteset cargo types. (NewCargo support will change this rule a bit...)
Diffstat (limited to 'newgrf_engine.c')
-rw-r--r-- | newgrf_engine.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/newgrf_engine.c b/newgrf_engine.c index cb126c432..328ed3290 100644 --- a/newgrf_engine.c +++ b/newgrf_engine.c @@ -77,6 +77,9 @@ void SetWagonOverrideSprites(EngineID engine, CargoID cargo, const SpriteGroup * WagonOverrides *wos; WagonOverride *wo; + assert(engine < TOTAL_NUM_ENGINES); + assert(cargo < NUM_GLOBAL_CID); + wos = &_engine_wagon_overrides[engine]; wos->overrides_count++; 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) { assert(engine < TOTAL_NUM_ENGINES); + assert(cargo < NUM_GLOBAL_CID); + if (engine_custom_sprites[engine][cargo] != NULL) { DEBUG(grf, 6)("SetCustomEngineSprites: engine `%d' cargo `%d' already has group -- replacing.", engine, cargo); } |