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 
(cherry picked from commit 9d861fb8a0)
This commit is contained in:
Jonathan G Rennison
2019-04-27 21:25:56 +01:00
parent 21faae910b
commit 324ce7ae96
3 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/train.h
View File

@@ -353,7 +353,7 @@ CommandCost CmdMoveRailVehicle(TileIndex, DoCommandFlag , uint32, uint32, const
CommandCost CmdMoveVirtualRailVehicle(TileIndex, DoCommandFlag, uint32, uint32, const char*); CommandCost CmdMoveVirtualRailVehicle(TileIndex, DoCommandFlag, uint32, uint32, const char*);
Train* CmdBuildVirtualRailWagon(const Engine*); Train* CmdBuildVirtualRailWagon(const Engine*);
Train* CmdBuildVirtualRailVehicle(EngineID, bool lax_engine_check, StringID &error); Train* CmdBuildVirtualRailVehicle(EngineID, StringID &error);
#define FOR_ALL_TRAINS(var) FOR_ALL_VEHICLES_OF_TYPE(Train, var) #define FOR_ALL_TRAINS(var) FOR_ALL_VEHICLES_OF_TYPE(Train, var)

20
src/train_cmd.cpp
View File

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

15
src/vehicle_cmd.cpp
View File

@@ -946,13 +946,13 @@ Train* VirtualTrainFromTemplateVehicle(TemplateVehicle* tv, StringID &err)
assert(tv->owner == _current_company); assert(tv->owner == _current_company);
head = CmdBuildVirtualRailVehicle(tv->engine_type, true, err); head = CmdBuildVirtualRailVehicle(tv->engine_type, err);
if (!head) return NULL; if (!head) return nullptr;
tail = head; tail = head;
tv = tv->GetNextUnit(); tv = tv->GetNextUnit();
while (tv) { while (tv) {
tmp = CmdBuildVirtualRailVehicle(tv->engine_type, true, err); tmp = CmdBuildVirtualRailVehicle(tv->engine_type, err);
if (!tmp) { if (!tmp) {
CmdDeleteVirtualTrain(INVALID_TILE, DC_EXEC, head->index, 0, NULL); CmdDeleteVirtualTrain(INVALID_TILE, DC_EXEC, head->index, 0, NULL);
return NULL; return NULL;
@@ -998,13 +998,13 @@ CommandCost CmdVirtualTrainFromTrain(TileIndex tile, DoCommandFlag flags, uint32
Train *tmp, *head, *tail; Train *tmp, *head, *tail;
StringID err = INVALID_STRING_ID; StringID err = INVALID_STRING_ID;
head = CmdBuildVirtualRailVehicle(train->engine_type, false, err); head = CmdBuildVirtualRailVehicle(train->engine_type, err);
if (!head) return_cmd_error(err); if (!head) return_cmd_error(err);
tail = head; tail = head;
train = train->GetNextUnit(); train = train->GetNextUnit();
while (train) { while (train) {
tmp = CmdBuildVirtualRailVehicle(train->engine_type, false, err); tmp = CmdBuildVirtualRailVehicle(train->engine_type, err);
if (!tmp) { if (!tmp) {
CmdDeleteVirtualTrain(tile, flags, head->index, 0, NULL); CmdDeleteVirtualTrain(tile, flags, head->index, 0, NULL);
return_cmd_error(err); return_cmd_error(err);
@@ -1136,8 +1136,9 @@ CommandCost CmdTemplateVehicleFromTrain(TileIndex tile, DoCommandFlag flags, uin
return CMD_ERROR; return CMD_ERROR;
} }
for (Train *v = clicked; v != NULL; v = v->GetNextUnit()) { for (Train *v = clicked; v != nullptr; v = v->GetNextUnit()) {
if (!IsEngineBuildable(v->engine_type, VEH_TRAIN, _current_company)) { const Engine *e = Engine::GetIfValid(v->engine_type);
if (e == nullptr || e->type != VEH_TRAIN) {
return_cmd_error(STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE + VEH_TRAIN); return_cmd_error(STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE + VEH_TRAIN);
} }
} }