From 804542b3f37c62debf9ee03d48cf8ccaf9e2a569 Mon Sep 17 00:00:00 2001 From: smatz Date: Fri, 14 Jan 2011 22:23:09 +0000 Subject: (svn r21798) -Fix: loading a TTO savegame failed after loading a TTDP savegame with vehicle multiplier bigger than 1 --- src/saveload/oldloader_sl.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/saveload/oldloader_sl.cpp b/src/saveload/oldloader_sl.cpp index f5c3bb144..83630d956 100644 --- 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 uint16 _old_extra_chunk_nums; static void ReadTTDPatchFlags() { - if (_read_ttdpatch_flags) return; - - _read_ttdpatch_flags = true; - if (_savegame_type == SGT_TTO) { _old_vehicle_multiplier = 1; + _bump_assert_value = 0; return; } + if (_read_ttdpatch_flags) return; + + _read_ttdpatch_flags = true; + /* 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 -- cgit v1.2.3-54-g00ecf