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:
@@ -2157,9 +2157,8 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
virtual void OnTick()
|
||||
virtual void OnGameTick()
|
||||
{
|
||||
if (_pause_mode != PM_UNPAUSED) return;
|
||||
if (this->vehicles.NeedResort()) {
|
||||
StationID station = (this->vli.type == VL_STATION_LIST) ? this->vli.index : INVALID_STATION;
|
||||
|
||||
@@ -3555,7 +3554,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
virtual void OnTick()
|
||||
virtual void OnGameTick()
|
||||
{
|
||||
const Vehicle *v = Vehicle::Get(this->window_number);
|
||||
bool veh_stopped = v->IsStoppedInDepot();
|
||||
|
Reference in New Issue
Block a user