# HG changeset patch # User frosch # Date 1212797196 0 # Node ID cd5463104792ab1e74fa6ea40fd9b4652f21d02f # Parent 4cc81b7cf711edd69aaf01b305e0c3ac6949fb94 (svn r13397) -Fix: Do not crash when resolving vehicle sprite groups with zero sprites. diff -r 4cc81b7cf711 -r cd5463104792 src/newgrf_engine.cpp --- a/src/newgrf_engine.cpp Fri Jun 06 19:27:09 2008 +0000 +++ b/src/newgrf_engine.cpp Sat Jun 07 00:06:36 2008 +0000 @@ -880,7 +880,7 @@ NewVehicleResolver(&object, engine, v); group = Resolve(GetVehicleSpriteGroup(engine, v), &object); - if (group == NULL || group->type != SGT_RESULT) return 0; + if (group == NULL || group->type != SGT_RESULT || group->g.result.num_sprites == 0) return 0; return group->g.result.sprite + (direction % group->g.result.num_sprites); } @@ -903,7 +903,7 @@ const SpriteGroup *group = GetWagonOverrideSpriteSet(engine, CT_DEFAULT, engine); group = Resolve(group, &object); - if (group == NULL || group->type != SGT_RESULT) return 0; + if (group == NULL || group->type != SGT_RESULT || group->g.result.num_sprites == 0) return 0; if (v == NULL) return group->g.result.sprite;