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

TBTR: Check virtual train ownership when deleting/using as template

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-10-09 01:00:13 +01:00
parent 65cdb35898
commit 08eba56a28
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vehicle_cmd.cpp
View File

@@ -1091,7 +1091,7 @@ CommandCost CmdVirtualTrainFromTrain(TileIndex tile, DoCommandFlag flags, uint32
} }
/** /**
* Create a virtual train from a template vehicle. * Delete a virtual train
* @param tile unused * @param tile unused
* @param flags type of operation * @param flags type of operation
* @param p1 the vehicle's index * @param p1 the vehicle's index
@@ -1108,6 +1108,8 @@ CommandCost CmdDeleteVirtualTrain(TileIndex tile, DoCommandFlag flags, uint32 p1
if (vehicle == nullptr || vehicle->type != VEH_TRAIN) { if (vehicle == nullptr || vehicle->type != VEH_TRAIN) {
return CMD_ERROR; return CMD_ERROR;
} }
CommandCost ret = CheckOwnership(vehicle->owner);
if (ret.Failed()) return ret;
vehicle = vehicle->First(); vehicle = vehicle->First();
@@ -1145,6 +1147,8 @@ CommandCost CmdReplaceTemplateVehicle(TileIndex tile, DoCommandFlag flags, uint3
if (vehicle == nullptr || vehicle->type != VEH_TRAIN) { if (vehicle == nullptr || vehicle->type != VEH_TRAIN) {
return CMD_ERROR; return CMD_ERROR;
} }
CommandCost ret = CheckOwnership(vehicle->owner);
if (ret.Failed()) return ret;
Train* train = Train::From(vehicle); Train* train = Train::From(vehicle);