From aa0412e0bc379a37f5ac70ac14e56fbf5d427e09 Mon Sep 17 00:00:00 2001 From: rubidium Date: Sat, 19 Jan 2008 14:00:04 +0000 Subject: (svn r11925) -Fix (r122, r9867): loading old, pre savegame version 2, savegames. --- src/industry_cmd.cpp | 4 ++-- src/town_cmd.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp index dd55b24ca..6d7eda55c 100644 --- a/src/industry_cmd.cpp +++ b/src/industry_cmd.cpp @@ -2300,12 +2300,12 @@ static const SaveLoad _industry_desc[] = { SLE_VAR(Industry, width, SLE_UINT8), SLE_VAR(Industry, height, SLE_UINT8), SLE_REF(Industry, town, REF_TOWN), - SLE_CONDNULL( 2, 2, 60), ///< used to be industry's produced_cargo + SLE_CONDNULL( 2, 0, 60), ///< used to be industry's produced_cargo SLE_CONDARR(Industry, produced_cargo, SLE_UINT8, 2, 78, SL_MAX_VERSION), SLE_CONDARR(Industry, incoming_cargo_waiting, SLE_UINT16, 3, 70, SL_MAX_VERSION), SLE_ARR(Industry, produced_cargo_waiting, SLE_UINT16, 2), SLE_ARR(Industry, production_rate, SLE_UINT8, 2), - SLE_CONDNULL( 3, 2, 60), ///< used to be industry's accepts_cargo + SLE_CONDNULL( 3, 0, 60), ///< used to be industry's accepts_cargo SLE_CONDARR(Industry, accepts_cargo, SLE_UINT8, 3, 78, SL_MAX_VERSION), SLE_VAR(Industry, prod_level, SLE_UINT8), SLE_ARR(Industry, this_month_production, SLE_UINT16, 2), diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp index a45928222..fa579dc59 100644 --- a/src/town_cmd.cpp +++ b/src/town_cmd.cpp @@ -2467,15 +2467,15 @@ static const SaveLoad _town_desc[] = { SLE_CONDVAR(Town, grow_counter, SLE_UINT8, 0, 53), SLE_CONDVAR(Town, growth_rate, SLE_UINT8, 0, 53), - SLE_CONDVAR(Town, time_until_rebuild, SLE_UINT16, 54, SL_MAX_VERSION), - SLE_CONDVAR(Town, grow_counter, SLE_UINT16, 54, SL_MAX_VERSION), - SLE_CONDVAR(Town, growth_rate, SLE_INT16, 54, SL_MAX_VERSION), + SLE_CONDVAR(Town, time_until_rebuild, SLE_UINT16, 54, SL_MAX_VERSION), + SLE_CONDVAR(Town, grow_counter, SLE_UINT16, 54, SL_MAX_VERSION), + SLE_CONDVAR(Town, growth_rate, SLE_INT16, 54, SL_MAX_VERSION), SLE_VAR(Town, fund_buildings_months, SLE_UINT8), SLE_VAR(Town, road_build_months, SLE_UINT8), - SLE_VAR(Town, exclusivity, SLE_UINT8), - SLE_VAR(Town, exclusive_counter, SLE_UINT8), + SLE_CONDVAR(Town, exclusivity, SLE_UINT8, 2, SL_MAX_VERSION), + SLE_CONDVAR(Town, exclusive_counter, SLE_UINT8, 2, SL_MAX_VERSION), SLE_CONDVAR(Town, larger_town, SLE_BOOL, 56, SL_MAX_VERSION), -- cgit v1.2.3-70-g09d2