summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsmatz <smatz@openttd.org>2009-01-20 15:43:17 +0000
committersmatz <smatz@openttd.org>2009-01-20 15:43:17 +0000
commit38afe1fe3fa7dc57ea7b62fd46a233cbba1f5c26 (patch)
treeddcc8c17cbbc7ee62b65f7612cb11bf0b48b4596
parent091d82470b9eacc638f99cb4e1107443df7b1bd2 (diff)
downloadopenttd-38afe1fe3fa7dc57ea7b62fd46a233cbba1f5c26.tar.xz
(svn r15170) -Fix: vehicle value is 64bit now, oldloader was reading it as 32bit
-rw-r--r--src/saveload/oldloader.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/saveload/oldloader.cpp b/src/saveload/oldloader.cpp
index 0490409bd..24689e157 100644
--- a/src/saveload/oldloader.cpp
+++ b/src/saveload/oldloader.cpp
@@ -520,8 +520,6 @@ static const OldChunks town_chunk[] = {
OCL_SVAR( OC_UINT16, Town, ratings[6] ),
OCL_SVAR( OC_UINT16, Town, ratings[7] ),
- /* XXX - This is pretty odd.. we read 32bit, but only write 16bit.. sure there is
- nothing changed ? ? */
OCL_SVAR( OC_FILE_U32 | OC_VAR_U16, Town, have_ratings ),
OCL_SVAR( OC_FILE_U32 | OC_VAR_U16, Town, statues ),
OCL_NULL( 2 ), ///< num_houses, no longer in use
@@ -874,8 +872,8 @@ static const OldChunks _company_chunk[] = {
OCL_VAR ( OC_UINT16, 1, &_old_string_id_2 ),
OCL_SVAR( OC_UINT32, Company, president_name_2 ),
- OCL_SVAR( OC_FILE_I32 | OC_VAR_I64, Company, money ),
- OCL_SVAR( OC_FILE_I32 | OC_VAR_I64, Company, current_loan ),
+ OCL_SVAR( OC_FILE_I32 | OC_VAR_I64, Company, money ),
+ OCL_SVAR( OC_FILE_I32 | OC_VAR_I64, Company, current_loan ),
OCL_SVAR( OC_UINT8, Company, colour ),
OCL_SVAR( OC_UINT8, Company, money_fraction ),
@@ -1116,7 +1114,7 @@ static const OldChunks vehicle_chunk[] = {
OCL_VAR ( OC_UINT16, 1, &_old_next_ptr ),
- OCL_SVAR( OC_UINT32, Vehicle, value ),
+ OCL_SVAR( OC_FILE_U32 | OC_VAR_I64, Vehicle, value ),
OCL_VAR ( OC_UINT16, 1, &_old_string_id ),
@@ -1235,7 +1233,7 @@ static const OldChunks engine_chunk[] = {
OCL_SVAR( OC_UINT8, Engine, preview_company_rank ),
OCL_SVAR( OC_UINT8, Engine, preview_wait ),
- OCL_NULL( 2 ), ///< Junk
+ OCL_NULL( 2 ), ///< railtype + junk
OCL_END()
};