mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r25637) -Fix: don't keep minimal routing information if automatic distribution has been disabled

This commit is contained in:
fonsinchen 2013-07-30 19:03:56 +00:00
parent 456627e01c
commit ca1c792144
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/linkgraph/linkgraphjob.cpp
View File

@ -74,14 +74,21 @@ LinkGraphJob::~LinkGraphJob()
/* Swap shares and invalidate ones that are completely deleted. Don't
* really delete them as we could then end up with unroutable cargo
* somewhere. */
for (FlowStatMap::iterator it(ge.flows.begin()); it != ge.flows.end(); ++it) {
* somewhere. Do delete them if automatic distribution has been turned
* off for that cargo, though. */
for (FlowStatMap::iterator it(ge.flows.begin()); it != ge.flows.end();) {
FlowStatMap::iterator new_it = flows.find(it->first);
if (new_it == flows.end()) {
it->second.Invalidate();
if (_settings_game.linkgraph.GetDistributionType(this->Cargo()) != DT_MANUAL) {
it->second.Invalidate();
++it;
} else {
ge.flows.erase(it++);
}
} else {
it->second.SwapShares(new_it->second);
flows.erase(new_it);
++it;
}
}
ge.flows.insert(flows.begin(), flows.end());