From 9d861fb8a045cdaa2a2b471fffb12a33109ffcda Mon Sep 17 00:00:00 2001
From: Jonathan G Rennison <j.g.rennison@gmail.com>
Date: Sat, 27 Apr 2019 21:25:56 +0100
Subject: [PATCH] TBTR: Allow cloning virtual/template trains with unavailable
 engines

---
 src/train.h         |  2 +-
 src/train_cmd.cpp   | 20 ++++++--------------
 src/vehicle_cmd.cpp | 11 ++++++-----
 3 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/src/train.h b/src/train.h
index 9c46b9b4dc..df2607b0ce 100644
--- a/src/train.h
+++ b/src/train.h
@@ -405,7 +405,7 @@ CommandCost CmdMoveRailVehicle(TileIndex, DoCommandFlag , uint32, uint32, const
 CommandCost CmdMoveVirtualRailVehicle(TileIndex, DoCommandFlag, uint32, uint32, const char*);
 
 Train* CmdBuildVirtualRailWagon(const Engine*);
-Train* CmdBuildVirtualRailVehicle(EngineID, bool lax_engine_check, StringID &error);
+Train* CmdBuildVirtualRailVehicle(EngineID, StringID &error);
 
 int GetTileMarginInFrontOfTrain(const Train *v, int x_pos, int y_pos);
 
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
index 0cf257f7e6..586d808f1c 100644
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -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);
diff --git a/src/vehicle_cmd.cpp b/src/vehicle_cmd.cpp
index 6777dfbad3..558a9bc1b1 100644
--- a/src/vehicle_cmd.cpp
+++ b/src/vehicle_cmd.cpp
@@ -1003,13 +1003,13 @@ Train* VirtualTrainFromTemplateVehicle(TemplateVehicle* tv, StringID &err)
 
 	assert(tv->owner == _current_company);
 
-	head = CmdBuildVirtualRailVehicle(tv->engine_type, true, err);
+	head = CmdBuildVirtualRailVehicle(tv->engine_type, err);
 	if (!head) return nullptr;
 
 	tail = head;
 	tv = tv->GetNextUnit();
 	while (tv) {
-		tmp = CmdBuildVirtualRailVehicle(tv->engine_type, true, err);
+		tmp = CmdBuildVirtualRailVehicle(tv->engine_type, err);
 		if (!tmp) {
 			CmdDeleteVirtualTrain(INVALID_TILE, DC_EXEC, head->index, 0, nullptr);
 			return nullptr;
@@ -1055,13 +1055,13 @@ CommandCost CmdVirtualTrainFromTrain(TileIndex tile, DoCommandFlag flags, uint32
 		Train *tmp, *head, *tail;
 		StringID err = INVALID_STRING_ID;
 
-		head = CmdBuildVirtualRailVehicle(train->engine_type, false, err);
+		head = CmdBuildVirtualRailVehicle(train->engine_type, err);
 		if (!head) return_cmd_error(err);
 
 		tail = head;
 		train = train->GetNextUnit();
 		while (train) {
-			tmp = CmdBuildVirtualRailVehicle(train->engine_type, false, err);
+			tmp = CmdBuildVirtualRailVehicle(train->engine_type, err);
 			if (!tmp) {
 				CmdDeleteVirtualTrain(tile, flags, head->index, 0, nullptr);
 				return_cmd_error(err);
@@ -1194,7 +1194,8 @@ CommandCost CmdTemplateVehicleFromTrain(TileIndex tile, DoCommandFlag flags, uin
 	}
 
 	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);
 		}
 	}