Mercurial > hg > openttd

changeset 13604:3e06828e076b draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r18128) -Codechange: rename GetVehicleListHeight to GetVehicleHeight as it has nothing to do with the height of the vehicle lists.
author rubidium <rubidium@openttd.org>
date Mon, 16 Nov 2009 20:58:38 +0000
parents d035d13afeb3
children 1cb90620906a
files src/build_vehicle_gui.cpp src/depot_gui.cpp src/vehicle_gui.h
diffstat 3 files changed, 11 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/build_vehicle_gui.cpp
+++ b/src/build_vehicle_gui.cpp
@@ -42,7 +42,7 @@
  */
 uint GetEngineListHeight(VehicleType type)
 {
-	return max<uint>(FONT_HEIGHT_NORMAL + WD_MATRIX_TOP + WD_MATRIX_BOTTOM, GetVehicleListHeight(type));
+	return max<uint>(FONT_HEIGHT_NORMAL + WD_MATRIX_TOP + WD_MATRIX_BOTTOM, GetVehicleHeight(type));
 }
 
 enum BuildVehicleWidgets {
--- a/src/depot_gui.cpp
+++ b/src/depot_gui.cpp
@@ -196,7 +196,7 @@
 			_block_sizes[VEH_AIRCRAFT].width = max(74U, max_width);
 			break;
 	}
-	_block_sizes[type].height = max(GetVehicleListHeight(type), max_height);
+	_block_sizes[type].height = max(GetVehicleHeight(type), max_height);
 }
 
 /** Set the size of the blocks in the window so we can be sure that they are big enough for the vehicle sprites in the current game.
@@ -204,10 +204,10 @@
 void InitDepotWindowBlockSizes()
 {
 	_block_sizes[VEH_TRAIN].width = 1;
-	_block_sizes[VEH_TRAIN].height = GetVehicleListHeight(VEH_TRAIN);
+	_block_sizes[VEH_TRAIN].height = GetVehicleHeight(VEH_TRAIN);
 
 	_block_sizes[VEH_ROAD].width = 56;
-	_block_sizes[VEH_ROAD].height = GetVehicleListHeight(VEH_ROAD);
+	_block_sizes[VEH_ROAD].height = GetVehicleHeight(VEH_ROAD);
 
 	InitBlocksizeForShipAircraft(VEH_SHIP);
 	InitBlocksizeForShipAircraft(VEH_AIRCRAFT);
@@ -255,7 +255,7 @@
 	void DrawVehicleInDepot(const Vehicle *v, int x, int y, int left, int right) const
 	{
 		bool free_wagon = false;
-		int sprite_y = y + this->resize.step_height - GetVehicleListHeight(v->type);
+		int sprite_y = y + this->resize.step_height - GetVehicleHeight(v->type);
 
 		switch (v->type) {
 			case VEH_TRAIN: {
--- a/src/vehicle_gui.h
+++ b/src/vehicle_gui.h
@@ -86,8 +86,12 @@
 void ShowVehicleListWindow(CompanyID company, VehicleType vehicle_type, StationID station);
 void ShowVehicleListWindow(CompanyID company, VehicleType vehicle_type, TileIndex depot_tile);
 
-
-static inline uint GetVehicleListHeight(VehicleType type)
+/**
+ * Get the height of a single vehicle in the GUIs.
+ * @param type the vehicle type to look at
+ * @return the height
+ */
+static inline uint GetVehicleHeight(VehicleType type)
 {
 	return (type == VEH_TRAIN || type == VEH_ROAD) ? 14 : 24;
 }