(svn r11925) -Fix (r122, r9867): loading old, pre savegame version 2, savegames.
authorrubidium
Sat, 19 Jan 2008 14:00:04 +0000
changeset 8359 6efdb08cedb8
parent 8358 cbd1a077e375
child 8360 3021c928de6c
(svn r11925) -Fix (r122, r9867): loading old, pre savegame version 2, savegames.
src/industry_cmd.cpp
src/town_cmd.cpp
--- a/src/industry_cmd.cpp	Sat Jan 19 11:08:06 2008 +0000
+++ b/src/industry_cmd.cpp	Sat Jan 19 14:00:04 2008 +0000
@@ -2300,12 +2300,12 @@
 	    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),
--- a/src/town_cmd.cpp	Sat Jan 19 11:08:06 2008 +0000
+++ b/src/town_cmd.cpp	Sat Jan 19 14:00:04 2008 +0000
@@ -2467,15 +2467,15 @@
 	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),