|
@@ -17,6 +17,7 @@
|
|
|
#include "cargo_type.h"
|
|
|
#include "vehicle_type.h"
|
|
|
#include "core/multimap.hpp"
|
|
|
#include "saveload/saveload.h"
|
|
|
#include <list>
|
|
|
|
|
|
/** Unique identifier for a single cargo packet. */
|
|
@@ -32,7 +33,7 @@ struct GoodsEntry; // forward-declare fo
|
|
|
|
|
|
template <class Tinst, class Tcont> class CargoList;
|
|
|
class StationCargoList; // forward-declare, so we can use it in VehicleCargoList.
|
|
|
extern const struct SaveLoad *GetCargoPacketDesc();
|
|
|
extern SaveLoadTable GetCargoPacketDesc();
|
|
|
|
|
|
typedef uint32 TileOrStationID;
|
|
|
|
|
@@ -58,7 +59,7 @@ private:
|
|
|
friend class VehicleCargoList;
|
|
|
friend class StationCargoList;
|
|
|
/** We want this to be saved, right? */
|
|
|
friend const struct SaveLoad *GetCargoPacketDesc();
|
|
|
friend SaveLoadTable GetCargoPacketDesc();
|
|
|
public:
|
|
|
/** Maximum number of items in a single cargo packet. */
|
|
|
static const uint16 MAX_COUNT = UINT16_MAX;
|
|
@@ -305,7 +306,7 @@ public:
|
|
|
/** The super class ought to know what it's doing. */
|
|
|
friend class CargoList<VehicleCargoList, CargoPacketList>;
|
|
|
/** The vehicles have a cargo list (and we want that saved). */
|
|
|
friend const struct SaveLoad *GetVehicleDescription(VehicleType vt);
|
|
|
friend SaveLoadTable GetVehicleDescription(VehicleType vt);
|
|
|
|
|
|
friend class CargoShift;
|
|
|
friend class CargoTransfer;
|
|
@@ -456,7 +457,7 @@ public:
|
|
|
/** The super class ought to know what it's doing. */
|
|
|
friend class CargoList<StationCargoList, StationCargoPacketMap>;
|
|
|
/** The stations, via GoodsEntry, have a CargoList. */
|
|
|
friend const struct SaveLoad *GetGoodsDesc();
|
|
|
friend SaveLoadTable GetGoodsDesc();
|
|
|
|
|
|
friend class CargoLoad;
|
|
|
friend class CargoTransfer;
|