cpp/openttd-patchpack/source Changeset - r8706:7a24f8b401f5

Changeset - r8706:7a24f8b401f5

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

glx - 16 years ago 2008-03-17 22:13:00
glx@openttd.org

(svn r12380) -Fix: update train acceleration and max speed after setting cached value to ensure the correct max speed is used with disabled real acceleration

1 file changed with 5 insertions and 9 deletions:

src/train_cmd.cpp

0 comments (0 inline, 0 general)

src/train_cmd.cpp

➞

Show inline comments

@@ @@ -291,7 +291,10 @@ void TrainConsistChanged(Vehicle* v) @@
 	/* recalculate cached weights and power too (we do this *after* the rest, so it is known which wagons are powered and need extra weight added) */
 	TrainCargoChanged(v);
 	if (IsFrontEngine(v)) InvalidateWindow(WC_VEHICLE_DETAILS, v->index);
 	if (IsFrontEngine(v)) {
 		UpdateTrainAcceleration(v);
 		InvalidateWindow(WC_VEHICLE_DETAILS, v->index);
+	}
+}
 enum AccelType {
@@ @@ -792,7 +795,6 @@ CommandCost CmdBuildRailVehicle(TileInde @@
+			}
 			TrainConsistChanged(v);
 			UpdateTrainAcceleration(v);
 			UpdateTrainGroupID(v);
 			if (!HasBit(p2, 1)) { // check if the cars should be added to the new vehicle
@@ @@ -1247,7 +1249,6 @@ CommandCost CmdMoveRailVehicle(TileIndex @@
 			TrainConsistChanged(src_head);
 			UpdateTrainGroupID(src_head);
 			if (IsFrontEngine(src_head)) {
 				UpdateTrainAcceleration(src_head);
 				/* Update the refit button and window */
 				InvalidateWindow(WC_VEHICLE_REFIT, src_head->index);
 				InvalidateWindowWidget(WC_VEHICLE_VIEW, src_head->index, VVW_WIDGET_REFIT_VEH);
@@ @@ -1261,7 +1262,6 @@ CommandCost CmdMoveRailVehicle(TileIndex @@
 			TrainConsistChanged(dst_head);
 			UpdateTrainGroupID(dst_head);
 			if (IsFrontEngine(dst_head)) {
 				UpdateTrainAcceleration(dst_head);
 				/* Update the refit button and window */
 				InvalidateWindowWidget(WC_VEHICLE_VIEW, dst_head->index, VVW_WIDGET_REFIT_VEH);
 				InvalidateWindow(WC_VEHICLE_REFIT, dst_head->index);
@@ @@ -1434,10 +1434,7 @@ CommandCost CmdSellRailWagon(TileIndex t @@
 					NormaliseTrainConsist(first);
 					TrainConsistChanged(first);
 					UpdateTrainGroupID(first);
 					if (IsFrontEngine(first)) {
 						InvalidateWindow(WC_VEHICLE_REFIT, first->index);
 						UpdateTrainAcceleration(first);
+					}
 					if (IsFrontEngine(first)) InvalidateWindow(WC_VEHICLE_REFIT, first->index);
+				}
@@ @@ -1503,7 +1500,6 @@ CommandCost CmdSellRailWagon(TileIndex t @@
 				NormaliseTrainConsist(first);
 				TrainConsistChanged(first);
 				UpdateTrainGroupID(first);
 				if (IsFrontEngine(first)) UpdateTrainAcceleration(first);
 				InvalidateWindow(WC_VEHICLE_REFIT, first->index);
+			}
 		} break;

0 comments (0 inline, 0 general)