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

Fix crash when attempting to refit template vehicle.

Browse Source 
This is due to infra sharing tile ownership tests.
This commit is contained in:
Jonathan G Rennison
2016-02-15 00:12:51 +00:00
parent 580b2f7584
commit b87957c9db
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/vehicle_cmd.cpp
View File

@@ -479,13 +479,18 @@ CommandCost CmdRefitVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
Vehicle *front = v->First();
CommandCost ret = CheckVehicleControlAllowed(v);
if (ret.Failed()) return ret;
bool auto_refit = HasBit(p2, 6);
bool is_virtual_train = HasBit(p2, 5);
bool free_wagon = v->type == VEH_TRAIN && Train::From(front)->IsFreeWagon(); // used by autoreplace/renew
if (is_virtual_train || (v->type == VEH_TRAIN && Train::From(front)->IsVirtual())) {
CommandCost ret = CheckOwnership(front->owner);
if (ret.Failed()) return ret;
} else {
CommandCost ret = CheckVehicleControlAllowed(v);
if (ret.Failed()) return ret;
}
/* Don't allow shadows and such to be refitted. */
if (v != front && (v->type == VEH_SHIP || v->type == VEH_AIRCRAFT)) return CMD_ERROR;