summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2007-05-29 10:35:52 +0000
committerbjarni <bjarni@openttd.org>2007-05-29 10:35:52 +0000
commit77f5c1e25e2a0403a3fd39918eee269423c61e44 (patch)
treec4bc5a56a766298917927f4daeff35988612a670
parent4726fdc0d0de35bfb12d92f2c913a5ad3b91d647 (diff)
downloadopenttd-77f5c1e25e2a0403a3fd39918eee269423c61e44.tar.xz
(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
-rw-r--r--src/train_cmd.cpp20
1 files changed, 0 insertions, 20 deletions
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
index c15b2a233..7ba8c78ff 100644
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -1174,26 +1174,6 @@ int32 CmdMoveRailVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
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 */