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

Change various _network_dedicated tests to use IsHeadless

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-01-24 23:31:35 +00:00
parent ced17a74e8
commit 49eb40bc4f
8 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/highscore_gui.cpp
View File

@@ -243,7 +243,7 @@ void ShowHighscoreTable(int difficulty, int8_t ranking)
void ShowEndGameChart()
{
/* Dedicated server doesn't need the highscore window and neither does -v null. */
if (_network_dedicated || (!_networking && !Company::IsValidID(_local_company))) return;
if (IsHeadless() || (!_networking && !Company::IsValidID(_local_company))) return;
HideVitalWindows();
CloseWindowByClass(WC_ENDSCREEN);

2
src/plans.cpp
View File

@@ -23,7 +23,7 @@ bool _last_plan_visibility_check_result = false;
void PlanLine::UpdateVisualExtents()
{
if (_network_dedicated) return;
if (IsHeadless()) return;
if (this->tiles.size() < 2) {
this->viewport_extents = { INT_MAX, INT_MAX, INT_MAX, INT_MAX };

2
src/script/api/script_controller.cpp
View File

@@ -47,7 +47,7 @@
/* static */ void ScriptController::Break(const std::string &message)
{
if (_network_dedicated || !_settings_client.gui.ai_developer_tools) return;
if (IsHeadless() || !_settings_client.gui.ai_developer_tools) return;
ScriptObject::GetActiveInstance()->Pause();

2
src/tracerestrict.cpp
View File

@@ -1747,7 +1747,7 @@ void TraceRestrictCheckRefreshSignals(const TraceRestrictProgram *prog, size_t o
}
}
if (_network_dedicated) return;
if (IsHeadless()) return;
if (!((old_actions_used_flags ^ prog->actions_used_flags) & (TRPAUF_RESERVE_THROUGH_ALWAYS | TRPAUF_REVERSE))) return;

2
src/train_cmd.cpp
View File

@@ -7511,7 +7511,7 @@ void TrainBrakesOverheatedBreakdown(Vehicle *v)
Train *t = Train::From(v)->First();
if (t->breakdown_ctr != 0 || (t->vehstatus & VS_CRASHED)) return;
if (unlikely(HasBit(_misc_debug_flags, MDF_OVERHEAT_BREAKDOWN_OPEN_WIN)) && !_network_dedicated) {
if (unlikely(HasBit(_misc_debug_flags, MDF_OVERHEAT_BREAKDOWN_OPEN_WIN)) && !IsHeadless()) {
ShowVehicleViewWindow(t);
}

2
src/vehicle.cpp
View File

@@ -2721,7 +2721,7 @@ void VehicleEnterDepot(Vehicle *v)
void Vehicle::UpdateViewport(bool dirty)
{
/* Skip updating sprites on dedicated servers without screen */
if (_network_dedicated) return;
if (IsHeadless()) return;
Rect new_coord = ConvertRect<Rect16, Rect>(this->sprite_seq_bounds);

2
src/vehicle_base.h
View File

@@ -1483,7 +1483,7 @@ public:
inline void UpdateViewport(bool force_update, bool update_delta)
{
/* Skip updating sprites on dedicated servers without screen */
if (_network_dedicated) return;
if (IsHeadless()) return;
/* Explicitly choose method to call to prevent vtable dereference -
* it gives ~3% runtime improvements in games with many vehicles */

6
src/window.cpp
View File

@@ -1971,7 +1971,7 @@ static void DecreaseWindowCounters()
if (hundredth_tick_timeout != 0) hundredth_tick_timeout--;
for (Window *w : Window::IterateFromFront()) {
if (!_network_dedicated && hundredth_tick_timeout == 0) w->OnHundredthTick();
if (!IsHeadless() && hundredth_tick_timeout == 0) w->OnHundredthTick();
if (_scroller_click_timeout == 0) {
/* Unclick scrollbar buttons if they are pressed. */
@@ -3277,7 +3277,7 @@ void UpdateWindows()
static GUITimer window_timer = GUITimer(1);
if (window_timer.Elapsed(delta_ms)) {
if (_network_dedicated) window_timer.SetInterval(MILLISECONDS_PER_TICK);
if (IsHeadless()) window_timer.SetInterval(MILLISECONDS_PER_TICK);
extern int _caret_timer;
_caret_timer += 3;
@@ -3298,7 +3298,7 @@ void UpdateWindows()
/* Skip the actual drawing on dedicated servers without screen.
* But still empty the invalidation queues above. */
if (_network_dedicated) return;
if (IsHeadless()) return;
if (window_timer.HasElapsed()) {
window_timer.SetInterval(MILLISECONDS_PER_TICK);