(svn r16303) -Codechange: Use the question mark as default sprite when creating vehicles, instead of arbitrary sprites not related to the vehicle. (though that also applies to the question mark)

5 files changed, 8 insertions, 7 deletions

diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp
index 6c2ac6695..c46d1ff69 100644
--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -383,7 +383,7 @@ CommandCost CmdBuildAircraft(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
 		v->date_of_last_service = _date;
 		v->build_year = u->build_year = _cur_year;
 
-		v->cur_image = u->cur_image = 0xEA0;
+		v->cur_image = u->cur_image = SPR_IMG_QUERY;
 
 		v->random_bits = VehicleRandomBits();
 		u->random_bits = VehicleRandomBits();
diff --git a/src/articulated_vehicles.cpp b/src/articulated_vehicles.cpp
index 6ef5162e9..44c8656f1 100644
--- a/src/articulated_vehicles.cpp
+++ b/src/articulated_vehicles.cpp
@@ -9,6 +9,7 @@
 #include "vehicle_func.h"
 
 #include "table/strings.h"
+#include "table/sprites.h"
 
 static const uint MAX_ARTICULATED_PARTS = 100; ///< Maximum of articulated parts per vehicle, i.e. when to abort calling the articulated vehicle callback.
 
@@ -365,7 +366,7 @@ void AddArticulatedParts(Vehicle *first, VehicleType type)
 		u->max_age = 0;
 		u->engine_type = engine_type;
 		u->value = 0;
-		u->cur_image = 0xAC2;
+		u->cur_image = SPR_IMG_QUERY;
 		u->random_bits = VehicleRandomBits();
 
 		if (flip_image) u->spritenum++;
diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp
index d23d28881..f5a03541e 100644
--- a/src/roadveh_cmd.cpp
+++ b/src/roadveh_cmd.cpp
@@ -238,7 +238,7 @@ CommandCost CmdBuildRoadVeh(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
 		v->date_of_last_service = _date;
 		v->build_year = _cur_year;
 
-		v->cur_image = 0xC15;
+		v->cur_image = SPR_IMG_QUERY;
 		v->random_bits = VehicleRandomBits();
 		SetRoadVehFront(v);
 
diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp
index 4abf9e0da..3a49d66c7 100644
--- a/src/ship_cmd.cpp
+++ b/src/ship_cmd.cpp
@@ -789,7 +789,7 @@ CommandCost CmdBuildShip(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
 		v->service_interval = _settings_game.vehicle.servint_ships;
 		v->date_of_last_service = _date;
 		v->build_year = _cur_year;
-		v->cur_image = 0x0E5E;
+		v->cur_image = SPR_IMG_QUERY;
 		v->random_bits = VehicleRandomBits();
 
 		v->vehicle_flags = 0;
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
index f4e17da34..05627c090 100644
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -699,7 +699,7 @@ static CommandCost CmdBuildRailWagon(EngineID engine, TileIndex tile, DoCommandF
 		v->u.rail.railtype = rvi->railtype;
 
 		v->build_year = _cur_year;
-		v->cur_image = 0xAC2;
+		v->cur_image = SPR_IMG_QUERY;
 		v->random_bits = VehicleRandomBits();
 
 		v->group_id = DEFAULT_GROUP;
@@ -761,7 +761,7 @@ static void AddRearEngineToMultiheadedTrain(Vehicle *v)
 	u->u.rail.railtype = v->u.rail.railtype;
 	u->engine_type = v->engine_type;
 	u->build_year = v->build_year;
-	u->cur_image = 0xAC2;
+	u->cur_image = SPR_IMG_QUERY;
 	u->random_bits = VehicleRandomBits();
 	SetMultiheaded(v);
 	SetMultiheaded(u);
@@ -856,7 +856,7 @@ CommandCost CmdBuildRailVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1,
 		v->service_interval = _settings_game.vehicle.servint_trains;
 		v->date_of_last_service = _date;
 		v->build_year = _cur_year;
-		v->cur_image = 0xAC2;
+		v->cur_image = SPR_IMG_QUERY;
 		v->random_bits = VehicleRandomBits();
 
 //		v->vehicle_flags = 0;