From 6741c98f6b1bb5cd87db397b4d3769a34a7ed942 Mon Sep 17 00:00:00 2001
From: Jonathan G Rennison <j.g.rennison@gmail.com>
Date: Mon, 21 Mar 2016 18:22:29 +0000
Subject: [PATCH 1/2] TBTR: Fix virtual trains being created at load using
 wrong company.

Fix virtual trains showing up in company engine counts.
---
 src/group_cmd.cpp                     | 5 ++++-
 src/saveload/tbtr_template_veh_sl.cpp | 3 +++
 src/vehicle.cpp                       | 1 +
 src/vehicle_cmd.cpp                   | 6 ++++++
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/group_cmd.cpp b/src/group_cmd.cpp
index 55873fb8d4..951c74f959 100644
--- a/src/group_cmd.cpp
+++ b/src/group_cmd.cpp
@@ -139,7 +139,7 @@ void GroupStatistics::Clear()
 /* static */ void GroupStatistics::CountVehicle(const Vehicle *v, int delta)
 {
 	/* make virtual trains group-neutral */
-	if ( HasBit(v->subtype, GVSF_VIRTUAL) ) return;
+	if (HasBit(v->subtype, GVSF_VIRTUAL)) return;
 
 	assert(delta == 1 || delta == -1);
 
@@ -164,6 +164,9 @@ void GroupStatistics::Clear()
  */
 /* static */ void GroupStatistics::CountEngine(const Vehicle *v, int delta)
 {
+	/* make virtual trains group-neutral */
+	if (HasBit(v->subtype, GVSF_VIRTUAL)) return;
+
 	assert(delta == 1 || delta == -1);
 	GroupStatistics::GetAllGroup(v).num_engines[v->engine_type] += delta;
 	GroupStatistics::Get(v).num_engines[v->engine_type] += delta;
diff --git a/src/saveload/tbtr_template_veh_sl.cpp b/src/saveload/tbtr_template_veh_sl.cpp
index 60c8b6080b..054eb45971 100644
--- a/src/saveload/tbtr_template_veh_sl.cpp
+++ b/src/saveload/tbtr_template_veh_sl.cpp
@@ -3,6 +3,7 @@
 #include "../tbtr_template_vehicle.h"
 #include "../tbtr_template_vehicle_func.h"
 #include "../train.h"
+#include "../core/backup_type.hpp"
 
 #include "saveload.h"
 
@@ -102,6 +103,7 @@ void AfterLoadTemplateVehiclesUpdateImage()
 
 	FOR_ALL_TEMPLATES(tv) {
 		if (tv->Prev() == NULL) {
+			Backup<CompanyByte> cur_company(_current_company, tv->owner, FILE_LINE);
 			StringID err;
 			Train* t = VirtualTrainFromTemplateVehicle(tv, err);
 			if (t != NULL) {
@@ -123,6 +125,7 @@ void AfterLoadTemplateVehiclesUpdateImage()
 				}
 				delete t;
 			}
+			cur_company.Restore();
 		}
 	}
 }
diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index 9f17876dfe..ba22eb2058 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -653,6 +653,7 @@ uint CountVehiclesInChain(const Vehicle *v)
  */
 bool Vehicle::IsEngineCountable() const
 {
+	if (HasBit(this->subtype, GVSF_VIRTUAL)) return false;
 	switch (this->type) {
 		case VEH_AIRCRAFT: return Aircraft::From(this)->IsNormalAircraft(); // don't count plane shadows and helicopter rotors
 		case VEH_TRAIN:
diff --git a/src/vehicle_cmd.cpp b/src/vehicle_cmd.cpp
index 3622dbd287..668e2316b7 100644
--- a/src/vehicle_cmd.cpp
+++ b/src/vehicle_cmd.cpp
@@ -919,6 +919,10 @@ CommandCost CmdVirtualTrainFromTemplateVehicle(TileIndex tile, DoCommandFlag fla
 		return CMD_ERROR;
 	}
 
+	if (tv->owner != _current_company) {
+		return CMD_ERROR;
+	}
+
 	bool should_execute = (flags & DC_EXEC) != 0;
 
 	if (should_execute) {
@@ -940,6 +944,8 @@ Train* VirtualTrainFromTemplateVehicle(TemplateVehicle* tv, StringID &err)
 	CommandCost c;
 	Train *tmp, *head, *tail;
 
+	assert(tv->owner == _current_company);
+
 	head = CmdBuildVirtualRailVehicle(tv->engine_type, true, err);
 	if (!head) return NULL;
 

From 31136bac50278999fe5b580c241576fe25b2a710 Mon Sep 17 00:00:00 2001
From: Jonathan G Rennison <j.g.rennison@gmail.com>
Date: Mon, 21 Mar 2016 21:18:04 +0000
Subject: [PATCH 2/2] Fix AfterLoadTemplateVehiclesUpdateImage clobbering the
 random seeds.

This broke MP games with template replacement trains.
---
 src/saveload/tbtr_template_veh_sl.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/saveload/tbtr_template_veh_sl.cpp b/src/saveload/tbtr_template_veh_sl.cpp
index 054eb45971..32dd9e104c 100644
--- a/src/saveload/tbtr_template_veh_sl.cpp
+++ b/src/saveload/tbtr_template_veh_sl.cpp
@@ -4,6 +4,7 @@
 #include "../tbtr_template_vehicle_func.h"
 #include "../train.h"
 #include "../core/backup_type.hpp"
+#include "../core/random_func.hpp"
 
 #include "saveload.h"
 
@@ -101,6 +102,9 @@ void AfterLoadTemplateVehiclesUpdateImage()
 {
 	TemplateVehicle *tv;
 
+	SavedRandomSeeds saved_seeds;
+	SaveRandomSeeds(&saved_seeds);
+
 	FOR_ALL_TEMPLATES(tv) {
 		if (tv->Prev() == NULL) {
 			Backup<CompanyByte> cur_company(_current_company, tv->owner, FILE_LINE);
@@ -128,6 +132,8 @@ void AfterLoadTemplateVehiclesUpdateImage()
 			cur_company.Restore();
 		}
 	}
+
+	RestoreRandomSeeds(saved_seeds);
 }
 
 extern const ChunkHandler _template_vehicle_chunk_handlers[] = {