diff --git a/src/openrct2-ui/UiContext.cpp b/src/openrct2-ui/UiContext.cpp index 3b5b3da4d6..1d1b2d4718 100644 --- a/src/openrct2-ui/UiContext.cpp +++ b/src/openrct2-ui/UiContext.cpp @@ -137,7 +137,7 @@ public: #endif } - void Update() override + void Tick() override { _inGameConsole.Update(); } diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp index d161ec2c81..4d84669492 100644 --- a/src/openrct2/Context.cpp +++ b/src/openrct2/Context.cpp @@ -1037,7 +1037,7 @@ namespace OpenRCT2 while (_accumulator >= GAME_UPDATE_TIME_MS) { - Update(); + Tick(); // Always run this at a fixed rate, Update can cause multiple ticks if the game is speed up. window_update_all(); @@ -1069,7 +1069,7 @@ namespace OpenRCT2 if (shouldDraw) tweener.PreTick(); - Update(); + Tick(); // Always run this at a fixed rate, Update can cause multiple ticks if the game is speed up. window_update_all(); @@ -1092,7 +1092,7 @@ namespace OpenRCT2 } } - void Update() + void Tick() { // TODO: This variable has been never "variable" in time, some code expects // this to be 40Hz (25 ms). Refactor this once the UI is decoupled. @@ -1111,26 +1111,26 @@ namespace OpenRCT2 } else if ((gScreenFlags & SCREEN_FLAGS_TITLE_DEMO) && !gOpenRCT2Headless) { - _titleScreen->Update(); + _titleScreen->Tick(); } else { - _gameState->Update(); + _gameState->Tick(); } #ifdef __ENABLE_DISCORD__ if (_discordService != nullptr) { - _discordService->Update(); + _discordService->Tick(); } #endif chat_update(); #ifdef ENABLE_SCRIPTING - _scriptEngine.Update(); + _scriptEngine.Tick(); #endif _stdInOutConsole.ProcessEvalQueue(); - _uiContext->Update(); + _uiContext->Tick(); } /** diff --git a/src/openrct2/GameState.cpp b/src/openrct2/GameState.cpp index d841a345a5..6631a36c3d 100644 --- a/src/openrct2/GameState.cpp +++ b/src/openrct2/GameState.cpp @@ -91,7 +91,7 @@ void GameState::InitAll(int32_t mapSize) * when operating as a client it may run multiple updates to catch up with the server tick, * another influence can be the game speed setting. */ -void GameState::Update() +void GameState::Tick() { gInUpdateCode = true; diff --git a/src/openrct2/GameState.h b/src/openrct2/GameState.h index c4db3cf35c..5768543c96 100644 --- a/src/openrct2/GameState.h +++ b/src/openrct2/GameState.h @@ -83,7 +83,7 @@ namespace OpenRCT2 } void InitAll(int32_t mapSize); - void Update(); + void Tick(); void UpdateLogic(LogicTimings* timings = nullptr); private: diff --git a/src/openrct2/network/DiscordService.cpp b/src/openrct2/network/DiscordService.cpp index 30b12d59c4..c8bf631aec 100644 --- a/src/openrct2/network/DiscordService.cpp +++ b/src/openrct2/network/DiscordService.cpp @@ -65,7 +65,7 @@ static std::string GetParkName() return {}; } -void DiscordService::Update() +void DiscordService::Tick() { Discord_RunCallbacks(); diff --git a/src/openrct2/network/DiscordService.h b/src/openrct2/network/DiscordService.h index fb40dfb51c..881a3de578 100644 --- a/src/openrct2/network/DiscordService.h +++ b/src/openrct2/network/DiscordService.h @@ -25,7 +25,7 @@ public: DiscordService(); ~DiscordService(); - void Update(); + void Tick(); private: void RefreshPresence(); diff --git a/src/openrct2/scripting/ScriptEngine.cpp b/src/openrct2/scripting/ScriptEngine.cpp index 5536686607..155edfaf8b 100644 --- a/src/openrct2/scripting/ScriptEngine.cpp +++ b/src/openrct2/scripting/ScriptEngine.cpp @@ -646,7 +646,7 @@ void ScriptEngine::StopPlugins() _pluginsStarted = false; } -void ScriptEngine::Update() +void ScriptEngine::Tick() { if (!_initialised) { diff --git a/src/openrct2/scripting/ScriptEngine.h b/src/openrct2/scripting/ScriptEngine.h index 18ce23d6c2..f07114a714 100644 --- a/src/openrct2/scripting/ScriptEngine.h +++ b/src/openrct2/scripting/ScriptEngine.h @@ -202,7 +202,7 @@ namespace OpenRCT2::Scripting void LoadPlugins(); void UnloadPlugins(); - void Update(); + void Tick(); std::future Eval(const std::string& s); DukValue ExecutePluginCall( const std::shared_ptr& plugin, const DukValue& func, const std::vector& args, diff --git a/src/openrct2/title/TitleScreen.cpp b/src/openrct2/title/TitleScreen.cpp index 02e134ef8f..669d53fdaf 100644 --- a/src/openrct2/title/TitleScreen.cpp +++ b/src/openrct2/title/TitleScreen.cpp @@ -155,7 +155,7 @@ void TitleScreen::Load() log_verbose("TitleScreen::Load() finished"); } -void TitleScreen::Update() +void TitleScreen::Tick() { gInUpdateCode = true; diff --git a/src/openrct2/title/TitleScreen.h b/src/openrct2/title/TitleScreen.h index 9e590e816a..c453aad59c 100644 --- a/src/openrct2/title/TitleScreen.h +++ b/src/openrct2/title/TitleScreen.h @@ -33,7 +33,7 @@ namespace OpenRCT2 void SetHideVersionInfo(bool value); void Load(); - void Update(); + void Tick(); void CreateWindows(); void ChangePresetSequence(size_t preset); diff --git a/src/openrct2/ui/DummyUiContext.cpp b/src/openrct2/ui/DummyUiContext.cpp index d0a40d1917..b0b8f6dc02 100644 --- a/src/openrct2/ui/DummyUiContext.cpp +++ b/src/openrct2/ui/DummyUiContext.cpp @@ -28,7 +28,7 @@ namespace OpenRCT2::Ui void Initialise() override { } - void Update() override + void Tick() override { } void Draw(rct_drawpixelinfo* /*dpi*/) override diff --git a/src/openrct2/ui/UiContext.h b/src/openrct2/ui/UiContext.h index 8135b209aa..7cce48a4be 100644 --- a/src/openrct2/ui/UiContext.h +++ b/src/openrct2/ui/UiContext.h @@ -94,7 +94,7 @@ namespace OpenRCT2 virtual ~IUiContext() = default; virtual void Initialise() abstract; - virtual void Update() abstract; + virtual void Tick() abstract; virtual void Draw(rct_drawpixelinfo* dpi) abstract; // Window