mirror of https://github.com/OpenTTD/OpenTTD
(svn r26753) -Fix: desync due to not always properly restoring game state from the savegame
parent
e458661fb6
commit
134ad63b80
|
@ -541,7 +541,7 @@ static void Load_STNN()
|
|||
for (uint32 j = 0; j < _num_flows; ++j) {
|
||||
SlObject(&flow, _flow_desc);
|
||||
if (fs == NULL || prev_source != flow.source) {
|
||||
fs = &(st->goods[i].flows.insert(std::make_pair(flow.source, FlowStat(flow.via, flow.share))).first->second);
|
||||
fs = &(st->goods[i].flows.insert(std::make_pair(flow.source, FlowStat(flow.via, flow.share, flow.restricted))).first->second);
|
||||
} else {
|
||||
fs->AppendShare(flow.via, flow.share, flow.restricted);
|
||||
}
|
||||
|
|
|
@ -48,12 +48,13 @@ public:
|
|||
* Create a FlowStat with an initial entry.
|
||||
* @param st Station the initial entry refers to.
|
||||
* @param flow Amount of flow for the initial entry.
|
||||
* @param restricted If the flow to be added is restricted.
|
||||
*/
|
||||
inline FlowStat(StationID st, uint flow)
|
||||
inline FlowStat(StationID st, uint flow, bool restricted = false)
|
||||
{
|
||||
assert(flow > 0);
|
||||
this->shares[flow] = st;
|
||||
this->unrestricted = flow;
|
||||
this->unrestricted = restricted ? 0 : flow;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue