Mercurial > hg > openttd
changeset 9017:09f7bec7a574 draft
(svn r12816) -Fix: the cargo count in the performance rating window could be wrong.
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Mon, 21 Apr 2008 09:27:47 +0000 |
| parents | 7a4dd5afd20c |
| children | 9dcf32675eb5 |
| files | src/oldloader.cpp src/player_base.h src/players.cpp src/saveload.cpp |
| diffstat | 4 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/oldloader.cpp +++ b/src/oldloader.cpp @@ -966,7 +966,7 @@ OCL_SVAR( OC_FILE_U32 | OC_VAR_I64, Player, bankrupt_value ), OCL_SVAR( OC_UINT16, Player, bankrupt_timeout ), - OCL_SVAR( OC_FILE_U32 | OC_VAR_U16, Player, cargo_types ), + OCL_SVAR( OC_UINT32, Player, cargo_types ), OCL_CHUNK( 3, OldPlayerYearly ), OCL_CHUNK( 1, OldPlayerEconomy ),
--- a/src/player_base.h +++ b/src/player_base.h @@ -44,7 +44,7 @@ byte block_preview; PlayerByte index; - uint16 cargo_types; ///< which cargo types were transported the last year + uint32 cargo_types; ///< which cargo types were transported the last year TileIndex location_of_house; TileIndex last_build_coordinate;
--- a/src/players.cpp +++ b/src/players.cpp @@ -1109,7 +1109,8 @@ SLE_CONDVAR(Player, avail_railtypes, SLE_UINT8, 0, 57), SLE_VAR(Player, block_preview, SLE_UINT8), - SLE_VAR(Player, cargo_types, SLE_UINT16), + SLE_CONDVAR(Player, cargo_types, SLE_FILE_U16 | SLE_VAR_U32, 0, 93), + SLE_CONDVAR(Player, cargo_types, SLE_UINT32, 94, SL_MAX_VERSION), SLE_CONDVAR(Player, location_of_house, SLE_FILE_U16 | SLE_VAR_U32, 0, 5), SLE_CONDVAR(Player, location_of_house, SLE_UINT32, 6, SL_MAX_VERSION), SLE_CONDVAR(Player, last_build_coordinate, SLE_FILE_U16 | SLE_VAR_U32, 0, 5),
--- a/src/saveload.cpp +++ b/src/saveload.cpp @@ -34,7 +34,7 @@ #include "table/strings.h" -extern const uint16 SAVEGAME_VERSION = 93; +extern const uint16 SAVEGAME_VERSION = 94; uint16 _sl_version; ///< the major savegame version identifier byte _sl_minor_version; ///< the minor savegame version, DO NOT USE!