petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r13351) -Codechange: disable warnings about unused variable for builds without asserts

Browse Source
This commit is contained in:
smatz
2008-06-01 15:08:14 +00:00
parent 10d6f6c5b8
commit ed462507b2
6 changed files with 12 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/newgrf_engine.cpp
View File

@@ -886,23 +886,19 @@ SpriteID GetCustomEngineSprite(EngineID engine, const Vehicle *v, Direction dire
SpriteID GetRotorOverrideSprite(EngineID engine, const Vehicle *v, bool info_view)
{
#if !defined(NDEBUG) || defined(WITH_ASSERT)
const Engine *e = GetEngine(engine);
#endif /* !defined(NDEBUG) || defined(WITH_ASSERT) */
const SpriteGroup *group;
ResolverObject object;
assert(e->type == VEH_AIRCRAFT);
/* Only valid for helicopters */
assert(e->type == VEH_AIRCRAFT);
assert(!(e->u.air.subtype & AIR_CTOL));
ResolverObject object;
NewVehicleResolver(&object, engine, v);
object.info_view = info_view;
group = GetWagonOverrideSpriteSet(engine, CT_DEFAULT, engine);
const SpriteGroup *group = GetWagonOverrideSpriteSet(engine, CT_DEFAULT, engine);
group = Resolve(group, &object);
if (group == NULL || group->type != SGT_RESULT) return 0;