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

TBTR: Fix crash and issues when using a no longer available engine type.

Browse Source 
Show error messages when cloning a vehicle to a template
or virtual vehicle fails.
Handle failed clones gracefully.
Bypass engine availability check when doing a template edit action.
Show correct error message if template replacement fails for
a non-money reason.
This commit is contained in:
Jonathan G Rennison
2016-02-15 02:31:26 +00:00
parent d9a48a2b5e
commit 5850bcf699
8 changed files with 71 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/vehicle_cmd.cpp
View File

@@ -925,34 +925,41 @@ CommandCost CmdVirtualTrainFromTemplateVehicle(TileIndex tile, DoCommandFlag fla
bool should_execute = (flags & DC_EXEC) != 0;
if (should_execute) {
Train* train = VirtualTrainFromTemplateVehicle(tv);
StringID err = INVALID_STRING_ID;
Train* train = VirtualTrainFromTemplateVehicle(tv, err);
if (train == NULL) {
return CMD_ERROR;
return_cmd_error(err);
}
}
return CommandCost();
}
Train* VirtualTrainFromTemplateVehicle(TemplateVehicle* tv)
CommandCost CmdDeleteVirtualTrain(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text);
Train* VirtualTrainFromTemplateVehicle(TemplateVehicle* tv, StringID &err)
{
CommandCost c;
Train *tmp, *head, *tail;
head = CmdBuildVirtualRailVehicle(tv->engine_type);
head = CmdBuildVirtualRailVehicle(tv->engine_type, true, err);
if (!head) return NULL;
tail = head;
tv = tv->GetNextUnit();
while (tv) {
tmp = CmdBuildVirtualRailVehicle(tv->engine_type);
if (tmp) {
tmp->cargo_type = tv->cargo_type;
tmp->cargo_subtype = tv->cargo_subtype;
CmdMoveRailVehicle(INVALID_TILE, DC_EXEC, (1 << 21) | tmp->index, tail->index, 0);
tail = tmp;
tmp = CmdBuildVirtualRailVehicle(tv->engine_type, true, err);
if (!tmp) {
CmdDeleteVirtualTrain(INVALID_TILE, DC_EXEC, head->index, 0, NULL);
return NULL;
}
tmp->cargo_type = tv->cargo_type;
tmp->cargo_subtype = tv->cargo_subtype;
CmdMoveRailVehicle(INVALID_TILE, DC_EXEC, (1 << 21) | tmp->index, tail->index, 0);
tail = tmp;
tv = tv->GetNextUnit();
}
@@ -986,20 +993,25 @@ CommandCost CmdVirtualTrainFromTrain(TileIndex tile, DoCommandFlag flags, uint32
if (should_execute) {
CommandCost c;
Train *tmp, *head, *tail;
StringID err = INVALID_STRING_ID;
head = CmdBuildVirtualRailVehicle(train->engine_type);
if (!head) return CMD_ERROR;
head = CmdBuildVirtualRailVehicle(train->engine_type, false, err);
if (!head) return_cmd_error(err);
tail = head;
train = train->GetNextUnit();
while (train) {
tmp = CmdBuildVirtualRailVehicle(train->engine_type);
if (tmp) {
tmp->cargo_type = train->cargo_type;
tmp->cargo_subtype = train->cargo_subtype;
CmdMoveRailVehicle(0, DC_EXEC, (1 << 21) | tmp->index, tail->index, 0);
tail = tmp;
tmp = CmdBuildVirtualRailVehicle(train->engine_type, false, err);
if (!tmp) {
CmdDeleteVirtualTrain(tile, flags, head->index, 0, NULL);
return_cmd_error(err);
}
tmp->cargo_type = train->cargo_type;
tmp->cargo_subtype = train->cargo_subtype;
CmdMoveRailVehicle(0, DC_EXEC, (1 << 21) | tmp->index, tail->index, 0);
tail = tmp;
train = train->GetNextUnit();
}
@@ -1121,6 +1133,12 @@ CommandCost CmdTemplateVehicleFromTrain(TileIndex tile, DoCommandFlag flags, uin
return CMD_ERROR;
}
for (Train *v = clicked; v != NULL; v = v->Next()) {
if (!IsEngineBuildable(v->engine_type, VEH_TRAIN, _current_company)) {
return_cmd_error(STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE + VEH_TRAIN);
}
}
bool should_execute = (flags & DC_EXEC) != 0;
if (should_execute) {