diff options
| author | smatz <smatz@openttd.org> | 2008-06-01 15:08:14 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2008-06-01 15:08:14 +0000 |
| commit | ed462507b26229732ebe45ea0a2583809ff90ee8 (patch) | |
| tree | a69876051417b114e25b34280ada013d1522cee1 /src/newgrf_engine.cpp | |
| parent | 10d6f6c5b841f8fb161a4715c74a043c11a70107 (diff) | |
| download | openttd-ed462507b26229732ebe45ea0a2583809ff90ee8.tar.xz | |
(svn r13351) -Codechange: disable warnings about unused variable for builds without asserts
Diffstat (limited to 'src/newgrf_engine.cpp')
| -rw-r--r-- | src/newgrf_engine.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/newgrf_engine.cpp b/src/newgrf_engine.cpp index 039c2a186..e0355d3d4 100644 --- a/src/newgrf_engine.cpp +++ b/src/newgrf_engine.cpp @@ -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; |