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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/openttd.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/table/settings/gameopt_settings.ini
#	src/table/settings/gui_settings.ini
This commit is contained in:
Jonathan G Rennison
2023-11-12 13:17:33 +00:00
parent 79b5699e82 4f4810dc28
commit 4bfa8b7b7b
8 changed files with 82 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/date.cpp
View File

@@ -297,12 +297,6 @@ static void OnNewYear()
*/
static void OnNewMonth()
{
if (_settings_client.gui.autosave != 0 && _settings_client.gui.autosave < 5 && (_cur_date_ymd.month % _autosave_months[_settings_client.gui.autosave]) == 0) {
_do_autosave = true;
_check_special_modes = true;
SetWindowDirty(WC_STATUS_BAR, 0);
}
SetWindowClassesDirty(WC_CHEATS);
CompaniesMonthlyLoop();
EnginesMonthlyLoop();
@@ -319,12 +313,6 @@ static void OnNewMonth()
*/
static void OnNewDay()
{
if (_settings_client.gui.autosave == 5 && (_date % _settings_client.gui.autosave_custom_days) == 0) {
_do_autosave = true;
_check_special_modes = true;
SetWindowDirty(WC_STATUS_BAR, 0);
}
if (_network_server) NetworkServerDailyLoop();
DisasterDailyLoop();