Files
@ r24099:6a59e91030f9
Branch filter:
Location: cpp/openttd-patchpack/source/src/saveload/linkgraph_sl.cpp - annotation
r24099:6a59e91030f9
8.1 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 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 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 | r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20345:3f31790c09c9 r20345:3f31790c09c9 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r21383:942c32fb8b0e r21383:942c32fb8b0e r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20345:3f31790c09c9 r20345:3f31790c09c9 r21480:0acd84047e70 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20853:63f0a4343cc3 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r23538:8df50944b27a r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r23520:20bbc807b0eb r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r23607:36c15679007d r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r23532:dc91fcd293f5 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20853:63f0a4343cc3 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r23532:dc91fcd293f5 r23520:20bbc807b0eb r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r23264:b36243874b4a r21529:6bf3ee37953c r21529:6bf3ee37953c r21529:6bf3ee37953c r21529:6bf3ee37953c r21529:6bf3ee37953c r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r23264:b36243874b4a r21529:6bf3ee37953c r21529:6bf3ee37953c r21529:6bf3ee37953c r23264:b36243874b4a r21529:6bf3ee37953c r21529:6bf3ee37953c r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r23023:7b8669afd1db r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r23264:b36243874b4a r21529:6bf3ee37953c r21529:6bf3ee37953c r21529:6bf3ee37953c r21529:6bf3ee37953c r21529:6bf3ee37953c r21529:6bf3ee37953c r21529:6bf3ee37953c r21529:6bf3ee37953c r21529:6bf3ee37953c r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r22021:daba722f3935 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r23264:b36243874b4a r23963:b6586baea514 r21529:6bf3ee37953c r23726:97431e47d49a r23726:97431e47d49a r21529:6bf3ee37953c r21529:6bf3ee37953c r21529:6bf3ee37953c r23963:b6586baea514 r23963:b6586baea514 r21529:6bf3ee37953c r23726:97431e47d49a r23726:97431e47d49a r21529:6bf3ee37953c r21529:6bf3ee37953c r21529:6bf3ee37953c r21529:6bf3ee37953c r22021:daba722f3935 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r23963:b6586baea514 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20251:8c2b509af318 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r23963:b6586baea514 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r22021:daba722f3935 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r20345:3f31790c09c9 r22021:daba722f3935 r20345:3f31790c09c9 r20345:3f31790c09c9 r20251:8c2b509af318 r23620:1030ace82d57 r23620:1030ace82d57 r23607:36c15679007d r20251:8c2b509af318 | /*
* 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 linkgraph_sl.cpp Code handling saving and loading of link graphs */
#include "../stdafx.h"
#include "../linkgraph/linkgraph.h"
#include "../linkgraph/linkgraphjob.h"
#include "../linkgraph/linkgraphschedule.h"
#include "../settings_internal.h"
#include "saveload.h"
#include "../safeguards.h"
typedef LinkGraph::BaseNode Node;
typedef LinkGraph::BaseEdge Edge;
const SettingDesc *GetSettingDescription(uint index);
static uint16 _num_nodes;
/**
* Get a SaveLoad array for a link graph.
* @return SaveLoad array for link graph.
*/
const SaveLoad *GetLinkGraphDesc()
{
static const SaveLoad link_graph_desc[] = {
SLE_VAR(LinkGraph, last_compression, SLE_INT32),
SLEG_VAR(_num_nodes, SLE_UINT16),
SLE_VAR(LinkGraph, cargo, SLE_UINT8),
SLE_END()
};
return link_graph_desc;
}
/**
* Get a SaveLoad array for a link graph job. The settings struct is derived from
* the global settings saveload array. The exact entries are calculated when the function
* is called the first time.
* It's necessary to keep a copy of the settings for each link graph job so that you can
* change the settings while in-game and still not mess with current link graph runs.
* Of course the settings have to be saved and loaded, too, to avoid desyncs.
* @return Array of SaveLoad structs.
*/
const SaveLoad *GetLinkGraphJobDesc()
{
static std::vector<SaveLoad> saveloads;
static const char *prefix = "linkgraph.";
/* Build the SaveLoad array on first call and don't touch it later on */
if (saveloads.size() == 0) {
size_t offset_gamesettings = cpp_offsetof(GameSettings, linkgraph);
size_t offset_component = cpp_offsetof(LinkGraphJob, settings);
size_t prefixlen = strlen(prefix);
int setting = 0;
const SettingDesc *desc = GetSettingDescription(setting);
while (desc->save.cmd != SL_END) {
if (desc->desc.name != nullptr && strncmp(desc->desc.name, prefix, prefixlen) == 0) {
SaveLoad sl = desc->save;
char *&address = reinterpret_cast<char *&>(sl.address);
address -= offset_gamesettings;
address += offset_component;
saveloads.push_back(sl);
}
desc = GetSettingDescription(++setting);
}
const SaveLoad job_desc[] = {
SLE_VAR(LinkGraphJob, join_date, SLE_INT32),
SLE_VAR(LinkGraphJob, link_graph.index, SLE_UINT16),
SLE_END()
};
int i = 0;
do {
saveloads.push_back(job_desc[i++]);
} while (saveloads[saveloads.size() - 1].cmd != SL_END);
}
return &saveloads[0];
}
/**
* Get a SaveLoad array for the link graph schedule.
* @return SaveLoad array for the link graph schedule.
*/
const SaveLoad *GetLinkGraphScheduleDesc()
{
static const SaveLoad schedule_desc[] = {
SLE_LST(LinkGraphSchedule, schedule, REF_LINK_GRAPH),
SLE_LST(LinkGraphSchedule, running, REF_LINK_GRAPH_JOB),
SLE_END()
};
return schedule_desc;
}
/* Edges and nodes are saved in the correct order, so we don't need to save their IDs. */
/**
* SaveLoad desc for a link graph node.
*/
static const SaveLoad _node_desc[] = {
SLE_CONDVAR(Node, xy, SLE_UINT32, SLV_191, SL_MAX_VERSION),
SLE_VAR(Node, supply, SLE_UINT32),
SLE_VAR(Node, demand, SLE_UINT32),
SLE_VAR(Node, station, SLE_UINT16),
SLE_VAR(Node, last_update, SLE_INT32),
SLE_END()
};
/**
* SaveLoad desc for a link graph edge.
*/
static const SaveLoad _edge_desc[] = {
SLE_CONDNULL(4, SL_MIN_VERSION, SLV_191), // distance
SLE_VAR(Edge, capacity, SLE_UINT32),
SLE_VAR(Edge, usage, SLE_UINT32),
SLE_VAR(Edge, last_unrestricted_update, SLE_INT32),
SLE_CONDVAR(Edge, last_restricted_update, SLE_INT32, SLV_187, SL_MAX_VERSION),
SLE_VAR(Edge, next_edge, SLE_UINT16),
SLE_END()
};
/**
* Save/load a link graph.
* @param lg Link graph to be saved or loaded.
*/
void SaveLoad_LinkGraph(LinkGraph &lg)
{
uint size = lg.Size();
for (NodeID from = 0; from < size; ++from) {
Node *node = &lg.nodes[from];
SlObject(node, _node_desc);
if (IsSavegameVersionBefore(SLV_191)) {
/* We used to save the full matrix ... */
for (NodeID to = 0; to < size; ++to) {
SlObject(&lg.edges[from][to], _edge_desc);
}
} else {
/* ... but as that wasted a lot of space we save a sparse matrix now. */
for (NodeID to = from; to != INVALID_NODE; to = lg.edges[from][to].next_edge) {
SlObject(&lg.edges[from][to], _edge_desc);
}
}
}
}
/**
* Save a link graph job.
* @param lgj LinkGraphJob to be saved.
*/
static void DoSave_LGRJ(LinkGraphJob *lgj)
{
SlObject(lgj, GetLinkGraphJobDesc());
_num_nodes = lgj->Size();
SlObject(const_cast<LinkGraph *>(&lgj->Graph()), GetLinkGraphDesc());
SaveLoad_LinkGraph(const_cast<LinkGraph &>(lgj->Graph()));
}
/**
* Save a link graph.
* @param lg LinkGraph to be saved.
*/
static void DoSave_LGRP(LinkGraph *lg)
{
_num_nodes = lg->Size();
SlObject(lg, GetLinkGraphDesc());
SaveLoad_LinkGraph(*lg);
}
/**
* Load all link graphs.
*/
static void Load_LGRP()
{
int index;
while ((index = SlIterateArray()) != -1) {
if (!LinkGraph::CanAllocateItem()) {
/* Impossible as they have been present in previous game. */
NOT_REACHED();
}
LinkGraph *lg = new (index) LinkGraph();
SlObject(lg, GetLinkGraphDesc());
lg->Init(_num_nodes);
SaveLoad_LinkGraph(*lg);
}
}
/**
* Load all link graph jobs.
*/
static void Load_LGRJ()
{
int index;
while ((index = SlIterateArray()) != -1) {
if (!LinkGraphJob::CanAllocateItem()) {
/* Impossible as they have been present in previous game. */
NOT_REACHED();
}
LinkGraphJob *lgj = new (index) LinkGraphJob();
SlObject(lgj, GetLinkGraphJobDesc());
LinkGraph &lg = const_cast<LinkGraph &>(lgj->Graph());
SlObject(&lg, GetLinkGraphDesc());
lg.Init(_num_nodes);
SaveLoad_LinkGraph(lg);
}
}
/**
* Load the link graph schedule.
*/
static void Load_LGRS()
{
SlObject(&LinkGraphSchedule::instance, GetLinkGraphScheduleDesc());
}
/**
* Spawn the threads for running link graph calculations.
* Has to be done after loading as the cargo classes might have changed.
*/
void AfterLoadLinkGraphs()
{
if (IsSavegameVersionBefore(SLV_191)) {
for (LinkGraph *lg : LinkGraph::Iterate()) {
for (NodeID node_id = 0; node_id < lg->Size(); ++node_id) {
const Station *st = Station::GetIfValid((*lg)[node_id].Station());
if (st != nullptr) (*lg)[node_id].UpdateLocation(st->xy);
}
}
for (LinkGraphJob *lgj : LinkGraphJob::Iterate()) {
LinkGraph *lg = &(const_cast<LinkGraph &>(lgj->Graph()));
for (NodeID node_id = 0; node_id < lg->Size(); ++node_id) {
const Station *st = Station::GetIfValid((*lg)[node_id].Station());
if (st != nullptr) (*lg)[node_id].UpdateLocation(st->xy);
}
}
}
LinkGraphSchedule::instance.SpawnAll();
}
/**
* Save all link graphs.
*/
static void Save_LGRP()
{
for (LinkGraph *lg : LinkGraph::Iterate()) {
SlSetArrayIndex(lg->index);
SlAutolength((AutolengthProc*)DoSave_LGRP, lg);
}
}
/**
* Save all link graph jobs.
*/
static void Save_LGRJ()
{
for (LinkGraphJob *lgj : LinkGraphJob::Iterate()) {
SlSetArrayIndex(lgj->index);
SlAutolength((AutolengthProc*)DoSave_LGRJ, lgj);
}
}
/**
* Save the link graph schedule.
*/
static void Save_LGRS()
{
SlObject(&LinkGraphSchedule::instance, GetLinkGraphScheduleDesc());
}
/**
* Substitute pointers in link graph schedule.
*/
static void Ptrs_LGRS()
{
SlObject(&LinkGraphSchedule::instance, GetLinkGraphScheduleDesc());
}
extern const ChunkHandler _linkgraph_chunk_handlers[] = {
{ 'LGRP', Save_LGRP, Load_LGRP, nullptr, nullptr, CH_ARRAY },
{ 'LGRJ', Save_LGRJ, Load_LGRJ, nullptr, nullptr, CH_ARRAY },
{ 'LGRS', Save_LGRS, Load_LGRS, Ptrs_LGRS, nullptr, CH_LAST }
};
|