diff --git a/projects/openttd_vs100.vcxproj b/projects/openttd_vs100.vcxproj
index b1a2ad6068..be141188b0 100644
--- a/projects/openttd_vs100.vcxproj
+++ b/projects/openttd_vs100.vcxproj
@@ -790,6 +790,7 @@
+
diff --git a/projects/openttd_vs100.vcxproj.filters b/projects/openttd_vs100.vcxproj.filters
index c799129ecc..d4d45663f4 100644
--- a/projects/openttd_vs100.vcxproj.filters
+++ b/projects/openttd_vs100.vcxproj.filters
@@ -1599,6 +1599,9 @@
Save/Load handlers
+
+ Save/Load handlers
+
Save/Load handlers
diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index 59917d8a34..b1418f2651 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -2454,6 +2454,10 @@
RelativePath=".\..\src\saveload\autoreplace_sl.cpp"
>
+
+
diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
index 1dde4fa36e..455a1dac08 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -2451,6 +2451,10 @@
RelativePath=".\..\src\saveload\autoreplace_sl.cpp"
>
+
+
diff --git a/source.list b/source.list
index 2ab418ed74..ec4794a072 100644
--- a/source.list
+++ b/source.list
@@ -548,6 +548,7 @@ saveload/ai_sl.cpp
saveload/airport_sl.cpp
saveload/animated_tile_sl.cpp
saveload/autoreplace_sl.cpp
+saveload/cargomonitor_sl.cpp
saveload/cargopacket_sl.cpp
saveload/cheat_sl.cpp
saveload/company_sl.cpp
diff --git a/src/economy.cpp b/src/economy.cpp
index 1e140008af..e4eb25e230 100644
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -863,6 +863,8 @@ void StartupEconomy()
void InitializeEconomy()
{
_economy.inflation_prices = _economy.inflation_payment = 1 << 16;
+ ClearCargoPickupMonitoring();
+ ClearCargoDeliveryMonitoring();
}
/**
diff --git a/src/saveload/cargomonitor_sl.cpp b/src/saveload/cargomonitor_sl.cpp
new file mode 100644
index 0000000000..2188470a22
--- /dev/null
+++ b/src/saveload/cargomonitor_sl.cpp
@@ -0,0 +1,103 @@
+/* $Id$ */
+
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see .
+ */
+
+/** @file cargomonitor_sl.cpp Code handling saving and loading of Cargo monitoring. */
+
+#include "../stdafx.h"
+#include "../cargomonitor.h"
+
+#include "saveload.h"
+
+/** Temporary storage of cargo monitoring data for loading or saving it. */
+struct TempStorage {
+ CargoMonitorID number;
+ uint32 amount;
+};
+
+/** Description of the #TempStorage structure for the purpose of load and save. */
+static const SaveLoad _cargomonitor_pair_desc[] = {
+ SLE_VAR(TempStorage, number, SLE_UINT32),
+ SLE_VAR(TempStorage, amount, SLE_UINT32),
+ SLE_END()
+};
+
+/** Save the #_cargo_deliveries monitoring map. */
+static void SaveDelivery()
+{
+ TempStorage storage;
+
+ int i = 0;
+ CargoMonitorMap::const_iterator iter = _cargo_deliveries.begin();
+ while (iter != _cargo_deliveries.end()) {
+ storage.number = iter->first;
+ storage.amount = iter->second;
+
+ SlSetArrayIndex(i);
+ SlObject(&storage, _cargomonitor_pair_desc);
+
+ i++;
+ iter++;
+ }
+}
+
+/** Load the #_cargo_deliveries monitoring map. */
+static void LoadDelivery()
+{
+ TempStorage storage;
+
+ ClearCargoDeliveryMonitoring();
+ for (;;) {
+ if (SlIterateArray() < 0) break;
+ SlObject(&storage, _cargomonitor_pair_desc);
+
+ std::pair p(storage.number, storage.amount);
+ _cargo_deliveries.insert(p);
+ }
+}
+
+
+/** Save the #_cargo_pickups monitoring map. */
+static void SavePickup()
+{
+ TempStorage storage;
+
+ int i = 0;
+ CargoMonitorMap::const_iterator iter = _cargo_pickups.begin();
+ while (iter != _cargo_pickups.end()) {
+ storage.number = iter->first;
+ storage.amount = iter->second;
+
+ SlSetArrayIndex(i);
+ SlObject(&storage, _cargomonitor_pair_desc);
+
+ i++;
+ iter++;
+ }
+}
+
+/** Load the #_cargo_pickups monitoring map. */
+static void LoadPickup()
+{
+ TempStorage storage;
+
+ ClearCargoPickupMonitoring();
+ for (;;) {
+ if (SlIterateArray() < 0) break;
+ SlObject(&storage, _cargomonitor_pair_desc);
+
+ std::pair p(storage.number, storage.amount);
+ _cargo_pickups.insert(p);
+ }
+}
+
+/** Chunk definition of the cargomonitoring maps. */
+extern const ChunkHandler _cargomonitor_chunk_handlers[] = {
+ { 'CMDL', SaveDelivery, LoadDelivery, NULL, NULL, CH_ARRAY},
+ { 'CMPU', SavePickup, LoadPickup, NULL, NULL, CH_ARRAY | CH_LAST},
+};
diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp
index f9e569680f..7cc1da4ed2 100644
--- a/src/saveload/saveload.cpp
+++ b/src/saveload/saveload.cpp
@@ -409,6 +409,7 @@ extern const ChunkHandler _station_chunk_handlers[];
extern const ChunkHandler _industry_chunk_handlers[];
extern const ChunkHandler _economy_chunk_handlers[];
extern const ChunkHandler _subsidy_chunk_handlers[];
+extern const ChunkHandler _cargomonitor_chunk_handlers[];
extern const ChunkHandler _goal_chunk_handlers[];
extern const ChunkHandler _ai_chunk_handlers[];
extern const ChunkHandler _game_chunk_handlers[];
@@ -437,6 +438,7 @@ static const ChunkHandler * const _chunk_handlers[] = {
_industry_chunk_handlers,
_economy_chunk_handlers,
_subsidy_chunk_handlers,
+ _cargomonitor_chunk_handlers,
_goal_chunk_handlers,
_engine_chunk_handlers,
_town_chunk_handlers,