cpp/openttd-patchpack/source Changeset - r5874:80b07bf2962e

Changeset - r5874:80b07bf2962e

Parent rev.

Child rev.

[Not reviewed]

master

0 6 0

peter1138 - 18 years ago 2007-01-30 21:10:04
peter1138@openttd.org

(svn r8464) -Revert (r4322): Change back to converting to mph in the GUI code, as 1 mph == 1.6 km/h is too far out for some people.

6 files changed with 23 insertions and 23 deletions:

src/aircraft_gui.cpp

src/build_vehicle_gui.cpp

src/roadveh_gui.cpp

src/ship_gui.cpp

src/strings.cpp

src/train_gui.cpp

0 comments (0 inline, 0 general)

src/aircraft_gui.cpp

➞

Show inline comments

@@ @@ -258,20 +258,20 @@ static void AircraftViewWndProc(Window * @@
 		} else if (v->vehstatus & VS_STOPPED) {
 			str = STR_8861_STOPPED;
 		} else {
 			switch (v->current_order.type) {
 			case OT_GOTO_STATION: {
 				SetDParam(0, v->current_order.dest);
-				SetDParam(1, v->cur_speed * 128 / 10);
+				SetDParam(1, v->cur_speed * 8);
 				str = STR_HEADING_FOR_STATION + _patches.vehicle_speed;
 			} break;
 			case OT_GOTO_DEPOT: {
 				/* Aircrafts always go to a station, even if you say depot */
 				SetDParam(0, v->current_order.dest);
-				SetDParam(1, v->cur_speed * 128 / 10);
+				SetDParam(1, v->cur_speed * 8);
 				if (HASBIT(v->current_order.flags, OFB_HALT_IN_DEPOT) && !HASBIT(v->current_order.flags, OFB_PART_OF_ORDERS)) {
 					str = STR_HEADING_FOR_HANGAR + _patches.vehicle_speed;
 				} else {
 					str = STR_HEADING_FOR_HANGAR_SERVICE + _patches.vehicle_speed;
+				}
 			} break;
@@ @@ -280,13 +280,13 @@ static void AircraftViewWndProc(Window * @@
 				str = STR_882F_LOADING_UNLOADING;
 				break;
 			default:
 				if (v->num_orders == 0) {
 					str = STR_NO_ORDERS + _patches.vehicle_speed;
-					SetDParam(0, v->cur_speed * 128 / 10);
+					SetDParam(0, v->cur_speed * 8);
 				} else {
 					str = STR_EMPTY;
+				}
 				break;
+			}
+		}

src/build_vehicle_gui.cpp

➞

Show inline comments

@@ @@ -375,13 +375,13 @@ static int DrawRailWagonPurchaseInfo(int @@
 	SetDParam(1, (_cargoc.weights[rvi->cargo_type] * rvi->capacity >> 4) + rvi->weight);
 	DrawString(x, y, STR_PURCHASE_INFO_WEIGHT_CWEIGHT, 0);
 	y += 10;
 	/* Wagon speed limit, displayed if above zero */
 	if (rvi->max_speed > 0 && _patches.wagon_speed_limits) {
 		SetDParam(0, rvi->max_speed);
+		SetDParam(0, rvi->max_speed * 10 / 16);
 		DrawString(x,y, STR_PURCHASE_INFO_SPEED, 0);
 		y += 10;
+	}
 	return y;
+}
@@ @@ -394,13 +394,13 @@ static int DrawRailEnginePurchaseInfo(in @@
 	SetDParam(0, rvi->base_cost * (_price.build_railvehicle >> 3) >> 5);
 	SetDParam(1, rvi->weight << multihead);
 	DrawString(x,y, STR_PURCHASE_INFO_COST_WEIGHT, 0);
 	y += 10;
 	/* Max speed - Engine power */
 	SetDParam(0, rvi->max_speed);
+	SetDParam(0, rvi->max_speed * 10 / 16);
 	SetDParam(1, rvi->power << multihead);
 	DrawString(x,y, STR_PURCHASE_INFO_SPEED_POWER, 0);
 	y += 10;
 	/* Max tractive effort - not applicable if old acceleration or maglev */
 	if (_patches.realistic_acceleration && rvi->railtype != RAILTYPE_MAGLEV) {
@@ @@ -429,13 +429,13 @@ static int DrawRailEnginePurchaseInfo(in @@
 static int DrawRoadVehPurchaseInfo(int x, int y, EngineID engine_number, const RoadVehicleInfo *rvi)
+{
 	bool refittable = (_engine_info[engine_number].refit_mask != 0);
 	/* Purchase cost - Max speed */
 	SetDParam(0, rvi->base_cost * (_price.roadveh_base>>3)>>5);
-	SetDParam(1, rvi->max_speed / 2);
+	SetDParam(1, rvi->max_speed * 10 / 32);
 	DrawString(x, y, STR_PURCHASE_INFO_COST_SPEED, 0);
 	y += 10;
 	/* Running cost */
 	SetDParam(0, rvi->running_cost * _price.roadveh_running >> 8);
 	DrawString(x, y, STR_PURCHASE_INFO_RUNNINGCOST, 0);
@@ @@ -453,13 +453,13 @@ static int DrawRoadVehPurchaseInfo(int x @@
 /* Draw ship specific details */
 static int DrawShipPurchaseInfo(int x, int y, EngineID engine_number, const ShipVehicleInfo *svi)
+{
 	/* Purchase cost - Max speed */
 	SetDParam(0, svi->base_cost * (_price.ship_base>>3)>>5);
-	SetDParam(1, svi->max_speed / 2);
+	SetDParam(1, svi->max_speed * 10 / 32);
 	DrawString(x,y, STR_PURCHASE_INFO_COST_SPEED, 0);
 	y += 10;
 	/* Cargo type + capacity */
 	SetDParam(0, svi->cargo_type);
 	SetDParam(1, svi->capacity);
@@ @@ -479,13 +479,13 @@ static int DrawShipPurchaseInfo(int x, i @@
 static int DrawAircraftPurchaseInfo(int x, int y, EngineID engine_number, const AircraftVehicleInfo *avi)
+{
 	CargoID cargo;
 	/* Purchase cost - Max speed */
 	SetDParam(0, avi->base_cost * (_price.aircraft_base>>3)>>5);
-	SetDParam(1, avi->max_speed * 128 / 10);
+	SetDParam(1, avi->max_speed * 8);
 	DrawString(x, y, STR_PURCHASE_INFO_COST_SPEED, 0);
 	y += 10;
 	/* Cargo capacity */
 	cargo = FindFirstRefittableCargo(engine_number);
 	if (cargo == CT_INVALID || cargo == CT_PASSENGERS) {

src/roadveh_gui.cpp

➞

Show inline comments

@@ @@ -203,20 +203,20 @@ static void RoadVehViewWndProc(Window *w @@
 		} else if (v->vehstatus & VS_STOPPED) {
 			str = STR_8861_STOPPED;
 		} else {
 			switch (v->current_order.type) {
 			case OT_GOTO_STATION: {
 				SetDParam(0, v->current_order.dest);
-				SetDParam(1, v->cur_speed / 2);
+				SetDParam(1, v->cur_speed * 10 / 32);
 				str = STR_HEADING_FOR_STATION + _patches.vehicle_speed;
 			} break;
 			case OT_GOTO_DEPOT: {
 				Depot *depot = GetDepot(v->current_order.dest);
 				SetDParam(0, depot->town_index);
-				SetDParam(1, v->cur_speed / 2);
+				SetDParam(1, v->cur_speed * 10 / 32);
 				if (HASBIT(v->current_order.flags, OFB_HALT_IN_DEPOT) && !HASBIT(v->current_order.flags, OFB_PART_OF_ORDERS)) {
 					str = STR_HEADING_FOR_ROAD_DEPOT + _patches.vehicle_speed;
 				} else {
 					str = STR_HEADING_FOR_ROAD_DEPOT_SERVICE + _patches.vehicle_speed;
+				}
 			} break;
@@ @@ -226,13 +226,13 @@ static void RoadVehViewWndProc(Window *w @@
 				str = STR_882F_LOADING_UNLOADING;
 				break;
 			default:
 				if (v->num_orders == 0) {
 					str = STR_NO_ORDERS + _patches.vehicle_speed;
-					SetDParam(0, v->cur_speed / 2);
+					SetDParam(0, v->cur_speed * 10 / 32);
 				} else {
 					str = STR_EMPTY;
+				}
 				break;
+			}
+		}

src/ship_gui.cpp

➞

Show inline comments

@@ @@ -210,20 +210,20 @@ static void ShipViewWndProc(Window *w, W @@
 			} else if (v->vehstatus & VS_STOPPED) {
 				str = STR_8861_STOPPED;
 			} else {
 				switch (v->current_order.type) {
 					case OT_GOTO_STATION: {
 						SetDParam(0, v->current_order.dest);
-						SetDParam(1, v->cur_speed / 2);
+						SetDParam(1, v->cur_speed * 10 / 32);
 						str = STR_HEADING_FOR_STATION + _patches.vehicle_speed;
 					} break;
 					case OT_GOTO_DEPOT: {
 						Depot *depot = GetDepot(v->current_order.dest);
 						SetDParam(0, depot->town_index);
-						SetDParam(1, v->cur_speed / 2);
+						SetDParam(1, v->cur_speed * 10 / 32);
 						if (HASBIT(v->current_order.flags, OFB_HALT_IN_DEPOT) && !HASBIT(v->current_order.flags, OFB_PART_OF_ORDERS)) {
 							str = STR_HEADING_FOR_SHIP_DEPOT + _patches.vehicle_speed;
 						} else {
 							str = STR_HEADING_FOR_SHIP_DEPOT_SERVICE + _patches.vehicle_speed;
+						}
 					} break;
@@ @@ -233,13 +233,13 @@ static void ShipViewWndProc(Window *w, W @@
 						str = STR_882F_LOADING_UNLOADING;
 						break;
 					default:
 						if (v->num_orders == 0) {
 							str = STR_NO_ORDERS + _patches.vehicle_speed;
-							SetDParam(0, v->cur_speed / 2);
+							SetDParam(0, v->cur_speed * 10 / 32);
 						} else {
 							str = STR_EMPTY;
+						}
 						break;
+				}
+			}

src/strings.cpp

➞

Show inline comments

@@ @@ -484,27 +484,27 @@ typedef struct Units { @@
 	StringID force;    ///< String for force
 } Units;
 /* Unit conversions */
 static const Units units[] = {
 	{ // Imperial (Original, mph, hp, metric ton, litre, kN)
-,  4, STR_UNITS_VELOCITY_IMPERIAL,
+,  0, STR_UNITS_VELOCITY_IMPERIAL,
 ,  0, STR_UNITS_POWER_IMPERIAL,
 ,  0, STR_UNITS_WEIGHT_SHORT_METRIC, STR_UNITS_WEIGHT_LONG_METRIC,
 ,  0, STR_UNITS_VOLUME_SHORT_METRIC, STR_UNITS_VOLUME_LONG_METRIC,
 ,  0, STR_UNITS_FORCE_SI,
 	},
 	{ // Metric (km/h, hp, metric ton, litre, kN)
-,  0, STR_UNITS_VELOCITY_METRIC,
+,  6, STR_UNITS_VELOCITY_METRIC,
 ,  0, STR_UNITS_POWER_METRIC,
 ,  0, STR_UNITS_WEIGHT_SHORT_METRIC, STR_UNITS_WEIGHT_LONG_METRIC,
 ,  0, STR_UNITS_VOLUME_SHORT_METRIC, STR_UNITS_VOLUME_LONG_METRIC,
 ,  0, STR_UNITS_FORCE_SI,
 	},
 	{ // SI (m/s, kilowatt, kilogram, cubic metres, kilonewton)
-, 10, STR_UNITS_VELOCITY_SI,
+, 12, STR_UNITS_VELOCITY_SI,
 , 10, STR_UNITS_POWER_SI,
 ,  0, STR_UNITS_WEIGHT_SHORT_SI, STR_UNITS_WEIGHT_LONG_SI,
 ,  0, STR_UNITS_VOLUME_SHORT_SI, STR_UNITS_VOLUME_LONG_SI,
 ,  0, STR_UNITS_FORCE_SI,
 	},
 };

src/train_gui.cpp

➞

Show inline comments

@@ @@ -180,50 +180,50 @@ static void TrainViewWndProc(Window *w, @@
 				if (v->u.rail.cached_power == 0) {
 					str = STR_TRAIN_NO_POWER;
 				} else {
 					str = STR_8861_STOPPED;
+				}
 			} else {
 				SetDParam(0, v->u.rail.last_speed);
+				SetDParam(0, v->u.rail.last_speed * 10 / 16);
 				str = STR_TRAIN_STOPPING + _patches.vehicle_speed;
+			}
 		} else {
 			switch (v->current_order.type) {
 			case OT_GOTO_STATION: {
 				str = STR_HEADING_FOR_STATION + _patches.vehicle_speed;
 				SetDParam(0, v->current_order.dest);
 				SetDParam(1, v->u.rail.last_speed);
+				SetDParam(1, v->u.rail.last_speed * 10 / 16);
 			} break;
 			case OT_GOTO_DEPOT: {
 				Depot *dep = GetDepot(v->current_order.dest);
 				SetDParam(0, dep->town_index);
 				if (HASBIT(v->current_order.flags, OFB_HALT_IN_DEPOT) && !HASBIT(v->current_order.flags, OFB_PART_OF_ORDERS)) {
 					str = STR_HEADING_FOR_TRAIN_DEPOT + _patches.vehicle_speed;
 				} else {
 					str = STR_HEADING_FOR_TRAIN_DEPOT_SERVICE + _patches.vehicle_speed;
+				}
 				SetDParam(1, v->u.rail.last_speed);
+				SetDParam(1, v->u.rail.last_speed * 10 / 16);
 			} break;
 			case OT_LOADING:
 			case OT_LEAVESTATION:
 				str = STR_882F_LOADING_UNLOADING;
 				break;
 			case OT_GOTO_WAYPOINT: {
 				SetDParam(0, v->current_order.dest);
 				str = STR_HEADING_FOR_WAYPOINT + _patches.vehicle_speed;
 				SetDParam(1, v->u.rail.last_speed);
+				SetDParam(1, v->u.rail.last_speed * 10 / 16);
 				break;
+			}
 			default:
 				if (v->num_orders == 0) {
 					str = STR_NO_ORDERS + _patches.vehicle_speed;
 					SetDParam(0, v->u.rail.last_speed);
+					SetDParam(0, v->u.rail.last_speed * 10 / 16);
 				} else {
 					str = STR_EMPTY;
+				}
 				break;
+			}
+		}
@@ @@ -422,13 +422,13 @@ static void DrawTrainDetailsWindow(Windo @@
 	SetDParam(0, (v->age + 365 < v->max_age) ? STR_AGE : STR_AGE_RED);
 	SetDParam(2, v->max_age / 366);
 	SetDParam(3, GetTrainRunningCost(v) >> 8);
 	DrawString(x, 15, STR_885D_AGE_RUNNING_COST_YR, 0);
 	SetDParam(2, v->u.rail.cached_max_speed);
+	SetDParam(2, v->u.rail.cached_max_speed * 10 / 16);
 	SetDParam(1, v->u.rail.cached_power);
 	SetDParam(0, v->u.rail.cached_weight);
 	SetDParam(3, v->u.rail.cached_max_te / 1000);
 	DrawString(x, 25, (_patches.realistic_acceleration && v->u.rail.railtype != RAILTYPE_MAGLEV) ?
 		STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :
 		STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED, 0);

0 comments (0 inline, 0 general)