--- a/vehicle.h	Tue May 10 08:45:55 2005 +0000
+++ b/vehicle.h	Wed May 11 00:00:27 2005 +0000
@@ -142,7 +142,7 @@
 	StringID string_id; // Displayed string
 
 	UnitID unitnumber;	// unit number, for display purposes only
-	byte owner;				// which player owns the vehicle?
+	PlayerID owner;				// which player owns the vehicle?
 
 	TileIndex tile;		// Current tile index
 	TileIndex dest_tile; // Heading for this tile
@@ -188,14 +188,14 @@
 	byte tick_counter;// increased by one for each tick
 
 	/* Begin Order-stuff */
-	Order current_order;  //! The current order (+ status, like: loading)
-	byte cur_order_index; //! The index to the current order
+	Order current_order;     //! The current order (+ status, like: loading)
+	OrderID cur_order_index; //! The index to the current order
 
-	Order *orders;        //! Pointer to the first order for this vehicle
-	byte num_orders;      //! How many orders there are in the list
+	Order *orders;           //! Pointer to the first order for this vehicle
+	OrderID num_orders;      //! How many orders there are in the list
 
-	Vehicle *next_shared; //! If not NULL, this points to the next vehicle that shared the order
-	Vehicle *prev_shared; //! If not NULL, this points to the prev vehicle that shared the order
+	Vehicle *next_shared;    //! If not NULL, this points to the next vehicle that shared the order
+	Vehicle *prev_shared;    //! If not NULL, this points to the prev vehicle that shared the order
 	/* End Order-stuff */
 
 	// Boundaries for the current position in the world and a next hash link.