From a45625fc3e53b834b77c847a339a781e964bcc02 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Sat, 1 Mar 2025 15:48:02 +0100 Subject: [PATCH] Change PromptMode members to new codestyle --- src/openrct2-ui/windows/SavePrompt.cpp | 4 ++-- src/openrct2-ui/windows/TopToolbar.cpp | 4 ++-- src/openrct2/Context.cpp | 2 +- src/openrct2/Game.cpp | 6 +++--- src/openrct2/actions/LoadOrQuitAction.h | 4 ++-- src/openrct2/interface/Window.h | 10 +++++----- src/openrct2/network/NetworkBase.cpp | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/openrct2-ui/windows/SavePrompt.cpp b/src/openrct2-ui/windows/SavePrompt.cpp index 29fcb65c5e..7649e2407a 100644 --- a/src/openrct2-ui/windows/SavePrompt.cpp +++ b/src/openrct2-ui/windows/SavePrompt.cpp @@ -204,9 +204,9 @@ namespace OpenRCT2::Ui::Windows WindowBase* SavePromptOpen() { PromptMode prompt_mode = gSavePromptMode; - if (prompt_mode == PromptMode::Quit) + if (prompt_mode == PromptMode::quit) { - prompt_mode = PromptMode::SaveBeforeQuit; + prompt_mode = PromptMode::saveBeforeQuit; } // do not show save prompt if we're in the title demo and click on load game diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index f863b4abb3..1eaeedf7d2 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -446,7 +446,7 @@ namespace OpenRCT2::Ui::Windows case DDIDX_NEW_GAME: { auto loadOrQuitAction = LoadOrQuitAction( - LoadOrQuitModes::OpenSavePrompt, PromptMode::SaveBeforeNewGame); + LoadOrQuitModes::OpenSavePrompt, PromptMode::saveBeforeNewGame); GameActions::Execute(&loadOrQuitAction); break; } @@ -505,7 +505,7 @@ namespace OpenRCT2::Ui::Windows windowMgr->CloseByClass(WindowClass::ManageTrackDesign); windowMgr->CloseByClass(WindowClass::TrackDeletePrompt); auto loadOrQuitAction = LoadOrQuitAction( - LoadOrQuitModes::OpenSavePrompt, PromptMode::SaveBeforeQuit); + LoadOrQuitModes::OpenSavePrompt, PromptMode::saveBeforeQuit); GameActions::Execute(&loadOrQuitAction); break; } diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp index 722c0eaa2f..36041ede4d 100644 --- a/src/openrct2/Context.cpp +++ b/src/openrct2/Context.cpp @@ -395,7 +395,7 @@ namespace OpenRCT2 void Quit() override { - gSavePromptMode = PromptMode::Quit; + gSavePromptMode = PromptMode::quit; ContextOpenWindow(WindowClass::SavePrompt); } diff --git a/src/openrct2/Game.cpp b/src/openrct2/Game.cpp index 21a23a74ac..700bbb1ad6 100644 --- a/src/openrct2/Game.cpp +++ b/src/openrct2/Game.cpp @@ -651,7 +651,7 @@ void GameLoadOrQuitNoSavePrompt() { switch (gSavePromptMode) { - case PromptMode::SaveBeforeLoad: + case PromptMode::saveBeforeLoad: { auto loadOrQuitAction = LoadOrQuitAction(LoadOrQuitModes::CloseSavePrompt); GameActions::Execute(&loadOrQuitAction); @@ -669,7 +669,7 @@ void GameLoadOrQuitNoSavePrompt() } break; } - case PromptMode::SaveBeforeQuit: + case PromptMode::saveBeforeQuit: { auto loadOrQuitAction = LoadOrQuitAction(LoadOrQuitModes::CloseSavePrompt); GameActions::Execute(&loadOrQuitAction); @@ -687,7 +687,7 @@ void GameLoadOrQuitNoSavePrompt() context->SetActiveScene(context->GetTitleScene()); break; } - case PromptMode::SaveBeforeNewGame: + case PromptMode::saveBeforeNewGame: { auto loadOrQuitAction = LoadOrQuitAction(LoadOrQuitModes::CloseSavePrompt); GameActions::Execute(&loadOrQuitAction); diff --git a/src/openrct2/actions/LoadOrQuitAction.h b/src/openrct2/actions/LoadOrQuitAction.h index ce74be7885..90bf913ff1 100644 --- a/src/openrct2/actions/LoadOrQuitAction.h +++ b/src/openrct2/actions/LoadOrQuitAction.h @@ -22,11 +22,11 @@ class LoadOrQuitAction final : public GameActionBase { private: LoadOrQuitModes _mode{}; - PromptMode _savePromptMode{ PromptMode::SaveBeforeLoad }; + PromptMode _savePromptMode{ PromptMode::saveBeforeLoad }; public: LoadOrQuitAction() = default; - LoadOrQuitAction(LoadOrQuitModes mode, PromptMode savePromptMode = PromptMode::SaveBeforeLoad); + LoadOrQuitAction(LoadOrQuitModes mode, PromptMode savePromptMode = PromptMode::saveBeforeLoad); void AcceptParameters(GameActionParameterVisitor& visitor) override; diff --git a/src/openrct2/interface/Window.h b/src/openrct2/interface/Window.h index f764c839bb..d44de8aa86 100644 --- a/src/openrct2/interface/Window.h +++ b/src/openrct2/interface/Window.h @@ -196,11 +196,11 @@ constexpr int32_t WC_TILE_INSPECTOR__WIDX_BANNER_SPINNER_HEIGHT_DECREASE = 30; enum class PromptMode : uint8_t { - SaveBeforeLoad = 0, - SaveBeforeQuit, - SaveBeforeQuit2, - SaveBeforeNewGame, - Quit + saveBeforeLoad = 0, + saveBeforeQuit, + saveBeforeQuit2, + saveBeforeNewGame, + quit }; enum BTM_TOOLBAR_DIRTY_FLAGS diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp index 74f17aa59c..68fa2bd71f 100644 --- a/src/openrct2/network/NetworkBase.cpp +++ b/src/openrct2/network/NetworkBase.cpp @@ -2827,7 +2827,7 @@ void NetworkBase::Client_Handle_MAP([[maybe_unused]] NetworkConnection& connecti else { // Something went wrong, game is not loaded. Return to main screen. - auto loadOrQuitAction = LoadOrQuitAction(LoadOrQuitModes::OpenSavePrompt, PromptMode::SaveBeforeQuit); + auto loadOrQuitAction = LoadOrQuitAction(LoadOrQuitModes::OpenSavePrompt, PromptMode::saveBeforeQuit); GameActions::Execute(&loadOrQuitAction); } if (has_to_free)