(svn r12816) -Fix: the cargo count in the performance rating window could be wrong.

This commit is contained in:
rubidium 2008-04-21 09:27:47 +00:00
parent cea98ea0e6
commit 2a779a5e10
4 changed files with 5 additions and 4 deletions

View File

@ -966,7 +966,7 @@ static const OldChunks player_chunk[] = {
OCL_SVAR( OC_FILE_U32 | OC_VAR_I64, Player, bankrupt_value ), OCL_SVAR( OC_FILE_U32 | OC_VAR_I64, Player, bankrupt_value ),
OCL_SVAR( OC_UINT16, Player, bankrupt_timeout ), 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( 3, OldPlayerYearly ),
OCL_CHUNK( 1, OldPlayerEconomy ), OCL_CHUNK( 1, OldPlayerEconomy ),

View File

@ -44,7 +44,7 @@ struct Player {
byte block_preview; byte block_preview;
PlayerByte index; 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 location_of_house;
TileIndex last_build_coordinate; TileIndex last_build_coordinate;

View File

@ -1109,7 +1109,8 @@ static const SaveLoad _player_desc[] = {
SLE_CONDVAR(Player, avail_railtypes, SLE_UINT8, 0, 57), SLE_CONDVAR(Player, avail_railtypes, SLE_UINT8, 0, 57),
SLE_VAR(Player, block_preview, SLE_UINT8), 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_FILE_U16 | SLE_VAR_U32, 0, 5),
SLE_CONDVAR(Player, location_of_house, SLE_UINT32, 6, SL_MAX_VERSION), 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), SLE_CONDVAR(Player, last_build_coordinate, SLE_FILE_U16 | SLE_VAR_U32, 0, 5),

View File

@ -34,7 +34,7 @@
#include "table/strings.h" #include "table/strings.h"
extern const uint16 SAVEGAME_VERSION = 93; extern const uint16 SAVEGAME_VERSION = 94;
uint16 _sl_version; ///< the major savegame version identifier uint16 _sl_version; ///< the major savegame version identifier
byte _sl_minor_version; ///< the minor savegame version, DO NOT USE! byte _sl_minor_version; ///< the minor savegame version, DO NOT USE!