From b60d97ef557df6cb5930633ffda8fe35b453b951 Mon Sep 17 00:00:00 2001 From: duncanspumpkin Date: Fri, 22 Feb 2019 09:08:04 +0000 Subject: [PATCH] Use enum values for the savePromptMode --- src/openrct2-ui/windows/EditorObjectSelection.cpp | 2 +- src/openrct2-ui/windows/TopToolbar.cpp | 2 +- src/openrct2/actions/LoadOrQuitAction.hpp | 6 +++--- src/openrct2/network/Network.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp index 9a75289a6f..a00d519cdf 100644 --- a/src/openrct2-ui/windows/EditorObjectSelection.cpp +++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp @@ -468,7 +468,7 @@ static void window_editor_object_selection_mouseup(rct_window* w, rct_widgetinde case WIDX_CLOSE: if (gScreenFlags & SCREEN_FLAGS_EDITOR) { - auto loadOrQuitAction = LoadOrQuitAction(LoadOrQuitModes::OpenSavePrompt, 1); + auto loadOrQuitAction = LoadOrQuitAction(LoadOrQuitModes::OpenSavePrompt, PM_SAVE_BEFORE_QUIT); GameActions::Execute(&loadOrQuitAction); } else diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index a59b053920..49e5aaabb9 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -627,7 +627,7 @@ static void window_top_toolbar_dropdown(rct_window* w, rct_widgetindex widgetInd { window_close_by_class(WC_MANAGE_TRACK_DESIGN); window_close_by_class(WC_TRACK_DELETE_PROMPT); - auto loadOrQuitAction = LoadOrQuitAction(LoadOrQuitModes::OpenSavePrompt, 1); + auto loadOrQuitAction = LoadOrQuitAction(LoadOrQuitModes::OpenSavePrompt, PM_SAVE_BEFORE_QUIT); GameActions::Execute(&loadOrQuitAction); break; } diff --git a/src/openrct2/actions/LoadOrQuitAction.hpp b/src/openrct2/actions/LoadOrQuitAction.hpp index 2783ab668b..a5de08df20 100644 --- a/src/openrct2/actions/LoadOrQuitAction.hpp +++ b/src/openrct2/actions/LoadOrQuitAction.hpp @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2014-2018 OpenRCT2 developers + * Copyright (c) 2014-2019 OpenRCT2 developers * * For a complete list of all authors, please refer to contributors.md * Interested in contributing? Visit https://github.com/OpenRCT2/OpenRCT2 @@ -23,14 +23,14 @@ DEFINE_GAME_ACTION(LoadOrQuitAction, GAME_COMMAND_LOAD_OR_QUIT, GameActionResult { private: uint8_t _mode{ 0 }; - uint8_t _savePromptMode{ 0 }; + uint8_t _savePromptMode{ PM_SAVE_BEFORE_LOAD }; public: LoadOrQuitAction() { } - LoadOrQuitAction(LoadOrQuitModes mode, uint8_t savePromptMode = 0) + LoadOrQuitAction(LoadOrQuitModes mode, uint8_t savePromptMode = PM_SAVE_BEFORE_LOAD) : _mode(static_cast(mode)) , _savePromptMode(savePromptMode) { diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp index 9b8772c44e..cd6fcc7df2 100644 --- a/src/openrct2/network/Network.cpp +++ b/src/openrct2/network/Network.cpp @@ -2552,7 +2552,7 @@ void Network::Client_Handle_MAP([[maybe_unused]] NetworkConnection& connection, else { // Something went wrong, game is not loaded. Return to main screen. - auto loadOrQuitAction = LoadOrQuitAction(LoadOrQuitModes::OpenSavePrompt, 1); + auto loadOrQuitAction = LoadOrQuitAction(LoadOrQuitModes::OpenSavePrompt, PM_SAVE_BEFORE_QUIT); GameActions::Execute(&loadOrQuitAction); } if (has_to_free)