# HG changeset patch
# User rubidium
# Date 1215422634 0
# Node ID c257c3ae547c98abe01faf769d074e5a33d760d2
# Parent  373bc4028ce2a475cf99ce2304f1db334899f198
(svn r13679) -Fix [FS#2131]: saving TTD imported games in recession failed due to wrong (and unneeded) type conversions in the saveload code.

diff -r 373bc4028ce2 -r c257c3ae547c src/economy.cpp
--- a/src/economy.cpp	Sun Jul 06 11:08:40 2008 +0000
+++ b/src/economy.cpp	Mon Jul 07 09:23:54 2008 +0000
@@ -1909,7 +1909,7 @@
 	SLE_CONDVAR(Economy, max_loan_unround, SLE_FILE_I32 | SLE_VAR_I64,  0, 64),
 	SLE_CONDVAR(Economy, max_loan_unround, SLE_INT64,                  65, SL_MAX_VERSION),
 	SLE_CONDVAR(Economy, max_loan_unround_fract, SLE_UINT16,           70, SL_MAX_VERSION),
-	    SLE_VAR(Economy, fluct,            SLE_FILE_I16 | SLE_VAR_I32),
+	    SLE_VAR(Economy, fluct,            SLE_INT16),
 	    SLE_VAR(Economy, interest_rate,    SLE_UINT8),
 	    SLE_VAR(Economy, infl_amount,      SLE_UINT8),
 	    SLE_VAR(Economy, infl_amount_pr,   SLE_UINT8),
diff -r 373bc4028ce2 -r c257c3ae547c src/economy_type.h
--- a/src/economy_type.h	Sun Jul 06 11:08:40 2008 +0000
+++ b/src/economy_type.h	Mon Jul 07 09:23:54 2008 +0000
@@ -15,7 +15,7 @@
 	Money max_loan;         ///< Maximum possible loan
 	Money max_loan_unround; ///< Economy fluctuation status
 	uint16 max_loan_unround_fract; ///< Fraction of the unrounded max loan
-	int fluct;
+	int16 fluct;
 	byte interest_rate;     ///< Interest
 	byte infl_amount;       ///< inflation amount
 	byte infl_amount_pr;    ///< inflation rate for payment rates
diff -r 373bc4028ce2 -r c257c3ae547c src/oldloader.cpp
--- a/src/oldloader.cpp	Sun Jul 06 11:08:40 2008 +0000
+++ b/src/oldloader.cpp	Mon Jul 07 09:23:54 2008 +0000
@@ -1563,7 +1563,7 @@
 
 	OCL_VAR ( OC_FILE_U32 | OC_VAR_I64,   1, &_economy.max_loan ),
 	OCL_VAR ( OC_FILE_U32 | OC_VAR_I64,   1, &_economy.max_loan_unround ),
-	OCL_VAR ( OC_FILE_U16 | OC_VAR_U32,   1, &_economy.fluct ),
+	OCL_VAR (  OC_INT16,    1, &_economy.fluct ),
 
 	OCL_VAR ( OC_UINT16,    1, &_disaster_delay ),