--- a/src/vehicle_gui.h	Sun Apr 27 10:19:41 2008 +0000
+++ b/src/vehicle_gui.h	Sun Apr 27 18:05:48 2008 +0000
@@ -10,6 +10,7 @@
 #include "order_type.h"
 #include "station_type.h"
 #include "engine_type.h"
+#include "vehicle_base.h"
 
 void DrawVehicleProfitButton(const Vehicle *v, int x, int y);
 void ShowVehicleRefitWindow(const Vehicle *v, VehicleOrderID order);
@@ -80,8 +81,6 @@
 
 void ShowBuildVehicleWindow(TileIndex tile, VehicleType type);
 
-void ChangeVehicleViewWindow(const Vehicle *from_v, const Vehicle *to_v);
-
 uint ShowAdditionalText(int x, int y, uint w, EngineID engine);
 uint ShowRefitOptionsList(int x, int y, uint w, EngineID engine);
 
@@ -94,6 +93,26 @@
 
 void DrawVehicleImage(const Vehicle *v, int x, int y, VehicleID selection, int count, int skip);
 
+
+/* ChangeVehicleViewWindow() moves all windows for one vehicle to another vehicle.
+ * For ease of use it can be called with both Vehicle pointers and VehicleIDs. */
+void ChangeVehicleViewWindow(VehicleID from_index, VehicleID to_index);
+
+static inline void ChangeVehicleViewWindow(const Vehicle *from_v, VehicleID to_index)
+{
+	ChangeVehicleViewWindow(from_v->index, to_index);
+}
+
+static inline void ChangeVehicleViewWindow(VehicleID from_index, const Vehicle *to_v)
+{
+	ChangeVehicleViewWindow(from_index, to_v->index);
+}
+
+static inline void ChangeVehicleViewWindow(const Vehicle *from_v, const Vehicle *to_v)
+{
+	ChangeVehicleViewWindow(from_v->index, to_v->index);
+}
+
 static inline uint GetVehicleListHeight(VehicleType type)
 {
 	return (type == VEH_TRAIN || type == VEH_ROAD) ? 14 : 24;