Merge branch 'master' into jgrpp
# Conflicts: # src/company_cmd.cpp # src/core/geometry_func.cpp # src/date.cpp # src/genworld_gui.cpp # src/gfx.cpp # src/object_gui.cpp # src/openttd.cpp # src/settings_type.h # src/video/allegro_v.cpp # src/video/dedicated_v.cpp # src/video/null_v.cpp # src/video/sdl2_v.cpp # src/video/sdl_v.cpp # src/video/win32_v.cpp
This commit is contained in:
@@ -21,6 +21,7 @@
|
||||
#include "newgrf_profiling.h"
|
||||
#include "console_func.h"
|
||||
#include "debug.h"
|
||||
#include "widgets/statusbar_widget.h"
|
||||
|
||||
#include "safeguards.h"
|
||||
|
||||
@@ -275,7 +276,7 @@ static void OnNewDay()
|
||||
IndustryDailyLoop();
|
||||
|
||||
if (!_settings_time.time_in_minutes || _settings_client.gui.date_with_time > 0) {
|
||||
SetWindowWidgetDirty(WC_STATUS_BAR, 0, 0);
|
||||
SetWindowWidgetDirty(WC_STATUS_BAR, 0, WID_S_LEFT);
|
||||
}
|
||||
EnginesDailyLoop();
|
||||
|
||||
|
Reference in New Issue
Block a user