summaryrefslogtreecommitdiff
path: root/src/saveload
diff options
context:
space:
mode:
Diffstat (limited to 'src/saveload')
-rw-r--r--src/saveload/afterload.cpp30
-rw-r--r--src/saveload/cargopacket_sl.cpp16
-rw-r--r--src/saveload/economy_sl.cpp44
-rw-r--r--src/saveload/saveload.cpp2
4 files changed, 75 insertions, 17 deletions
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp
index 78c86bb43..26ca23b22 100644
--- a/src/saveload/afterload.cpp
+++ b/src/saveload/afterload.cpp
@@ -29,6 +29,7 @@
#include "../road_cmd.h"
#include "../ai/ai.hpp"
#include "../town.h"
+#include "../economy_base.h"
#include "table/strings.h"
@@ -547,6 +548,13 @@ bool AfterLoadGame()
if (!Company::IsValidID(COMPANY_FIRST) && (!_networking || (_networking && _network_server && !_network_dedicated)))
DoStartupNewCompany(false);
+ /* Fix the cache for cargo payments. */
+ CargoPayment *cp;
+ FOR_ALL_CARGO_PAYMENTS(cp) {
+ cp->front->cargo_payment = cp;
+ cp->current_station = cp->front->last_station_visited;
+ }
+
if (CheckSavegameVersion(72)) {
/* Locks/shiplifts in very old savegames had OWNER_WATER as owner */
for (TileIndex t = 0; t < MapSize(); t++) {
@@ -1269,13 +1277,8 @@ bool AfterLoadGame()
* stored to stop people cheating and cashing in several times. This
* wasn't enough though as it was cleared when the vehicle started
* loading again, even if it didn't actually load anything, so now the
- * amount of cargo that has been paid for is stored. */
+ * amount that has been paid is stored. */
FOR_ALL_VEHICLES(v) {
- const CargoList::List *packets = v->cargo.Packets();
- for (CargoList::List::const_iterator it = packets->begin(); it != packets->end(); it++) {
- CargoPacket *cp = *it;
- cp->paid_for = HasBit(v->vehicle_flags, 2);
- }
ClrBit(v->vehicle_flags, 2);
v->cargo.InvalidateCache();
}
@@ -1870,6 +1873,21 @@ bool AfterLoadGame()
}
}
}
+
+ /* We didn't store cargo payment yet, so make them for vehicles that are
+ * currently at a station and loading/unloading. If they don't get any
+ * payment anymore they just removed in the next load/unload cycle.
+ * However, some 0.7 versions might have cargo payment. For those we just
+ * add cargopayment for the vehicles that don't have it.
+ */
+ Station *st;
+ FOR_ALL_STATIONS(st) {
+ std::list<Vehicle *>::iterator iter;
+ for (iter = st->loading_vehicles.begin(); iter != st->loading_vehicles.end(); ++iter) {
+ Vehicle *v = *iter;
+ if (v->cargo_payment == NULL) v->cargo_payment = new CargoPayment(v);
+ }
+ }
}
AfterLoadLabelMaps();
diff --git a/src/saveload/cargopacket_sl.cpp b/src/saveload/cargopacket_sl.cpp
index 08710dc34..d0a7783b8 100644
--- a/src/saveload/cargopacket_sl.cpp
+++ b/src/saveload/cargopacket_sl.cpp
@@ -8,13 +8,15 @@
#include "saveload.h"
static const SaveLoad _cargopacket_desc[] = {
- SLE_VAR(CargoPacket, source, SLE_UINT16),
- SLE_VAR(CargoPacket, source_xy, SLE_UINT32),
- SLE_VAR(CargoPacket, loaded_at_xy, SLE_UINT32),
- SLE_VAR(CargoPacket, count, SLE_UINT16),
- SLE_VAR(CargoPacket, days_in_transit, SLE_UINT8),
- SLE_VAR(CargoPacket, feeder_share, SLE_INT64),
- SLE_VAR(CargoPacket, paid_for, SLE_BOOL),
+ SLE_VAR(CargoPacket, source, SLE_UINT16),
+ SLE_VAR(CargoPacket, source_xy, SLE_UINT32),
+ SLE_VAR(CargoPacket, loaded_at_xy, SLE_UINT32),
+ SLE_VAR(CargoPacket, count, SLE_UINT16),
+ SLE_VAR(CargoPacket, days_in_transit, SLE_UINT8),
+ SLE_VAR(CargoPacket, feeder_share, SLE_INT64),
+
+ /* Used to be paid_for, but that got changed. */
+ SLE_CONDNULL(1, 0, 120),
SLE_END()
};
diff --git a/src/saveload/economy_sl.cpp b/src/saveload/economy_sl.cpp
index 46c5b67ad..91de38402 100644
--- a/src/saveload/economy_sl.cpp
+++ b/src/saveload/economy_sl.cpp
@@ -4,6 +4,7 @@
#include "../stdafx.h"
#include "../economy_func.h"
+#include "../economy_base.h"
#include "saveload.h"
@@ -51,8 +52,45 @@ static void Load_ECMY()
StartupIndustryDailyChanges(CheckSavegameVersion(102)); // old savegames will need to be initialized
}
+static const SaveLoad _cargopayment_desc[] = {
+ SLE_REF(CargoPayment, front, REF_VEHICLE),
+ SLE_VAR(CargoPayment, route_profit, SLE_INT64),
+ SLE_VAR(CargoPayment, visual_profit, SLE_INT64),
+
+ SLE_END()
+};
+
+static void Save_CAPY()
+{
+ CargoPayment *cp;
+ FOR_ALL_CARGO_PAYMENTS(cp) {
+ SlSetArrayIndex(cp->index);
+ SlObject(cp, _cargopayment_desc);
+ }
+}
+
+static void Load_CAPY()
+{
+ int index;
+
+ while ((index = SlIterateArray()) != -1) {
+ CargoPayment *cp = new (index) CargoPayment();
+ SlObject(cp, _cargopayment_desc);
+ }
+}
+
+static void Ptrs_CAPY()
+{
+ CargoPayment *cp;
+ FOR_ALL_CARGO_PAYMENTS(cp) {
+ SlObject(cp, _cargopayment_desc);
+ }
+}
+
+
extern const ChunkHandler _economy_chunk_handlers[] = {
- { 'PRIC', SaveLoad_PRIC, SaveLoad_PRIC, NULL, CH_RIFF | CH_AUTO_LENGTH},
- { 'CAPR', SaveLoad_CAPR, SaveLoad_CAPR, NULL, CH_RIFF | CH_AUTO_LENGTH},
- { 'ECMY', Save_ECMY, Load_ECMY, NULL, CH_RIFF | CH_LAST},
+ { 'CAPY', Save_CAPY, Load_CAPY, Ptrs_CAPY, CH_ARRAY},
+ { 'PRIC', SaveLoad_PRIC, SaveLoad_PRIC, NULL, CH_RIFF | CH_AUTO_LENGTH},
+ { 'CAPR', SaveLoad_CAPR, SaveLoad_CAPR, NULL, CH_RIFF | CH_AUTO_LENGTH},
+ { 'ECMY', Save_ECMY, Load_ECMY, NULL, CH_RIFF | CH_LAST},
};
diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp
index 0fa193b58..1ac00f7ab 100644
--- a/src/saveload/saveload.cpp
+++ b/src/saveload/saveload.cpp
@@ -41,7 +41,7 @@
#include "saveload_internal.h"
-extern const uint16 SAVEGAME_VERSION = 120;
+extern const uint16 SAVEGAME_VERSION = 121;
SavegameType _savegame_type; ///< type of savegame we are loading