Merge branch 'template_train_replacement-sx' into jgrpp

# Conflicts:
#	src/build_vehicle_gui.cpp
#	src/saveload/afterload.cpp

src/saveload/afterload.cpp

@@ -3216,6 +3216,7 @@ bool AfterLoadGame()
 	AfterLoadLinkGraphs();
 
 	AfterLoadTraceRestrict();
+	AfterLoadTemplateVehiclesUpdateImage();
 
 	/* Show this message last to avoid covering up an error message if we bail out part way */
 	switch (gcf_res) {
@@ -3261,4 +3262,5 @@ void ReloadNewGRFData()
 	/* redraw the whole screen */
 	MarkWholeScreenDirty();
 	CheckTrainsLengths();
+	AfterLoadTemplateVehiclesUpdateImage();
 }

src/saveload/saveload_internal.h

@@ -49,6 +49,8 @@ void ConnectMultiheadedTrains();
 Engine *GetTempDataEngine(EngineID index);
 void CopyTempEngineData();
 
+void AfterLoadTemplateVehiclesUpdateImage();
+
 extern int32 _saved_scrollpos_x;
 extern int32 _saved_scrollpos_y;
 extern ZoomLevelByte _saved_scrollpos_zoom;

src/saveload/tbtr_template_veh_sl.cpp

@@ -1,6 +1,8 @@
 #include "../stdafx.h"
 
 #include "../tbtr_template_vehicle.h"
+#include "../tbtr_template_vehicle_func.h"
+#include "../train.h"
 
 #include "saveload.h"
 
@@ -94,6 +96,37 @@ void AfterLoadTemplateVehicles()
 	}
 }
 
+void AfterLoadTemplateVehiclesUpdateImage()
+{
+	TemplateVehicle *tv;
+
+	FOR_ALL_TEMPLATES(tv) {
+		if (tv->Prev() == NULL) {
+			StringID err;
+			Train* t = VirtualTrainFromTemplateVehicle(tv, err);
+			if (t != NULL) {
+				int tv_len = 0;
+				for (TemplateVehicle *u = tv; u != NULL; u = u->Next()) {
+					tv_len++;
+				}
+				int t_len = 0;
+				for (Train *u = t; u != NULL; u = u->Next()) {
+					t_len++;
+				}
+				if (t_len == tv_len) {
+					Train *v = t;
+					for (TemplateVehicle *u = tv; u != NULL; u = u->Next(), v = v->Next()) {
+						u->spritenum = v->spritenum;
+						u->cur_image = v->GetImage(DIR_W, EIT_PURCHASE);
+						u->image_width = v->GetDisplayImageWidth();
+					}
+				}
+				delete t;
+			}
+		}
+	}
+}
+
 extern const ChunkHandler _template_vehicle_chunk_handlers[] = {
 	{'TMPL', Save_TMPLS, Load_TMPLS, Ptrs_TMPLS, NULL, CH_ARRAY | CH_LAST},
 };