cpp/openttd-patchpack/source Changeset - r6740:5e869f977bb3

Changeset - r6740:5e869f977bb3

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

bjarni - 17 years ago 2007-05-29 10:35:52
bjarni@openttd.org

(svn r9973) -Cleanup: removed some code that kept both ends of a dualheaded engine in the same train (when moving wagons in a depot)
NormaliseTrainConsist() is called later in the same command and it will take care of this issue

1 file changed with 0 insertions and 20 deletions:

src/train_cmd.cpp

0 comments (0 inline, 0 general)

src/train_cmd.cpp

➞

Show inline comments

@@ @@ -1174,26 +1174,6 @@ int32 CmdMoveRailVehicle(TileIndex tile, @@
 			src->u.rail.other_multiheaded_part->first = NULL;
+		}
 		if (HASBIT(p2, 0) && src_head != NULL && src_head != src) {
 			/* if we stole a rear multiheaded engine, we better give it back to the front end */
 			Vehicle *engine = NULL, *u;
 			for (u = src_head; u != NULL; u = u->next) {
 				if (IsMultiheaded(u)) {
 					if (IsTrainEngine(u)) {
 						engine = u;
 						continue;
+					}
 					/* we got the rear engine to match with the front one */
 					engine = NULL;
+				}
+			}
 			if (engine != NULL && engine->u.rail.other_multiheaded_part != NULL) {
 				AddWagonToConsist(engine->u.rail.other_multiheaded_part, engine);
 				/* previous line set the front engine to the old front. We need to clear that */
 				engine->u.rail.other_multiheaded_part->first = NULL;
+			}
+		}
 		/* If there is an engine behind first_engine we moved away, it should become new first_engine
 		 * To do this, CmdMoveRailVehicle must be called once more
 		 * we can't loop forever here because next time we reach this line we will have a front engine */

0 comments (0 inline, 0 general)