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

TBTR: Allow cloning virtual/template trains with unavailable engines

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-04-27 21:25:56 +01:00
parent 2ff8a71e59
commit 9d861fb8a0
3 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/train_cmd.cpp
View File

@@ -5221,22 +5221,14 @@ Train* CmdBuildVirtualRailWagon(const Engine *e)
return v;
}
Train* CmdBuildVirtualRailVehicle(EngineID eid, bool lax_engine_check, StringID &error)
Train* CmdBuildVirtualRailVehicle(EngineID eid, StringID &error)
{
if (lax_engine_check) {
const Engine *e = Engine::GetIfValid(eid);
if (e == nullptr || e->type != VEH_TRAIN) {
error = STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE + VEH_TRAIN;
return nullptr;
}
} else {
if (!IsEngineBuildable(eid, VEH_TRAIN, _current_company)) {
error = STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE + VEH_TRAIN;
return nullptr;
}
const Engine *e = Engine::GetIfValid(eid);
if (e == nullptr || e->type != VEH_TRAIN) {
error = STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE + VEH_TRAIN;
return nullptr;
}
const Engine* e = Engine::Get(eid);
const RailVehicleInfo *rvi = &e->u.rail;
int num_vehicles = (e->u.rail.railveh_type == RAILVEH_MULTIHEAD ? 2 : 1) + CountArticulatedParts(eid, false);
@@ -5331,7 +5323,7 @@ CommandCost CmdBuildVirtualRailVehicle(TileIndex tile, DoCommandFlag flags, uint
if (should_execute) {
StringID err = INVALID_STRING_ID;
Train* train = CmdBuildVirtualRailVehicle(eid, false, err);
Train* train = CmdBuildVirtualRailVehicle(eid, err);
if (train == nullptr) {
return_cmd_error(err);