Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-17 21:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r9973) -Cleanup: removed some code that kept both ends of a dualheaded engine in the same train (when moving wagons in a depot)

Browse Source 
NormaliseTrainConsist() is called later in the same command and it will take care of this issue
This commit is contained in:
bjarni 2007-05-29 10:35:52 +00:00
parent ed0a6a641e
commit 8aaa258122
1 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/train_cmd.cpp
View File

@ -1174,26 +1174,6 @@ int32 CmdMoveRailVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
src->u.rail.other_multiheaded_part->first = NULL; 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 /* 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 * 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 */ * we can't loop forever here because next time we reach this line we will have a front engine */