cpp/openttd-patchpack/source Changeset - r7477:f74673aa99bf

Changeset - r7477:f74673aa99bf

Parent rev.

Child rev.

[Not reviewed]

master

0 10 0

rubidium - 17 years ago 2007-08-26 20:43:22
rubidium@openttd.org

(svn r10984) -Codechange: unify the way one can get the current speed in the same forwat so we can display it.

10 files changed with 26 insertions and 16 deletions:

src/aircraft.h

src/aircraft_gui.cpp

src/roadveh.h

src/roadveh_gui.cpp

src/ship.h

src/ship_gui.cpp

src/train.h

src/train_cmd.cpp

src/train_gui.cpp

src/vehicle.h

0 comments (0 inline, 0 general)

src/aircraft.h

➞

Show inline comments

@@ @@ -137,6 +137,7 @@ struct Aircraft : public Vehicle { @@
 	WindowClass GetVehicleListWindowClass() const { return WC_AIRCRAFT_LIST; }
 	bool IsPrimaryVehicle() const { return IsNormalAircraft(this); }
 	int GetImage(Direction direction) const;
 	int GetDisplaySpeed() const { return this->cur_speed * 10 / 16; }
 	void Tick();
 };

src/aircraft_gui.cpp

➞

Show inline comments

@@ @@ -283,14 +283,14 @@ static void AircraftViewWndProc(Window * @@
 			switch (v->current_order.type) {
 			case OT_GOTO_STATION: {
 				SetDParam(0, v->current_order.dest);
-				SetDParam(1, v->cur_speed * 10 / 16);
+				SetDParam(1, v->GetDisplaySpeed());
 				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 * 10 / 16);
+				SetDParam(1, v->GetDisplaySpeed());
 				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 {
@@ @@ -305,7 +305,7 @@ static void AircraftViewWndProc(Window * @@
 			default:
 				if (v->num_orders == 0) {
 					str = STR_NO_ORDERS + _patches.vehicle_speed;
-					SetDParam(0, v->cur_speed * 10 / 16);
+					SetDParam(0, v->GetDisplaySpeed());
 				} else {
 					str = STR_EMPTY;
+				}

src/roadveh.h

➞

Show inline comments

@@ @@ -82,6 +82,7 @@ struct RoadVehicle : public Vehicle { @@
 	bool IsPrimaryVehicle() const { return IsRoadVehFront(this); }
 	bool HasFront() const { return true; }
 	int GetImage(Direction direction) const;
 	int GetDisplaySpeed() const { return this->cur_speed * 10 / 32; }
 	void Tick();
 };

src/roadveh_gui.cpp

➞

Show inline comments

@@ @@ -297,14 +297,14 @@ static void RoadVehViewWndProc(Window *w @@
 			switch (v->current_order.type) {
 			case OT_GOTO_STATION: {
 				SetDParam(0, v->current_order.dest);
-				SetDParam(1, v->cur_speed * 10 / 32);
+				SetDParam(1, v->GetDisplaySpeed());
 				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 * 10 / 32);
+				SetDParam(1, v->GetDisplaySpeed());
 				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 {
@@ @@ -320,7 +320,7 @@ static void RoadVehViewWndProc(Window *w @@
 			default:
 				if (v->num_orders == 0) {
 					str = STR_NO_ORDERS + _patches.vehicle_speed;
-					SetDParam(0, v->cur_speed * 10 / 32);
+					SetDParam(0, v->GetDisplaySpeed());
 				} else {
 					str = STR_EMPTY;
+				}

src/ship.h

➞

Show inline comments

@@ @@ -47,6 +47,7 @@ struct Ship: public Vehicle { @@
 	void PlayLeaveStationSound() const;
 	bool IsPrimaryVehicle() const { return true; }
 	int GetImage(Direction direction) const;
 	int GetDisplaySpeed() const { return this->cur_speed * 10 / 32; }
 	void Tick();
 };

src/ship_gui.cpp

➞

Show inline comments

@@ @@ -219,14 +219,14 @@ static void ShipViewWndProc(Window *w, W @@
 				switch (v->current_order.type) {
 					case OT_GOTO_STATION: {
 						SetDParam(0, v->current_order.dest);
-						SetDParam(1, v->cur_speed * 10 / 32);
+						SetDParam(1, v->GetDisplaySpeed());
 						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 * 10 / 32);
+						SetDParam(1, v->GetDisplaySpeed());
 						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 {
@@ @@ -242,7 +242,7 @@ static void ShipViewWndProc(Window *w, W @@
 					default:
 						if (v->num_orders == 0) {
 							str = STR_NO_ORDERS + _patches.vehicle_speed;
-							SetDParam(0, v->cur_speed * 10 / 32);
+							SetDParam(0, v->GetDisplaySpeed());
 						} else {
 							str = STR_EMPTY;
+						}

src/train.h

➞

Show inline comments

@@ @@ -273,6 +273,7 @@ struct Train : public Vehicle { @@
 	bool IsPrimaryVehicle() const { return IsFrontEngine(this); }
 	bool HasFront() const { return true; }
 	int GetImage(Direction direction) const;
 	int GetDisplaySpeed() const { return this->cur_speed * 10 / 16; }
 	void Tick();
 };

src/train_cmd.cpp

➞

Show inline comments

@@ @@ -301,7 +301,7 @@ static bool TrainShouldStop(const Vehicl @@
 static int GetTrainAcceleration(Vehicle *v, bool mode)
+{
 	int max_speed = 2000;
-	int speed = v->cur_speed * 10 / 16; //[mph]
+	int speed = v->GetDisplaySpeed(); //[mph]
 	int curvecount[2] = {0, 0};
 	/*first find the curve speed limit */

src/train_gui.cpp

➞

Show inline comments

@@ @@ -179,14 +179,14 @@ static void TrainViewWndProc(Window *w, @@
 		} else if (v->breakdown_ctr == 1) {
 			str = STR_885C_BROKEN_DOWN;
 		} else if (v->vehstatus & VS_STOPPED) {
-			if (v->u.rail.last_speed == 0) {
+			if (v->cur_speed == 0) {
 				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 * 10 / 16);
+				SetDParam(0, v->GetDisplaySpeed());
 				str = STR_TRAIN_STOPPING + _patches.vehicle_speed;
+			}
 		} else {
@@ @@ -194,7 +194,7 @@ static void TrainViewWndProc(Window *w, @@
 			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 * 10 / 16);
+				SetDParam(1, v->GetDisplaySpeed());
 			} break;
 			case OT_GOTO_DEPOT: {
@@ @@ -205,7 +205,7 @@ static void TrainViewWndProc(Window *w, @@
 				} else {
 					str = STR_HEADING_FOR_TRAIN_DEPOT_SERVICE + _patches.vehicle_speed;
+				}
-				SetDParam(1, v->u.rail.last_speed * 10 / 16);
+				SetDParam(1, v->GetDisplaySpeed());
 			} break;
 			case OT_LOADING:
@@ @@ -216,14 +216,14 @@ static void TrainViewWndProc(Window *w, @@
 			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 * 10 / 16);
+				SetDParam(1, v->GetDisplaySpeed());
 				break;
+			}
 			default:
 				if (v->num_orders == 0) {
 					str = STR_NO_ORDERS + _patches.vehicle_speed;
-					SetDParam(0, v->u.rail.last_speed * 10 / 16);
+					SetDParam(0, v->GetDisplaySpeed());
 				} else {
 					str = STR_EMPTY;
+				}

src/vehicle.h

➞

Show inline comments

@@ @@ -415,6 +415,12 @@ struct Vehicle : PoolItem<Vehicle, Vehic @@
 	virtual int GetImage(Direction direction) const { return 0; }
 	/**
 	 * Gets the speed in mph that can be sent into SetDParam for string processing.
 	 * @return the vehicle's speed
 	 */
 	virtual int GetDisplaySpeed() const { return 0; }
 	/**
 	 * Calls the tick handler of the vehicle
 	 */
 	virtual void Tick() {};

0 comments (0 inline, 0 general)