mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r4459) - Newstations: check pointer for NULL before using it.

release/0.5
peter1138 2006-04-17 18:35:44 +00:00
parent 3a06cbf195
commit 71b530dfe2
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
newgrf_station.c
View File

@ -117,6 +117,7 @@ const StationSpec *GetCustomStation(StationClassID sclass, uint station)
static const RealSpriteGroup *ResolveStationSpriteGroup(const SpriteGroup *spg, const Station *st) static const RealSpriteGroup *ResolveStationSpriteGroup(const SpriteGroup *spg, const Station *st)
{ {
if (spg == NULL) return NULL;
switch (spg->type) { switch (spg->type) {
case SGT_REAL: case SGT_REAL:
return &spg->g.real; return &spg->g.real;
@ -183,6 +184,7 @@ static const RealSpriteGroup *ResolveStationSpriteGroup(const SpriteGroup *spg,
uint32 GetCustomStationRelocation(const StationSpec *spec, const Station *st, byte ctype) uint32 GetCustomStationRelocation(const StationSpec *spec, const Station *st, byte ctype)
{ {
const RealSpriteGroup *rsg = ResolveStationSpriteGroup(spec->spritegroup[ctype], st); const RealSpriteGroup *rsg = ResolveStationSpriteGroup(spec->spritegroup[ctype], st);
if (rsg == NULL) return 0;
if (rsg->sprites_per_set != 0) { if (rsg->sprites_per_set != 0) {
if (rsg->loading_count != 0) return rsg->loading[0]->g.result.result; if (rsg->loading_count != 0) return rsg->loading[0]->g.result.result;