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

TBTR: Fix template ownership and replacement checks in CmdReplaceTemplateVehicle

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-03-24 11:33:12 +00:00
parent 6527e42cb1
commit 3ce2a01d12
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/vehicle_cmd.cpp
View File

@@ -1241,14 +1241,18 @@ CommandCost CmdReplaceTemplateVehicle(TileIndex tile, DoCommandFlag flags, uint3
VehicleID template_vehicle_id = p1; VehicleID template_vehicle_id = p1;
VehicleID virtual_train_id = p2; VehicleID virtual_train_id = p2;
TemplateVehicle* template_vehicle = TemplateVehicle::GetIfValid(template_vehicle_id); TemplateVehicle *template_vehicle = TemplateVehicle::GetIfValid(template_vehicle_id);
Vehicle* vehicle = Vehicle::GetIfValid(virtual_train_id); Vehicle *vehicle = Vehicle::GetIfValid(virtual_train_id);
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); CommandCost ret = CheckOwnership(vehicle->owner);
if (ret.Failed()) return ret; if (ret.Failed()) return ret;
if (template_vehicle != nullptr) {
ret = CheckOwnership(template_vehicle->owner);
if (ret.Failed()) return ret;
}
vehicle = vehicle->First(); vehicle = vehicle->First();
@@ -1295,7 +1299,7 @@ CommandCost CmdReplaceTemplateVehicle(TileIndex tile, DoCommandFlag flags, uint3
} }
// Make sure our replacements still point to the correct thing. // Make sure our replacements still point to the correct thing.
if (old_ID != template_vehicle->index) { if (old_ID != INVALID_VEHICLE && old_ID != template_vehicle->index) {
bool reindex = false; bool reindex = false;
for (TemplateReplacement *tr : TemplateReplacement::Iterate()) { for (TemplateReplacement *tr : TemplateReplacement::Iterate()) {
if (tr->GetTemplateVehicleID() == old_ID) { if (tr->GetTemplateVehicleID() == old_ID) {