Merge branch 'save_ext' into jgrpp
# Conflicts: # config.lib # src/misc_gui.cpp # src/network/network_gui.cpp # src/settings_type.h # src/smallmap_gui.cpp # src/smallmap_gui.h # src/station_cmd.cpp # src/toolbar_gui.cpp # src/vehicle_gui.cpp # src/window.cpp
This commit is contained in:
@@ -172,6 +172,8 @@ public:
|
||||
|
||||
this->LowerWidget(WID_DB_SHOW_VIA);
|
||||
}
|
||||
|
||||
if (_pause_mode != PM_UNPAUSED) this->OnGameTick();
|
||||
}
|
||||
|
||||
virtual ~DeparturesWindow()
|
||||
@@ -313,7 +315,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
virtual void OnTick()
|
||||
virtual void OnGameTick() override
|
||||
{
|
||||
if (_pause_mode == PM_UNPAUSED) {
|
||||
this->tick_count += 1;
|
||||
|
Reference in New Issue
Block a user