From 49eb40bc4fe9f1f9264f5c97eba91fb2fa147fdc Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Wed, 24 Jan 2024 23:31:35 +0000 Subject: [PATCH] Change various _network_dedicated tests to use IsHeadless --- src/highscore_gui.cpp | 2 +- src/plans.cpp | 2 +- src/script/api/script_controller.cpp | 2 +- src/tracerestrict.cpp | 2 +- src/train_cmd.cpp | 2 +- src/vehicle.cpp | 2 +- src/vehicle_base.h | 2 +- src/window.cpp | 6 +++--- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/highscore_gui.cpp b/src/highscore_gui.cpp index 9e4a4d8526..8e5e7dfd3f 100644 --- a/src/highscore_gui.cpp +++ b/src/highscore_gui.cpp @@ -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); diff --git a/src/plans.cpp b/src/plans.cpp index df7e8b28fc..b19181e2f7 100644 --- a/src/plans.cpp +++ b/src/plans.cpp @@ -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 }; diff --git a/src/script/api/script_controller.cpp b/src/script/api/script_controller.cpp index da8b4fb9e8..3d57660a48 100644 --- a/src/script/api/script_controller.cpp +++ b/src/script/api/script_controller.cpp @@ -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(); diff --git a/src/tracerestrict.cpp b/src/tracerestrict.cpp index 4e4302ac83..2d9affb21d 100644 --- a/src/tracerestrict.cpp +++ b/src/tracerestrict.cpp @@ -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; diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index acdd9f052c..790a8a413a 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -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); } diff --git a/src/vehicle.cpp b/src/vehicle.cpp index 309057bb6d..bfaa47e79f 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -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(this->sprite_seq_bounds); diff --git a/src/vehicle_base.h b/src/vehicle_base.h index f37ec52d4c..7eaa673835 100644 --- a/src/vehicle_base.h +++ b/src/vehicle_base.h @@ -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 */ diff --git a/src/window.cpp b/src/window.cpp index 02650e7a0b..7ae1f08db2 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -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);