dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TBTR: Avoid built virtual wagons which can't be attached being orphaned

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-06-11 01:59:50 +01:00
parent 5a2e498182
commit f3daada67f
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/train_cmd.cpp
View File

@@ -1375,6 +1375,7 @@ static void NormaliseTrainHead(Train *head)
* - p1 (bit 20) move all vehicles following the source vehicle
* - p1 (bit 21) this is a virtual vehicle (for creating TemplateVehicles)
* - p1 (bit 22) when moving a head vehicle, always reset the head state
* - p1 (bit 23) if move fails, and source vehicle is virtual, delete it
* @param p2 what wagon to put the source wagon AFTER, XXX - INVALID_VEHICLE to make a new line
* @param text unused
* @return the cost of this operation or an error
@@ -1385,12 +1386,21 @@ CommandCost CmdMoveRailVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, u
VehicleID d = GB(p2, 0, 20);
bool move_chain = HasBit(p1, 20);
bool new_head = HasBit(p1, 22);
bool delete_failed_virtual = HasBit(p1, 23);
Train *src = Train::GetIfValid(s);
if (src == nullptr) return CMD_ERROR;
auto check_on_failure = [&](CommandCost cost) -> CommandCost {
if (delete_failed_virtual && src->IsVirtual()) {
return DoCommand(src->tile, src->index | (1 << 21), 0, flags, CMD_SELL_VEHICLE);
} else {
return cost;
}
};
CommandCost ret = CheckOwnership(src->owner);
if (ret.Failed()) return ret;
if (ret.Failed()) return check_on_failure(ret);
/* Do not allow moving crashed vehicles inside the depot, it is likely to cause asserts later */
if (src->vehstatus & VS_CRASHED) return CMD_ERROR;
@@ -1401,10 +1411,10 @@ CommandCost CmdMoveRailVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, u
dst = src->IsEngine() ? nullptr : FindGoodVehiclePos(src);
} else {
dst = Train::GetIfValid(d);
if (dst == nullptr) return CMD_ERROR;
if (dst == nullptr) return check_on_failure(CMD_ERROR);
CommandCost ret = CheckOwnership(dst->owner);
if (ret.Failed()) return ret;
if (ret.Failed()) return check_on_failure(ret);
/* Do not allow appending to crashed vehicles, too */
if (dst->vehstatus & VS_CRASHED) return CMD_ERROR;
@@ -1486,7 +1496,7 @@ CommandCost CmdMoveRailVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, u
/* Restore the train we had. */
RestoreTrainBackup(original_src);
RestoreTrainBackup(original_dst);
return ret;
return check_on_failure(ret);
}
}