Merge branch 'template_train_replacement' into jgrpp

# Conflicts: # src/saveload/extended_ver_sl.cpp
2018-05-13 15:01:29 +01:00
parent 6342099c4d 5877cd0f9b
commit a60eff174d
14 changed files with 116 additions and 102 deletions
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -1948,7 +1948,7 @@ public:
 						break;
 					case ADI_TEMPLATE_REPLACE:
 						if (vli.vtype == VEH_TRAIN) {
-							ShowTemplateReplaceWindow(this->unitnumber_digits, this->resize.step_height);
+							ShowTemplateReplaceWindow(this->unitnumber_digits);
 						}
 						break;
 					case ADI_SERVICE: // Send for servicing