Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-02 09:40:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Limit maximum recursion depth in StationViewWindow::EstimateDestinations

Browse Source
This commit is contained in:
Jonathan G Rennison 2019-04-09 01:49:18 +01:00
parent 99055c22cb
commit 3807f0551d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/station_gui.cpp
View File

@ -1493,9 +1493,9 @@ struct StationViewWindow : public Window {
* @param count Size of the batch of cargo.
* @param dest CargoDataEntry to save the results in.
*/
void EstimateDestinations(CargoID cargo, StationID source, StationID next, uint count, CargoDataEntry *dest)
void EstimateDestinations(CargoID cargo, StationID source, StationID next, uint count, CargoDataEntry *dest, uint depth = 0)
{
if (Station::IsValidID(next) && Station::IsValidID(source)) {
if (depth <= 128 && Station::IsValidID(next) && Station::IsValidID(source)) {
CargoDataEntry tmp;
const FlowStatMap &flowmap = Station::Get(next)->goods[cargo].flows;
FlowStatMap::const_iterator map_it = flowmap.find(source);
@ -1528,7 +1528,7 @@ struct StationViewWindow : public Window {
if (child->GetStation() == next) {
dest->InsertOrRetrieve(next)->Update(estimate);
} else {
EstimateDestinations(cargo, source, child->GetStation(), estimate, dest);
EstimateDestinations(cargo, source, child->GetStation(), estimate, dest, depth + 1);
}
}
}