summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2008-04-21 09:27:47 +0000
committerrubidium <rubidium@openttd.org>2008-04-21 09:27:47 +0000
commit2a779a5e100be9133e21b5645d90d0d390af9ecd (patch)
treecce32b17c86c6818b777e7eabdab224465b1a26d /src
parentcea98ea0e64b31ebf77c31cc6e6fc4f152e12e28 (diff)
downloadopenttd-2a779a5e100be9133e21b5645d90d0d390af9ecd.tar.xz
(svn r12816) -Fix: the cargo count in the performance rating window could be wrong.
Diffstat (limited to 'src')
-rw-r--r--src/oldloader.cpp2
-rw-r--r--src/player_base.h2
-rw-r--r--src/players.cpp3
-rw-r--r--src/saveload.cpp2
4 files changed, 5 insertions, 4 deletions
diff --git a/src/oldloader.cpp b/src/oldloader.cpp
index a4b414b00..ef367731c 100644
--- a/src/oldloader.cpp
+++ b/src/oldloader.cpp
@@ -966,7 +966,7 @@ static const OldChunks player_chunk[] = {
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 ),
diff --git a/src/player_base.h b/src/player_base.h
index 52c96f765..2bb3fd56c 100644
--- a/src/player_base.h
+++ b/src/player_base.h
@@ -44,7 +44,7 @@ struct Player {
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;
diff --git a/src/players.cpp b/src/players.cpp
index 88f194c17..38b231f92 100644
--- a/src/players.cpp
+++ b/src/players.cpp
@@ -1109,7 +1109,8 @@ static const SaveLoad _player_desc[] = {
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),
diff --git a/src/saveload.cpp b/src/saveload.cpp
index 85e9a7ae4..02df1aa79 100644
--- 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!