--- a/aircraft_gui.c	Mon Feb 20 19:58:46 2006 +0000
+++ b/aircraft_gui.c	Mon Feb 20 21:49:31 2006 +0000
@@ -64,10 +64,8 @@
 
 static void DrawAircraftImage(const Vehicle *v, int x, int y, VehicleID selection)
 {
-	int image = GetAircraftImage(v, 6);
-	uint32 ormod = GetVehiclePalette(v);
-	if (v->vehstatus & VS_CRASHED) ormod = PALETTE_CRASH;
-	DrawSprite(image | ormod, x + 25, y + 10);
+	PalSpriteID pal = (v->vehstatus & VS_CRASHED) ? PALETTE_CRASH : GetVehiclePalette(v);
+	DrawSprite(GetAircraftImage(v, 6) | pal, x + 25, y + 10);
 	if (v->subtype == 0) DrawSprite(SPR_ROTOR_STOPPED, x + 25, y + 5);
 	if (v->index == selection) {
 		DrawFrameRect(x - 1, y - 1, x + 58, y + 21, 0xF, FR_BORDERONLY);

--- a/roadveh_gui.c	Mon Feb 20 19:58:46 2006 +0000
+++ b/roadveh_gui.c	Mon Feb 20 21:49:31 2006 +0000
@@ -64,10 +64,8 @@
 
 static void DrawRoadVehImage(const Vehicle *v, int x, int y, VehicleID selection)
 {
-	int image = GetRoadVehImage(v, 6);
-	uint32 ormod = GetVehiclePalette(v);
-	if (v->vehstatus & VS_CRASHED) ormod = PALETTE_CRASH;
-	DrawSprite(image | ormod, x + 14, y + 6);
+	PalSpriteID pal = (v->vehstatus & VS_CRASHED) ? PALETTE_CRASH : GetVehiclePalette(v);
+	DrawSprite(GetRoadVehImage(v, 6) | pal, x + 14, y + 6);
 
 	if (v->index == selection) {
 		DrawFrameRect(x - 1, y - 1, x + 28, y + 12, 15, FR_BORDERONLY);

--- a/ship_gui.c	Mon Feb 20 19:58:46 2006 +0000
+++ b/ship_gui.c	Mon Feb 20 21:49:31 2006 +0000
@@ -65,9 +65,7 @@
 
 static void DrawShipImage(const Vehicle *v, int x, int y, VehicleID selection)
 {
-	int image = GetShipImage(v, 6);
-	uint32 ormod = GetVehiclePalette(v);
-	DrawSprite(image | ormod, x + 32, y + 10);
+	DrawSprite(GetShipImage(v, 6) | GetVehiclePalette(v), x + 32, y + 10);
 
 	if (v->index == selection) {
 		DrawFrameRect(x - 5, y - 1, x + 67, y + 21, 15, FR_BORDERONLY);

--- a/train_gui.c	Mon Feb 20 19:58:46 2006 +0000
+++ b/train_gui.c	Mon Feb 20 21:49:31 2006 +0000
@@ -358,14 +358,11 @@
 
 	do {
 		if (--skip < 0) {
-			int image = GetTrainImage(v, 6);
-			uint32 ormod = GetVehiclePalette(v);
 			int width = v->u.rail.cached_veh_length;
 
 			if (dx + width <= count) {
-				if (v->vehstatus & VS_CRASHED)
-					ormod = PALETTE_CRASH;
-				DrawSprite(image | ormod, x + 14 + WagonLengthToPixels(dx), y + 6 + (is_custom_sprite(RailVehInfo(v->engine_type)->image_index) ? _traininfo_vehicle_pitch : 0));
+				PalSpriteID pal = (v->vehstatus & VS_CRASHED) ? PALETTE_CRASH : GetVehiclePalette(v);
+				DrawSprite(GetTrainImage(v, 6) | pal, x + 14 + WagonLengthToPixels(dx), y + 6 + (is_custom_sprite(RailVehInfo(v->engine_type)->image_index) ? _traininfo_vehicle_pitch : 0));
 				if (v->index == selection)
 					DrawFrameRect(x - 1 + WagonLengthToPixels(dx), y - 1, x + WagonLengthToPixels(dx + width) - 1, y + 12, 15, FR_BORDERONLY);
 			}