Mercurial > hg > openttd

changeset 17061:4f0838facf27 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r21798) -Fix: loading a TTO savegame failed after loading a TTDP savegame with vehicle multiplier bigger than 1
author smatz <smatz@openttd.org>
date Fri, 14 Jan 2011 22:23:09 +0000
parents 4b108c239704
children b3ff9bf3d385
files src/saveload/oldloader_sl.cpp
diffstat 1 files changed, 8 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/saveload/oldloader_sl.cpp
+++ b/src/saveload/oldloader_sl.cpp
@@ -34,9 +34,9 @@
 #include "../table/engines.h"
 #include "../table/townname.h"
 
-static bool   _read_ttdpatch_flags;
+static bool _read_ttdpatch_flags;
 
-static uint8  *_old_map3;
+static uint8 *_old_map3;
 
 void FixOldMapArray()
 {
@@ -491,15 +491,16 @@
 
 static void ReadTTDPatchFlags()
 {
+	if (_savegame_type == SGT_TTO) {
+		_old_vehicle_multiplier = 1;
+		_bump_assert_value = 0;
+		return;
+	}
+
 	if (_read_ttdpatch_flags) return;
 
 	_read_ttdpatch_flags = true;
 
-	if (_savegame_type == SGT_TTO) {
-		_old_vehicle_multiplier = 1;
-		return;
-	}
-
 	/* TTDPatch misuses _old_map3 for flags.. read them! */
 	_old_vehicle_multiplier = _old_map3[0];
 	/* Somehow.... there was an error in some savegames, so 0 becomes 1