diff options
author | peter1138 <peter1138@openttd.org> | 2008-01-09 20:23:12 +0000 |
---|---|---|
committer | peter1138 <peter1138@openttd.org> | 2008-01-09 20:23:12 +0000 |
commit | 82fe2885abb359c813908b0c844533bfec2c2b22 (patch) | |
tree | c671b18415d1ae7bdcd56b8ae5dbfe0fc5461c4c /src/newgrf_engine.cpp | |
parent | 6375ea065b32e6dc79cd05c5d137c4c8c17f32e8 (diff) | |
download | openttd-82fe2885abb359c813908b0c844533bfec2c2b22.tar.xz |
(svn r11799) -Codechange: no need to special-case helicopter rotor 'overrides'
Diffstat (limited to 'src/newgrf_engine.cpp')
-rw-r--r-- | src/newgrf_engine.cpp | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/src/newgrf_engine.cpp b/src/newgrf_engine.cpp index cb7b84c11..8dea0c7ea 100644 --- a/src/newgrf_engine.cpp +++ b/src/newgrf_engine.cpp @@ -125,33 +125,6 @@ void UnloadCustomEngineSprites() memset(_engine_grf, 0, sizeof(_engine_grf)); } -static const SpriteGroup *heli_rotor_custom_sprites[NUM_AIRCRAFT_ENGINES]; - -/** Load a rotor override sprite group for an aircraft */ -void SetRotorOverrideSprites(EngineID engine, const SpriteGroup *group) -{ - assert(engine >= AIRCRAFT_ENGINES_INDEX); - assert(engine < AIRCRAFT_ENGINES_INDEX + NUM_AIRCRAFT_ENGINES); - - if (heli_rotor_custom_sprites[engine - AIRCRAFT_ENGINES_INDEX] != NULL) { - grfmsg(6, "SetRotorOverrideSprites: engine %d already has group -- replacing.", engine); - } - heli_rotor_custom_sprites[engine - AIRCRAFT_ENGINES_INDEX] = group; -} - -/** Unload all rotor override sprite groups */ -void UnloadRotorOverrideSprites() -{ - EngineID engine; - - /* Starting at AIRCRAFT_ENGINES_INDEX may seem pointless, but it means - * the context of EngineID is correct */ - for (engine = AIRCRAFT_ENGINES_INDEX; engine < AIRCRAFT_ENGINES_INDEX + NUM_AIRCRAFT_ENGINES; engine++) { - heli_rotor_custom_sprites[engine - AIRCRAFT_ENGINES_INDEX] = NULL; - } -} - - /** * Tie a GRFFile entry to an engine, to allow us to retrieve GRF parameters * etc during a game. @@ -898,7 +871,7 @@ SpriteID GetRotorOverrideSprite(EngineID engine, const Vehicle *v, bool info_vie object.info_view = info_view; - group = heli_rotor_custom_sprites[engine - AIRCRAFT_ENGINES_INDEX]; + group = GetWagonOverrideSpriteSet(engine, CT_DEFAULT, engine); group = Resolve(group, &object); if (group == NULL || group->type != SGT_RESULT) return 0; |