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

Limit linkgraph recalc interval to minimum of 2 ticks.

Browse Source 
The interval could otherwise fall to 1 tick at very high day lengths,
and low number of days interval, with recalc not scaled by day length
enabled.
This commit is contained in:
Jonathan G Rennison
2016-01-31 12:22:03 +00:00
parent 9c49ba43da
commit 61ff4f5d97
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/linkgraph/linkgraphschedule.cpp
View File

@@ -193,7 +193,7 @@ void StateGameLoop_LinkGraphPauseControl()
if (_date % _settings_game.linkgraph.recalc_interval != _settings_game.linkgraph.recalc_interval / 2) return;
} else {
int date_ticks = ((_date * DAY_TICKS) + _date_fract - (LinkGraphSchedule::SPAWN_JOIN_TICK - 1));
int interval = (_settings_game.linkgraph.recalc_interval * DAY_TICKS / _settings_game.economy.day_length_factor);
int interval = max<int>(2, (_settings_game.linkgraph.recalc_interval * DAY_TICKS / _settings_game.economy.day_length_factor));
if (date_ticks % interval != interval / 2) return;
}
@@ -217,7 +217,7 @@ void OnTick_LinkGraph()
interval = _settings_game.linkgraph.recalc_interval;
offset = _date % interval;
} else {
interval = (_settings_game.linkgraph.recalc_interval * DAY_TICKS / _settings_game.economy.day_length_factor);
interval = max<int>(2, (_settings_game.linkgraph.recalc_interval * DAY_TICKS / _settings_game.economy.day_length_factor));
offset = ((_date * DAY_TICKS) + _date_fract - LinkGraphSchedule::SPAWN_JOIN_TICK) % interval;
}
if (offset == 0) {