From 82fe2885abb359c813908b0c844533bfec2c2b22 Mon Sep 17 00:00:00 2001
From: peter1138 <peter1138@openttd.org>
Date: Wed, 9 Jan 2008 20:23:12 +0000
Subject: (svn r11799) -Codechange: no need to special-case helicopter rotor
 'overrides'

---
 src/newgrf.cpp | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'src/newgrf.cpp')

diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index c47a74452..aec41b4f6 100644
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -2842,14 +2842,7 @@ static void VehicleMapSpriteGroup(byte *buf, byte feature, uint8 idcount, uint8
 			}
 
 			if (wagover) {
-				/* If the ID for this action 3 is the same as the vehicle ID,
- * this indicates we have a helicopter rotor override. */
-				if (feature == GSF_AIRCRAFT && engine == last_engines[i]) {
-					SetRotorOverrideSprites(engine, _cur_grffile->spritegroups[groupid]);
-				} else {
-					/* TODO: No multiple cargo types per vehicle yet. --pasky */
-					SetWagonOverrideSprites(engine, CT_DEFAULT, _cur_grffile->spritegroups[groupid], last_engines, last_engines_count);
-				}
+				SetWagonOverrideSprites(engine, CT_DEFAULT, _cur_grffile->spritegroups[groupid], last_engines, last_engines_count);
 			} else {
 				SetCustomEngineSprites(engine, CT_DEFAULT, _cur_grffile->spritegroups[groupid]);
 				SetEngineGRF(engine, _cur_grffile);
@@ -5085,7 +5078,6 @@ static void ResetNewGRFData()
 
 	/* Unload sprite group data */
 	UnloadWagonOverrides();
-	UnloadRotorOverrideSprites();
 	UnloadCustomEngineSprites();
 	UnloadCustomEngineNames();
 	ResetEngineListOrder();
-- 
cgit v1.2.3-54-g00ecf