cpp/openttd-patchpack/source Changeset - r8710:2778607a3b6c

Changeset - r8710:2778607a3b6c

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

smatz - 16 years ago 2008-03-19 20:42:05
smatz@openttd.org

(svn r12384) -Fix (r2428): do not disconnect train when reversing, it may 'think' it is whole in a depot

1 file changed with 7 insertions and 15 deletions:

src/train_cmd.cpp

0 comments (0 inline, 0 general)

src/train_cmd.cpp

➞

Show inline comments

@@ @@ -52,7 +52,7 @@ @@
 #include "table/train_cmd.h"
 static bool TrainCheckIfLineEnds(Vehicle *v);
 static void TrainController(Vehicle *v, bool update_image);
+static void TrainController(Vehicle *v, Vehicle *nomove, bool update_image);
 static TileIndex TrainApproachingCrossingTile(const Vehicle *v);
 static const byte _vehicle_initial_x_fract[4] = {10, 8, 4,  8};
@@ @@ -1735,17 +1735,9 @@ static void AdvanceWagons(Vehicle *v, bo @@
 		int differential = last->u.rail.cached_veh_length - base->u.rail.cached_veh_length;
 		if (before) differential *= -1;
 		if (differential > 0) {
 			/* disconnect last car to make sure only this subset moves */
 			Vehicle *tempnext = last->Next();
 			last->SetNext(NULL);
 			/* do not update images now because the wagons are disconnected
 			 * and that could cause problems with NewGRFs */
 			for (int i = 0; i < differential; i++) TrainController(first, false);
 			last->SetNext(tempnext);
+		}
 		/* do not update images now
 		 * negative differential will are handled in the second run */
 		for (int i = 0; i < differential; i++) TrainController(first, last->Next(), false);
 		base = first;
 		first = first->Next();
@@ @@ -2993,12 +2985,12 @@ static void *CheckVehicleAtSignal(Vehicl @@
 	return NULL;
+}
 static void TrainController(Vehicle *v, bool update_image)
+static void TrainController(Vehicle *v, Vehicle *nomove, bool update_image)
+{
 	Vehicle *prev;
 	/* For every vehicle after and including the given vehicle */
-	for (prev = v->Previous(); v != NULL; prev = v, v = v->Next()) {
+	for (prev = v->Previous(); v != nomove; prev = v, v = v->Next()) {
 		DiagDirection enterdir = DIAGDIR_BEGIN;
 		bool update_signals_crossing = false; // will we update signals or crossing state?
 		BeginVehicleMove(v);
@@ @@ -3554,7 +3546,7 @@ static void TrainLocoHandler(Vehicle *v, @@
 		TrainCheckIfLineEnds(v);
 		do {
 			TrainController(v, true);
+			TrainController(v, NULL, true);
 			CheckTrainCollision(v);
 			if (v->cur_speed <= 0x100)
 				break;

0 comments (0 inline, 0 general)