Files
@ r27443:1150c64644d0
Branch filter:
Location: cpp/openttd-patchpack/source/src/saveload/waypoint_sl.cpp - annotation
r27443:1150c64644d0
8.2 KiB
text/x-c
Fix: Check max member count in squirrel classes (#10883)
Manual cherry-pick from https://github.com/albertodemichelis/squirrel/commit/23a0620658714b996d20da3d4dd1a0dcf9b0bd98
Manual cherry-pick from https://github.com/albertodemichelis/squirrel/commit/23a0620658714b996d20da3d4dd1a0dcf9b0bd98
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 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 | r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r10571:99cb9a95b4cf r10571:99cb9a95b4cf r10571:99cb9a95b4cf r12465:c1b760a56db7 r24019:2a8d9e30042d r10571:99cb9a95b4cf r12462:a7cb564c6c56 r10571:99cb9a95b4cf r14248:a9050881acd7 r27166:64e04a3ef9b1 r10571:99cb9a95b4cf r10571:99cb9a95b4cf r10571:99cb9a95b4cf r12411:4ac6b3dd713f r10571:99cb9a95b4cf r21383:942c32fb8b0e r21383:942c32fb8b0e r12462:a7cb564c6c56 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r24214:a65c412aafcc r12462:a7cb564c6c56 r27166:64e04a3ef9b1 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r23674:a5bafa1a02c5 r10571:99cb9a95b4cf r12462:a7cb564c6c56 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r23538:8df50944b27a r10571:99cb9a95b4cf r12462:a7cb564c6c56 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r23536:ce42deb0b32d r23536:ce42deb0b32d r12462:a7cb564c6c56 r23536:ce42deb0b32d r12462:a7cb564c6c56 r10571:99cb9a95b4cf r10571:99cb9a95b4cf r10571:99cb9a95b4cf r12462:a7cb564c6c56 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r23264:b36243874b4a r23536:ce42deb0b32d r23536:ce42deb0b32d r14990:0208b1161624 r14990:0208b1161624 r26931:7d5bce03e821 r26931:7d5bce03e821 r14990:0208b1161624 r26931:7d5bce03e821 r26931:7d5bce03e821 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r23536:ce42deb0b32d r19263:8bc163eb7eb2 r19263:8bc163eb7eb2 r19263:8bc163eb7eb2 r23607:36c15679007d r23536:ce42deb0b32d r12462:a7cb564c6c56 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r23520:20bbc807b0eb r17307:95455536d763 r12462:a7cb564c6c56 r23536:ce42deb0b32d r24019:2a8d9e30042d r24019:2a8d9e30042d r24019:2a8d9e30042d r26931:7d5bce03e821 r25655:1030dcb7eb52 r26787:a51c38e4aac5 r26931:7d5bce03e821 r25655:1030dcb7eb52 r24019:2a8d9e30042d r24019:2a8d9e30042d r24019:2a8d9e30042d r24019:2a8d9e30042d r26787:a51c38e4aac5 r24019:2a8d9e30042d r24019:2a8d9e30042d r24019:2a8d9e30042d r24019:2a8d9e30042d r23536:ce42deb0b32d r23536:ce42deb0b32d r23536:ce42deb0b32d r12462:a7cb564c6c56 r23536:ce42deb0b32d r23536:ce42deb0b32d r24019:2a8d9e30042d r12462:a7cb564c6c56 r24019:2a8d9e30042d r26931:7d5bce03e821 r26931:7d5bce03e821 r10571:99cb9a95b4cf r24019:2a8d9e30042d r26931:7d5bce03e821 r24019:2a8d9e30042d r26931:7d5bce03e821 r12462:a7cb564c6c56 r26931:7d5bce03e821 r12462:a7cb564c6c56 r24019:2a8d9e30042d r26931:7d5bce03e821 r12462:a7cb564c6c56 r26931:7d5bce03e821 r12462:a7cb564c6c56 r23536:ce42deb0b32d r12462:a7cb564c6c56 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r23965:e71e85950eb1 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r23607:36c15679007d r12462:a7cb564c6c56 r10571:99cb9a95b4cf r23966:9de0a0960701 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r24050:f8e8c5212967 r24050:f8e8c5212967 r24050:f8e8c5212967 r24050:f8e8c5212967 r24050:f8e8c5212967 r23522:1fb564b1efa6 r23522:1fb564b1efa6 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r12462:a7cb564c6c56 r23264:b36243874b4a r23264:b36243874b4a r23264:b36243874b4a r23264:b36243874b4a r23264:b36243874b4a r23264:b36243874b4a r23264:b36243874b4a r24214:a65c412aafcc r12462:a7cb564c6c56 r12462:a7cb564c6c56 r23264:b36243874b4a r23264:b36243874b4a r23264:b36243874b4a r23264:b36243874b4a r23264:b36243874b4a r10571:99cb9a95b4cf r10571:99cb9a95b4cf r25773:457e167f3c9e r25774:14ee6e7f4ecc r12411:4ac6b3dd713f r25773:457e167f3c9e r25773:457e167f3c9e r25773:457e167f3c9e r25773:457e167f3c9e r12411:4ac6b3dd713f r25773:457e167f3c9e r25773:457e167f3c9e r25773:457e167f3c9e r25773:457e167f3c9e r25773:457e167f3c9e r25773:457e167f3c9e r25773:457e167f3c9e r12411:4ac6b3dd713f r10571:99cb9a95b4cf r25773:457e167f3c9e r25773:457e167f3c9e r25773:457e167f3c9e r25773:457e167f3c9e r25773:457e167f3c9e r10571:99cb9a95b4cf r25773:457e167f3c9e r25773:457e167f3c9e r25773:457e167f3c9e r25773:457e167f3c9e r25773:457e167f3c9e r25773:457e167f3c9e r25773:457e167f3c9e r25773:457e167f3c9e r25773:457e167f3c9e r25773:457e167f3c9e r25773:457e167f3c9e r25773:457e167f3c9e r25773:457e167f3c9e r25773:457e167f3c9e r25773:457e167f3c9e r25773:457e167f3c9e r25773:457e167f3c9e r25773:457e167f3c9e r25773:457e167f3c9e r25773:457e167f3c9e r25773:457e167f3c9e r25773:457e167f3c9e r25773:457e167f3c9e r25773:457e167f3c9e r25772:5ba83ce3a853 r25772:5ba83ce3a853 r10571:99cb9a95b4cf r25596:7bf7822e5659 r25596:7bf7822e5659 | /*
* 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 waypoint_sl.cpp Code handling saving and loading of waypoints */
#include "../stdafx.h"
#include "../waypoint_base.h"
#include "../debug.h"
#include "../newgrf_station.h"
#include "../vehicle_base.h"
#include "../town.h"
#include "../newgrf.h"
#include "../timer/timer_game_calendar.h"
#include "table/strings.h"
#include "saveload_internal.h"
#include "../safeguards.h"
/** Helper structure to convert from the old waypoint system. */
struct OldWaypoint {
size_t index;
TileIndex xy;
TownID town_index;
Town *town;
uint16 town_cn;
StringID string_id;
std::string name;
uint8 delete_ctr;
TimerGameCalendar::Date build_date;
uint8 localidx;
uint32 grfid;
const StationSpec *spec;
Owner owner;
size_t new_index;
};
/** Temporary array with old waypoints. */
static std::vector<OldWaypoint> _old_waypoints;
/**
* Update the waypoint orders to get the new waypoint ID.
* @param o the order 'list' to check.
*/
static void UpdateWaypointOrder(Order *o)
{
if (!o->IsType(OT_GOTO_WAYPOINT)) return;
for (OldWaypoint &wp : _old_waypoints) {
if (wp.index != o->GetDestination()) continue;
o->SetDestination((DestinationID)wp.new_index);
return;
}
}
/**
* Perform all steps to upgrade from the old waypoints to the new version
* that uses station. This includes some old saveload mechanics.
*/
void MoveWaypointsToBaseStations()
{
/* In version 17, ground type is moved from m2 to m4 for depots and
* waypoints to make way for storing the index in m2. The custom graphics
* id which was stored in m4 is now saved as a grf/id reference in the
* waypoint struct. */
if (IsSavegameVersionBefore(SLV_17)) {
for (OldWaypoint &wp : _old_waypoints) {
if (wp.delete_ctr != 0) continue; // The waypoint was deleted
/* Waypoint indices were not added to the map prior to this. */
Tile tile = wp.xy;
tile.m2() = (StationID)wp.index;
if (HasBit(tile.m3(), 4)) {
wp.spec = StationClass::Get(STAT_CLASS_WAYP)->GetSpec(tile.m4() + 1);
}
}
} else {
/* As of version 17, we recalculate the custom graphic ID of waypoints
* from the GRF ID / station index. */
for (OldWaypoint &wp : _old_waypoints) {
StationClass* stclass = StationClass::Get(STAT_CLASS_WAYP);
for (uint i = 0; i < stclass->GetSpecCount(); i++) {
const StationSpec *statspec = stclass->GetSpec(i);
if (statspec != nullptr && statspec->grf_prop.grffile->grfid == wp.grfid && statspec->grf_prop.local_id == wp.localidx) {
wp.spec = statspec;
break;
}
}
}
}
if (!Waypoint::CanAllocateItem(_old_waypoints.size())) SlError(STR_ERROR_TOO_MANY_STATIONS_LOADING);
/* All saveload conversions have been done. Create the new waypoints! */
for (OldWaypoint &wp : _old_waypoints) {
TileIndex t = wp.xy;
/* Sometimes waypoint (sign) locations became disconnected from their actual location in
* the map array. If this is the case, try to locate the actual location in the map array */
if (!IsTileType(t, MP_RAILWAY) || GetRailTileType(t) != 2 /* RAIL_TILE_WAYPOINT */ || Tile(t).m2() != wp.index) {
Debug(sl, 0, "Found waypoint tile {} with invalid position", t);
for (t = 0; t < Map::Size(); t++) {
if (IsTileType(t, MP_RAILWAY) && GetRailTileType(t) == 2 /* RAIL_TILE_WAYPOINT */ && Tile(t).m2() == wp.index) {
Debug(sl, 0, "Found actual waypoint position at {}", t);
break;
}
}
}
if (t == Map::Size()) {
SlErrorCorrupt("Waypoint with invalid tile");
}
Waypoint *new_wp = new Waypoint(t);
new_wp->town = wp.town;
new_wp->town_cn = wp.town_cn;
new_wp->name = wp.name;
new_wp->delete_ctr = 0; // Just reset delete counter for once.
new_wp->build_date = wp.build_date;
new_wp->owner = wp.owner;
new_wp->string_id = STR_SV_STNAME_WAYPOINT;
/* The tile might've been reserved! */
Tile tile(t);
bool reserved = !IsSavegameVersionBefore(SLV_100) && HasBit(tile.m5(), 4);
/* The tile really has our waypoint, so reassign the map array */
MakeRailWaypoint(tile, GetTileOwner(tile), new_wp->index, (Axis)GB(tile.m5(), 0, 1), 0, GetRailType(tile));
new_wp->facilities |= FACIL_TRAIN;
new_wp->owner = GetTileOwner(tile);
SetRailStationReservation(tile, reserved);
if (wp.spec != nullptr) {
SetCustomStationSpecIndex(tile, AllocateSpecToStation(wp.spec, new_wp, true));
}
new_wp->rect.BeforeAddTile(tile, StationRect::ADD_FORCE);
wp.new_index = new_wp->index;
}
/* Update the orders of vehicles */
for (OrderList *ol : OrderList::Iterate()) {
if (ol->GetFirstSharedVehicle()->type != VEH_TRAIN) continue;
for (Order *o = ol->GetFirstOrder(); o != nullptr; o = o->next) UpdateWaypointOrder(o);
}
for (Vehicle *v : Vehicle::Iterate()) {
if (v->type != VEH_TRAIN) continue;
UpdateWaypointOrder(&v->current_order);
}
ResetOldWaypoints();
}
void ResetOldWaypoints()
{
_old_waypoints.clear();
_old_waypoints.shrink_to_fit();
}
static const SaveLoad _old_waypoint_desc[] = {
SLE_CONDVAR(OldWaypoint, xy, SLE_FILE_U16 | SLE_VAR_U32, SL_MIN_VERSION, SLV_6),
SLE_CONDVAR(OldWaypoint, xy, SLE_UINT32, SLV_6, SL_MAX_VERSION),
SLE_CONDVAR(OldWaypoint, town_index, SLE_UINT16, SLV_12, SLV_122),
SLE_CONDREF(OldWaypoint, town, REF_TOWN, SLV_122, SL_MAX_VERSION),
SLE_CONDVAR(OldWaypoint, town_cn, SLE_FILE_U8 | SLE_VAR_U16, SLV_12, SLV_89),
SLE_CONDVAR(OldWaypoint, town_cn, SLE_UINT16, SLV_89, SL_MAX_VERSION),
SLE_CONDVAR(OldWaypoint, string_id, SLE_STRINGID, SL_MIN_VERSION, SLV_84),
SLE_CONDSSTR(OldWaypoint, name, SLE_STR, SLV_84, SL_MAX_VERSION),
SLE_VAR(OldWaypoint, delete_ctr, SLE_UINT8),
SLE_CONDVAR(OldWaypoint, build_date, SLE_FILE_U16 | SLE_VAR_I32, SLV_3, SLV_31),
SLE_CONDVAR(OldWaypoint, build_date, SLE_INT32, SLV_31, SL_MAX_VERSION),
SLE_CONDVAR(OldWaypoint, localidx, SLE_UINT8, SLV_3, SL_MAX_VERSION),
SLE_CONDVAR(OldWaypoint, grfid, SLE_UINT32, SLV_17, SL_MAX_VERSION),
SLE_CONDVAR(OldWaypoint, owner, SLE_UINT8, SLV_101, SL_MAX_VERSION),
};
struct CHKPChunkHandler : ChunkHandler {
CHKPChunkHandler() : ChunkHandler('CHKP', CH_READONLY) {}
void Load() const override
{
/* Precaution for when loading failed and it didn't get cleared */
ResetOldWaypoints();
int index;
while ((index = SlIterateArray()) != -1) {
OldWaypoint *wp = &_old_waypoints.emplace_back();
wp->index = index;
SlObject(wp, _old_waypoint_desc);
}
}
void FixPointers() const override
{
for (OldWaypoint &wp : _old_waypoints) {
SlObject(&wp, _old_waypoint_desc);
if (IsSavegameVersionBefore(SLV_12)) {
wp.town_cn = (wp.string_id & 0xC000) == 0xC000 ? (wp.string_id >> 8) & 0x3F : 0;
wp.town = ClosestTownFromTile(wp.xy, UINT_MAX);
} else if (IsSavegameVersionBefore(SLV_122)) {
/* Only for versions 12 .. 122 */
if (!Town::IsValidID(wp.town_index)) {
/* Upon a corrupted waypoint we'll likely get here. The next step will be to
* loop over all Ptrs procs to nullptr the pointers. However, we don't know
* whether we're in the nullptr or "normal" Ptrs proc. So just clear the list
* of old waypoints we constructed and then this waypoint (and the other
* possibly corrupt ones) will not be queried in the nullptr Ptrs proc run. */
_old_waypoints.clear();
SlErrorCorrupt("Referencing invalid Town");
}
wp.town = Town::Get(wp.town_index);
}
if (IsSavegameVersionBefore(SLV_84)) {
wp.name = CopyFromOldName(wp.string_id);
}
}
}
};
static const CHKPChunkHandler CHKP;
static const ChunkHandlerRef waypoint_chunk_handlers[] = {
CHKP,
};
extern const ChunkHandlerTable _waypoint_chunk_handlers(waypoint_chunk_handlers);
|