gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-01-24 08:01:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r3144) -Fix: a new train is now made if the front unit is an engine and the former front engine is moved away (Meush)

Browse Source
This commit is contained in:
bjarni 2005-11-06 01:15:10 +00:00
parent b6d1f81635
commit 63842939ed
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
train_cmd.c
View File

@ -953,6 +953,9 @@ int32 CmdMoveRailVehicle(int x, int y, uint32 flags, uint32 p1, uint32 p2)
/* do it? */ /* do it? */
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
Vehicle *new_front = GetNextVehicle(src); //used if next in line should make a train on it's own
bool make_new_front = src->subtype == TS_Front_Engine;
if (HASBIT(p2, 0)) { if (HASBIT(p2, 0)) {
// unlink ALL wagons // unlink ALL wagons
if (src != src_head) { if (src != src_head) {
@ -1004,6 +1007,15 @@ int32 CmdMoveRailVehicle(int x, int y, uint32 flags, uint32 p1, uint32 p2)
dst->next = src; dst->next = src;
} }
/* 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
* since we set p2 to a condition that makes the statement false, we can't loop forever with this one */
if (make_new_front && new_front != NULL && !(HASBIT(p2, 0))) {
if (!(RailVehInfo(new_front->engine_type)->flags & RVI_WAGON)) {
CmdMoveRailVehicle(x, y, flags, new_front->index | (INVALID_VEHICLE << 16), 1);
}
}
if (src_head) { if (src_head) {
TrainConsistChanged(src_head); TrainConsistChanged(src_head);
if (src_head->subtype == TS_Front_Engine) { if (src_head->subtype == TS_Front_Engine) {