--- a/src/aircraft_cmd.cpp	Mon Mar 31 16:07:50 2008 +0000
+++ b/src/aircraft_cmd.cpp	Tue Apr 01 14:03:20 2008 +0000
@@ -54,17 +54,17 @@
 				case FLYING:     x = MKIT(24, 24, -1, -1); break;
 				default:         x = MKIT( 2,  2, -1, -1); break;
 			}
-			this->z_height = 5;
+			this->z_extent = 5;
 			break;
-		case AIR_SHADOW:     this->z_height = 1; x = MKIT(2,  2,  0,  0); break;
-		case AIR_ROTOR:      this->z_height = 1; x = MKIT(2,  2, -1, -1); break;
+		case AIR_SHADOW:     this->z_extent = 1; x = MKIT(2,  2,  0,  0); break;
+		case AIR_ROTOR:      this->z_extent = 1; x = MKIT(2,  2, -1, -1); break;
 	}
 #undef MKIT
 
 	this->x_offs        = GB(x,  0, 8);
 	this->y_offs        = GB(x,  8, 8);
-	this->sprite_width  = GB(x, 16, 8);
-	this->sprite_height = GB(x, 24, 8);
+	this->x_extent      = GB(x, 16, 8);
+	this->y_extent      = GB(x, 24, 8);
 }
 
 

--- a/src/disaster_cmd.cpp	Mon Mar 31 16:07:50 2008 +0000
+++ b/src/disaster_cmd.cpp	Tue Apr 01 14:03:20 2008 +0000
@@ -1061,7 +1061,7 @@
 {
 	this->x_offs        = -1;
 	this->y_offs        = -1;
-	this->sprite_width  =  2;
-	this->sprite_height =  2;
-	this->z_height      =  5;
+	this->x_extent      =  2;
+	this->y_extent      =  2;
+	this->z_extent      =  5;
 }

--- a/src/oldloader.cpp	Mon Mar 31 16:07:50 2008 +0000
+++ b/src/oldloader.cpp	Tue Apr 01 14:03:20 2008 +0000
@@ -1155,8 +1155,8 @@
 	OCL_SVAR(  OC_UINT8, Vehicle, z_pos ),
 	OCL_SVAR(  OC_UINT8, Vehicle, direction ),
 	OCL_NULL( 2 ),         ///< x_offs and y_offs, calculated automatically
-	OCL_NULL( 2 ),         ///< sprite_width and sprite_height, calculated automatically
-	OCL_NULL( 1 ),         ///< z_height, calculated automatically
+	OCL_NULL( 2 ),         ///< x_extent and y_extent, calculated automatically
+	OCL_NULL( 1 ),         ///< z_extent, calculated automatically
 
 	OCL_SVAR(  OC_UINT8, Vehicle, owner ),
 	OCL_SVAR(   OC_TILE, Vehicle, tile ),

--- a/src/roadveh_cmd.cpp	Mon Mar 31 16:07:50 2008 +0000
+++ b/src/roadveh_cmd.cpp	Tue Apr 01 14:03:20 2008 +0000
@@ -585,9 +585,9 @@
 	uint32 x = _delta_xy_table[direction];
 	this->x_offs        = GB(x,  0, 8);
 	this->y_offs        = GB(x,  8, 8);
-	this->sprite_width  = GB(x, 16, 8);
-	this->sprite_height = GB(x, 24, 8);
-	this->z_height      = 6;
+	this->x_extent      = GB(x, 16, 8);
+	this->y_extent      = GB(x, 24, 8);
+	this->z_extent      = 6;
 }
 
 static void ClearCrashedStation(Vehicle *v)

--- a/src/ship_cmd.cpp	Mon Mar 31 16:07:50 2008 +0000
+++ b/src/ship_cmd.cpp	Tue Apr 01 14:03:20 2008 +0000
@@ -322,9 +322,9 @@
 	uint32 x = _delta_xy_table[direction];
 	this->x_offs        = GB(x,  0, 8);
 	this->y_offs        = GB(x,  8, 8);
-	this->sprite_width  = GB(x, 16, 8);
-	this->sprite_height = GB(x, 24, 8);
-	this->z_height      = 6;
+	this->x_extent      = GB(x, 16, 8);
+	this->y_extent      = GB(x, 24, 8);
+	this->z_extent      = 6;
 }
 
 void RecalcShipStuff(Vehicle *v)

--- a/src/train_cmd.cpp	Mon Mar 31 16:07:50 2008 +0000
+++ b/src/train_cmd.cpp	Tue Apr 01 14:03:20 2008 +0000
@@ -1529,9 +1529,9 @@
 	uint32 x = _delta_xy_table[direction];
 	this->x_offs        = GB(x,  0, 8);
 	this->y_offs        = GB(x,  8, 8);
-	this->sprite_width  = GB(x, 16, 8);
-	this->sprite_height = GB(x, 24, 8);
-	this->z_height      = 6;
+	this->x_extent      = GB(x, 16, 8);
+	this->y_extent      = GB(x, 24, 8);
+	this->z_extent      = 6;
 }
 
 static void UpdateVarsAfterSwap(Vehicle *v)

--- a/src/vehicle.cpp	Mon Mar 31 16:07:50 2008 +0000
+++ b/src/vehicle.cpp	Tue Apr 01 14:03:20 2008 +0000
@@ -767,7 +767,7 @@
 	}
 
 	AddSortableSpriteToDraw(image, pal, v->x_pos + v->x_offs, v->y_pos + v->y_offs,
-		v->sprite_width, v->sprite_height, v->z_height, v->z_pos, (v->vehstatus & VS_SHADOW) != 0);
+		v->x_extent, v->y_extent, v->z_extent, v->z_pos, (v->vehstatus & VS_SHADOW) != 0);
 }
 
 void ViewportAddVehicles(DrawPixelInfo *dpi)
@@ -3234,9 +3234,9 @@
 {
 	this->x_offs        = 0;
 	this->y_offs        = 0;
-	this->sprite_width  = 1;
-	this->sprite_height = 1;
-	this->z_height      = 1;
+	this->x_extent      = 1;
+	this->y_extent      = 1;
+	this->z_extent      = 1;
 }
 
 void StopAllVehicles()

--- a/src/vehicle_base.h	Mon Mar 31 16:07:50 2008 +0000
+++ b/src/vehicle_base.h	Tue Apr 01 14:03:20 2008 +0000
@@ -223,9 +223,9 @@
 	                         // 0xfd == custom sprite, 0xfe == custom second head sprite
 	                         // 0xff == reserved for another custom sprite
 	uint16 cur_image;        // sprite number for this vehicle
-	byte sprite_width;       // width of vehicle sprite
-	byte sprite_height;      // height of vehicle sprite
-	byte z_height;           // z-height of vehicle sprite
+	byte x_extent;           // x-extent of vehicle bounding box
+	byte y_extent;           // y-extent of vehicle bounding box
+	byte z_extent;           // z-extent of vehicle bounding box
 	int8 x_offs;             // x offset for vehicle sprite
 	int8 y_offs;             // y offset for vehicle sprite
 	EngineID engine_type;