Files
@ r24099:6a59e91030f9
Branch filter:
Location: cpp/openttd-patchpack/source/src/saveload/cargopacket_sl.cpp - annotation
r24099:6a59e91030f9
4.7 KiB
text/x-c
Fix #7944: Demolishing locks built on rivers didn't always restore the river
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 | r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r10571:99cb9a95b4cf r10571:99cb9a95b4cf r10571:99cb9a95b4cf r13287:52547c48c3ba r13287:52547c48c3ba r10571:99cb9a95b4cf r10571:99cb9a95b4cf r10571:99cb9a95b4cf r21383:942c32fb8b0e r21383:942c32fb8b0e r17625:366001a31c88 r17625:366001a31c88 r17625:366001a31c88 r13287:52547c48c3ba r13287:52547c48c3ba r23264:b36243874b4a r19944:25a78576fb5e r13444:93a257b9ec0b r13444:93a257b9ec0b r13444:93a257b9ec0b r13444:93a257b9ec0b r13444:93a257b9ec0b r23966:9de0a0960701 r20348:d6fd0cf0c673 r13294:1c7a8cd8e77d r13287:52547c48c3ba r13287:52547c48c3ba r13287:52547c48c3ba r13287:52547c48c3ba r13287:52547c48c3ba r13287:52547c48c3ba r13287:52547c48c3ba r13444:93a257b9ec0b r13444:93a257b9ec0b r13444:93a257b9ec0b r13444:93a257b9ec0b r23954:8e43140b9a66 r13287:52547c48c3ba r13287:52547c48c3ba r13287:52547c48c3ba r20348:d6fd0cf0c673 r13294:1c7a8cd8e77d r13287:52547c48c3ba r13287:52547c48c3ba r13287:52547c48c3ba r13287:52547c48c3ba r13287:52547c48c3ba r13287:52547c48c3ba r13287:52547c48c3ba r13287:52547c48c3ba r23264:b36243874b4a r13287:52547c48c3ba r23956:102d2d7daf23 r13287:52547c48c3ba r13287:52547c48c3ba r13287:52547c48c3ba r13297:221c8d555eb9 r23264:b36243874b4a r13297:221c8d555eb9 r13297:221c8d555eb9 r13297:221c8d555eb9 r23966:9de0a0960701 r13297:221c8d555eb9 r23954:8e43140b9a66 r13297:221c8d555eb9 r13297:221c8d555eb9 r13297:221c8d555eb9 r20054:152d076eb07b r23264:b36243874b4a r23966:9de0a0960701 r20054:152d076eb07b r13287:52547c48c3ba r13287:52547c48c3ba r13203:2e49af5aeba4 r13203:2e49af5aeba4 r13203:2e49af5aeba4 r13203:2e49af5aeba4 r13203:2e49af5aeba4 r13203:2e49af5aeba4 r13203:2e49af5aeba4 r13203:2e49af5aeba4 r13203:2e49af5aeba4 r13203:2e49af5aeba4 r13203:2e49af5aeba4 r13203:2e49af5aeba4 r13203:2e49af5aeba4 r13203:2e49af5aeba4 r23264:b36243874b4a r23264:b36243874b4a r12269:f94731e7dc53 r13203:2e49af5aeba4 r23264:b36243874b4a r10571:99cb9a95b4cf r13203:2e49af5aeba4 r13203:2e49af5aeba4 r13203:2e49af5aeba4 r13203:2e49af5aeba4 r10571:99cb9a95b4cf r17625:366001a31c88 r17625:366001a31c88 r17625:366001a31c88 r10571:99cb9a95b4cf r10571:99cb9a95b4cf r23956:102d2d7daf23 r10571:99cb9a95b4cf r13203:2e49af5aeba4 r10571:99cb9a95b4cf r10571:99cb9a95b4cf r10571:99cb9a95b4cf r17625:366001a31c88 r17625:366001a31c88 r17625:366001a31c88 r10571:99cb9a95b4cf r10571:99cb9a95b4cf r10571:99cb9a95b4cf r10571:99cb9a95b4cf r10571:99cb9a95b4cf r10571:99cb9a95b4cf r13203:2e49af5aeba4 r10571:99cb9a95b4cf r10571:99cb9a95b4cf r10571:99cb9a95b4cf r17625:366001a31c88 r10571:99cb9a95b4cf r23607:36c15679007d r10571:99cb9a95b4cf | /*
* 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 <http://www.gnu.org/licenses/>.
*/
/** @file cargopacket_sl.cpp Code handling saving and loading of cargo packets */
#include "../stdafx.h"
#include "../vehicle_base.h"
#include "../station_base.h"
#include "saveload.h"
#include "../safeguards.h"
/**
* Savegame conversion for cargopackets.
*/
/* static */ void CargoPacket::AfterLoad()
{
if (IsSavegameVersionBefore(SLV_44)) {
/* If we remove a station while cargo from it is still en route, payment calculation will assume
* 0, 0 to be the source of the cargo, resulting in very high payments usually. v->source_xy
* stores the coordinates, preserving them even if the station is removed. However, if a game is loaded
* where this situation exists, the cargo-source information is lost. in this case, we set the source
* to the current tile of the vehicle to prevent excessive profits
*/
for (const Vehicle *v : Vehicle::Iterate()) {
const CargoPacketList *packets = v->cargo.Packets();
for (VehicleCargoList::ConstIterator it(packets->begin()); it != packets->end(); it++) {
CargoPacket *cp = *it;
cp->source_xy = Station::IsValidID(cp->source) ? Station::Get(cp->source)->xy : v->tile;
cp->loaded_at_xy = cp->source_xy;
}
}
/* Store position of the station where the goods come from, so there
* are no very high payments when stations get removed. However, if the
* station where the goods came from is already removed, the source
* information is lost. In that case we set it to the position of this
* station */
for (Station *st : Station::Iterate()) {
for (CargoID c = 0; c < NUM_CARGO; c++) {
GoodsEntry *ge = &st->goods[c];
const StationCargoPacketMap *packets = ge->cargo.Packets();
for (StationCargoList::ConstIterator it(packets->begin()); it != packets->end(); it++) {
CargoPacket *cp = *it;
cp->source_xy = Station::IsValidID(cp->source) ? Station::Get(cp->source)->xy : st->xy;
cp->loaded_at_xy = cp->source_xy;
}
}
}
}
if (IsSavegameVersionBefore(SLV_120)) {
/* CargoPacket's source should be either INVALID_STATION or a valid station */
for (CargoPacket *cp : CargoPacket::Iterate()) {
if (!Station::IsValidID(cp->source)) cp->source = INVALID_STATION;
}
}
if (!IsSavegameVersionBefore(SLV_68)) {
/* Only since version 68 we have cargo packets. Savegames from before used
* 'new CargoPacket' + cargolist.Append so their caches are already
* correct and do not need rebuilding. */
for (Vehicle *v : Vehicle::Iterate()) v->cargo.InvalidateCache();
for (Station *st : Station::Iterate()) {
for (CargoID c = 0; c < NUM_CARGO; c++) st->goods[c].cargo.InvalidateCache();
}
}
if (IsSavegameVersionBefore(SLV_181)) {
for (Vehicle *v : Vehicle::Iterate()) v->cargo.KeepAll();
}
}
/**
* Wrapper function to get the CargoPacket's internal structure while
* some of the variables itself are private.
* @return the saveload description for CargoPackets.
*/
const SaveLoad *GetCargoPacketDesc()
{
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_CONDVAR(CargoPacket, source_type, SLE_UINT8, SLV_125, SL_MAX_VERSION),
SLE_CONDVAR(CargoPacket, source_id, SLE_UINT16, SLV_125, SL_MAX_VERSION),
/* Used to be paid_for, but that got changed. */
SLE_CONDNULL(1, SL_MIN_VERSION, SLV_121),
SLE_END()
};
return _cargopacket_desc;
}
/**
* Save the cargo packets.
*/
static void Save_CAPA()
{
for (CargoPacket *cp : CargoPacket::Iterate()) {
SlSetArrayIndex(cp->index);
SlObject(cp, GetCargoPacketDesc());
}
}
/**
* Load the cargo packets.
*/
static void Load_CAPA()
{
int index;
while ((index = SlIterateArray()) != -1) {
CargoPacket *cp = new (index) CargoPacket();
SlObject(cp, GetCargoPacketDesc());
}
}
/** Chunk handlers related to cargo packets. */
extern const ChunkHandler _cargopacket_chunk_handlers[] = {
{ 'CAPA', Save_CAPA, Load_CAPA, nullptr, nullptr, CH_ARRAY | CH_LAST},
};
|