From e7441c39e32500b99b15cc51838e77f06a797db5 Mon Sep 17 00:00:00 2001
From: darkvater <darkvater@openttd.org>
Date: Fri, 12 Nov 2004 17:16:13 +0000
Subject: [PATCH] (svn r546) -newgrf: Use GetCustomVehicleIcon() for fetching
 sprites for vehicle selection dialogs. (Idea by octo, done by pasky).

---
 engine.h    | 4 +++-
 ship_cmd.c  | 2 +-
 train_cmd.c | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/engine.h b/engine.h
index 016b206e7d..4dc64a817d 100644
--- a/engine.h
+++ b/engine.h
@@ -91,7 +91,9 @@ int GetCustomEngineSprite(byte engine, uint16 overriding_engine, byte cargo, byt
 	GetCustomEngineSprite(v->engine_type, v->type == VEH_Train ? v->u.rail.first_engine : -1, \
 	                      _global_cargo_id[_opt.landscape][v->cargo_type], \
 	                      ((v->cargo_count + 1) * 100) / (v->cargo_cap + 1), \
-	                      !!v->cur_speed, direction);
+	                      !!v->cur_speed, direction)
+#define GetCustomVehicleIcon(v, direction) \
+	GetCustomEngineSprite(v, -1, CID_PURCHASE, 0, 0, direction)
 
 void SetCustomEngineName(int engine, char *name);
 StringID GetCustomEngineName(int engine);
diff --git a/ship_cmd.c b/ship_cmd.c
index 1cc53d45c9..5891fd2bf6 100644
--- a/ship_cmd.c
+++ b/ship_cmd.c
@@ -24,7 +24,7 @@ void DrawShipEngine(int x, int y, int engine, uint32 image_ormod)
 	int spritenum = ship_vehicle_info(engine).image_index;
 
 	if (is_custom_sprite(spritenum)) {
-		int sprite = GetCustomEngineSprite(engine, 0xffff, CID_PURCHASE, 0, 0, 6);
+		int sprite = GetCustomVehicleIcon(engine, 6);
 
 		if (sprite) {
 			DrawSprite(sprite | image_ormod, x, y);
diff --git a/train_cmd.c b/train_cmd.c
index 7d6f55151c..2d28ab63c9 100644
--- a/train_cmd.c
+++ b/train_cmd.c
@@ -174,7 +174,7 @@ void DrawTrainEngine(int x, int y, int engine, uint32 image_ormod)
 	uint32 image = 0;
 
 	if (is_custom_sprite(img)) {
-		image = GetCustomEngineSprite(engine, -1, CID_PURCHASE, 0, 0, 6);
+		image = GetCustomVehicleIcon(engine, 6);
 		if (!image) img = _engine_original_sprites[engine];
 	}
 	if (!image) {
@@ -186,7 +186,7 @@ void DrawTrainEngine(int x, int y, int engine, uint32 image_ormod)
 		x += 15;
 		image = 0;
 		if (is_custom_sprite(img)) {
-			image = GetCustomEngineSprite(engine, -1, CID_PURCHASE, 0, 0, 2);
+			image = GetCustomVehicleIcon(engine, 2);
 			if (!image) img = _engine_original_sprites[engine];
 		}
 		if (!image) {