dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use insert hints for station flow/share map insertion

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-09-23 18:46:43 +01:00
parent 725ff47267
commit 1391f8fc59
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/saveload/station_sl.cpp
View File

@@ -585,7 +585,7 @@ static void Load_STNN()
if (!IsSavegameVersionBefore(SLV_187)) flow.restricted = (buffer->ReadByte() != 0); if (!IsSavegameVersionBefore(SLV_187)) flow.restricted = (buffer->ReadByte() != 0);
if (fs == nullptr || prev_source != flow.source) { if (fs == nullptr || prev_source != flow.source) {
fs = &(st->goods[i].flows.insert(std::make_pair(flow.source, FlowStat(flow.via, flow.share, flow.restricted))).first->second); fs = &(st->goods[i].flows.insert(st->goods[i].flows.end(), std::make_pair(flow.source, FlowStat(flow.via, flow.share, flow.restricted)))->second);
} else { } else {
fs->AppendShare(flow.via, flow.share, flow.restricted); fs->AppendShare(flow.via, flow.share, flow.restricted);
} }

3
src/station_base.h
View File

@@ -74,7 +74,8 @@ public:
inline void AppendShare(StationID st, uint flow, bool restricted = false) inline void AppendShare(StationID st, uint flow, bool restricted = false)
{ {
assert(flow > 0); assert(flow > 0);
this->shares[(--this->shares.end())->first + flow] = st; uint32 key = (--this->shares.end())->first + flow;
this->shares.insert(this->shares.end(), std::make_pair(key, st));
if (!restricted) this->unrestricted += flow; if (!restricted) this->unrestricted += flow;
} }