Merge branch 'jgrpp' into jgrpp-nrt

.ottdrev-vc

@@ -1,2 +1,2 @@
-jgrpp-0.31.2	20190617	0	7271fdda4c6aed75823b6efeab4971cfdc0e257d	1	0
+jgrpp-0.31.3	20190711	0	eab5db97692c82afc11465887c9a16f698461ed4	1	0
-60c2f928566480ba695361b25e6181f58f54b6cd848625d0a3ba856f5a7cf898  -
+316e7b69e51a6cd40c766278bf4d4ffb0c833ac5466e13b1abce2f14c68ad124  -

README.md

@@ -1,4 +1,4 @@
-## JGR's Patchpack version 0.31.2
+## JGR's Patchpack version 0.31.3
 
 This is a collection of patches applied to [OpenTTD](http://www.openttd.org/)
 

jgrpp-changelog.md

@@ -2,6 +2,15 @@
 
 * * *
 
+### v0.31.3 (2019-07-13)
+* Fix the target order number of conditional order jumps being loaded incorrectly from SpringPP savegames.
+* Fix order backups not being restored when using buy and refit.
+* Fix rendering error when waypoint sign is moved.
+* Fix virtual trains in the template train replacement editing window reserving a unit number.
+* Re-add previously removed group collapse and expand all buttons.
+* Fix compilation on MSVC.
+* Bump trunk base from commit 66cd32a252ee0edab11448b560371878b2189223 to commit 21edf67f89c60351d5a0d84625455aa296b6b950.
+
 ### v0.31.2 (2019-06-18)
 * Fix through load orders which use full load any cargo, with multi-cargo trains.
 * Fix PBS reservations not being shortened or extended when adding or removing signals to bridges/tunnels.

src/gamelog.cpp

@@ -65,6 +65,11 @@ void GamelogStopAction()
 	if (print) GamelogPrintDebug(5);
 }
 
+void GamelogStopActionIfStarted()
+{
+	if (_gamelog_action_type != GLAT_NONE) GamelogStopAction();
+}
+
 /**
  * Frees the memory allocated by a gamelog
  */

src/openttd.cpp

@@ -404,6 +404,9 @@ static void ShutdownGame()
  */
 static void LoadIntroGame(bool load_newgrfs = true)
 {
+	Window *v;
+	FOR_ALL_WINDOWS_FROM_FRONT(v) delete v;
+
 	_game_mode = GM_MENU;
 
 	if (load_newgrfs) ResetGRFConfig(false);

src/saveload/afterload.cpp

@@ -3496,7 +3496,9 @@ bool AfterLoadGame()
 		/* convert wait for cargo orders to ordinary load if possible */
 		Order *order;
 		FOR_ALL_ORDERS(order) {
-			if (order->GetLoadType() == static_cast<OrderLoadFlags>(1)) order->SetLoadType(OLF_LOAD_IF_POSSIBLE);
+			if ((order->IsType(OT_GOTO_STATION) || order->IsType(OT_LOADING) || order->IsType(OT_IMPLICIT)) && order->GetLoadType() == static_cast<OrderLoadFlags>(1)) {
+				order->SetLoadType(OLF_LOAD_IF_POSSIBLE);
+			}
 		}
 	}
 

src/saveload/saveload.cpp

@@ -2657,6 +2657,9 @@ static inline void ClearSaveLoadState()
 
 	delete _sl.lf;
 	_sl.lf = nullptr;
+
+	extern void GamelogStopActionIfStarted();
+	GamelogStopActionIfStarted();
 }
 
 /**

src/saveload/vehicle_sl.cpp

@@ -254,7 +254,12 @@ void AfterLoadVehicles(bool part_of_load)
 	SCOPE_INFO_FMT([&v], "AfterLoadVehicles: %s", scope_dumper().VehicleInfo(v));
 	FOR_ALL_VEHICLES(v) {
 		/* Reinstate the previous pointer */
-		if (v->Next() != nullptr) v->Next()->previous = v;
+		if (v->Next() != nullptr) {
+			v->Next()->previous = v;
+			if (HasBit(v->subtype, GVSF_VIRTUAL) != HasBit(v->Next()->subtype, GVSF_VIRTUAL)) {
+				SlErrorCorrupt("Mixed virtual/non-virtual vehicle consist");
+			}
+		}
 		if (v->NextShared() != nullptr) v->NextShared()->previous_shared = v;
 
 		if (part_of_load) v->fill_percent_te_id = INVALID_TE_ID;