From eb2f40f35c5743080372d8d92769f9c0c671140c Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Sun, 11 Oct 2020 18:42:17 +0200 Subject: [PATCH] Fix typo in WC_EDITOR_OBJECTIVE_OPTIONS --- src/openrct2-ui/WindowManager.cpp | 2 +- src/openrct2-ui/interface/Theme.cpp | 2 +- src/openrct2-ui/title/TitleSequencePlayer.cpp | 2 +- src/openrct2-ui/windows/EditorBottomToolbar.cpp | 2 +- src/openrct2-ui/windows/EditorObjectiveOptions.cpp | 4 ++-- src/openrct2-ui/windows/Themes.cpp | 2 +- src/openrct2-ui/windows/TopToolbar.cpp | 2 +- src/openrct2/Editor.cpp | 4 ++-- src/openrct2/interface/InteractiveConsole.cpp | 2 +- src/openrct2/interface/Window.h | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/openrct2-ui/WindowManager.cpp b/src/openrct2-ui/WindowManager.cpp index 7f4dc1075c..aa70df8a5a 100644 --- a/src/openrct2-ui/WindowManager.cpp +++ b/src/openrct2-ui/WindowManager.cpp @@ -57,7 +57,7 @@ public: return window_editor_inventions_list_open(); case WC_EDITOR_OBJECT_SELECTION: return window_editor_object_selection_open(); - case WC_EDTIOR_OBJECTIVE_OPTIONS: + case WC_EDITOR_OBJECTIVE_OPTIONS: return window_editor_objective_options_open(); case WC_EDITOR_SCENARIO_OPTIONS: return window_editor_scenario_options_open(); diff --git a/src/openrct2-ui/interface/Theme.cpp b/src/openrct2-ui/interface/Theme.cpp index d353dcd867..d5907412cb 100644 --- a/src/openrct2-ui/interface/Theme.cpp +++ b/src/openrct2-ui/interface/Theme.cpp @@ -154,7 +154,7 @@ static constexpr const WindowThemeDesc WindowThemeDescriptors[] = { THEME_WC(WC_EDITOR_OBJECT_SELECTION), STR_THEMES_WINDOW_EDITOR_OBJECT_SELECTION, COLOURS_3(COLOUR_LIGHT_PURPLE, COLOUR_GREY, COLOUR_GREY ) }, { THEME_WC(WC_EDITOR_INVENTION_LIST), STR_THEMES_WINDOW_EDITOR_INVENTION_LIST, COLOURS_3(COLOUR_LIGHT_PURPLE, COLOUR_GREY, COLOUR_GREY ) }, { THEME_WC(WC_EDITOR_SCENARIO_OPTIONS), STR_THEMES_WINDOW_EDITOR_SCENARIO_OPTIONS, COLOURS_3(COLOUR_LIGHT_PURPLE, COLOUR_GREY, COLOUR_GREY ) }, - { THEME_WC(WC_EDTIOR_OBJECTIVE_OPTIONS), STR_THEMES_WINDOW_EDTIOR_OBJECTIVE_OPTIONS, COLOURS_3(COLOUR_LIGHT_PURPLE, COLOUR_GREY, COLOUR_GREY ) }, + { THEME_WC(WC_EDITOR_OBJECTIVE_OPTIONS), STR_THEMES_WINDOW_EDTIOR_OBJECTIVE_OPTIONS, COLOURS_3(COLOUR_LIGHT_PURPLE, COLOUR_GREY, COLOUR_GREY ) }, { THEME_WC(WC_MANAGE_TRACK_DESIGN), STR_THEMES_WINDOW_MANAGE_TRACK_DESIGN, COLOURS_3(COLOUR_GREY, COLOUR_GREY, COLOUR_GREY ) }, { THEME_WC(WC_TRACK_DELETE_PROMPT), STR_THEMES_WINDOW_TRACK_DELETE_PROMPT, COLOURS_3(COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED ) }, { THEME_WC(WC_INSTALL_TRACK), STR_THEMES_WINDOW_INSTALL_TRACK, COLOURS_3(COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED ) }, diff --git a/src/openrct2-ui/title/TitleSequencePlayer.cpp b/src/openrct2-ui/title/TitleSequencePlayer.cpp index d8e525327c..31693e90c0 100644 --- a/src/openrct2-ui/title/TitleSequencePlayer.cpp +++ b/src/openrct2-ui/title/TitleSequencePlayer.cpp @@ -429,7 +429,7 @@ private: window_close_by_class(WC_EDITOR_INVENTION_LIST_DRAG); window_close_by_class(WC_EDITOR_INVENTION_LIST); window_close_by_class(WC_EDITOR_OBJECT_SELECTION); - window_close_by_class(WC_EDTIOR_OBJECTIVE_OPTIONS); + window_close_by_class(WC_EDITOR_OBJECTIVE_OPTIONS); window_close_by_class(WC_EDITOR_SCENARIO_OPTIONS); window_close_by_class(WC_FINANCES); window_close_by_class(WC_FIRE_PROMPT); diff --git a/src/openrct2-ui/windows/EditorBottomToolbar.cpp b/src/openrct2-ui/windows/EditorBottomToolbar.cpp index 27d1d9bd7a..188d416658 100644 --- a/src/openrct2-ui/windows/EditorBottomToolbar.cpp +++ b/src/openrct2-ui/windows/EditorBottomToolbar.cpp @@ -252,7 +252,7 @@ void window_editor_bottom_toolbar_jump_forward_to_options_selection() void window_editor_bottom_toolbar_jump_forward_to_objective_selection() { window_close_all(); - context_open_window(WC_EDTIOR_OBJECTIVE_OPTIONS); + context_open_window(WC_EDITOR_OBJECTIVE_OPTIONS); gS6Info.editor_step = EDITOR_STEP_OBJECTIVE_SELECTION; gfx_invalidate_screen(); } diff --git a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp index e2b25a1295..67ae1ea68c 100644 --- a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp +++ b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp @@ -218,11 +218,11 @@ rct_window* window_editor_objective_options_open() { rct_window* w; - w = window_bring_to_front_by_class(WC_EDTIOR_OBJECTIVE_OPTIONS); + w = window_bring_to_front_by_class(WC_EDITOR_OBJECTIVE_OPTIONS); if (w != nullptr) return w; - w = window_create_centred(450, 228, &window_objective_options_main_events, WC_EDTIOR_OBJECTIVE_OPTIONS, WF_10); + w = window_create_centred(450, 228, &window_objective_options_main_events, WC_EDITOR_OBJECTIVE_OPTIONS, WF_10); w->widgets = window_editor_objective_options_main_widgets; w->enabled_widgets = window_editor_objective_options_page_enabled_widgets[WINDOW_EDITOR_OBJECTIVE_OPTIONS_PAGE_MAIN]; w->pressed_widgets = 0; diff --git a/src/openrct2-ui/windows/Themes.cpp b/src/openrct2-ui/windows/Themes.cpp index 86586c0f2d..685e0b3872 100644 --- a/src/openrct2-ui/windows/Themes.cpp +++ b/src/openrct2-ui/windows/Themes.cpp @@ -209,7 +209,7 @@ static rct_windowclass window_themes_tab_5_classes[] = { WC_EDITOR_OBJECT_SELECTION, WC_EDITOR_INVENTION_LIST, WC_EDITOR_SCENARIO_OPTIONS, - WC_EDTIOR_OBJECTIVE_OPTIONS, + WC_EDITOR_OBJECTIVE_OPTIONS, WC_MAPGEN, WC_MANAGE_TRACK_DESIGN, WC_INSTALL_TRACK diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index 1423082e83..e807732cf8 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -3510,7 +3510,7 @@ static void top_toolbar_cheats_menu_dropdown(int16_t dropdownIndex) context_open_window(WC_EDITOR_SCENARIO_OPTIONS); break; case DDIDX_OBJECTIVE_OPTIONS: - context_open_window(WC_EDTIOR_OBJECTIVE_OPTIONS); + context_open_window(WC_EDITOR_OBJECTIVE_OPTIONS); break; case DDIDX_ENABLE_SANDBOX_MODE: CheatsSet(CheatType::SandboxMode, !gCheatsSandboxMode); diff --git a/src/openrct2/Editor.cpp b/src/openrct2/Editor.cpp index a287059211..9d2c4cbe5c 100644 --- a/src/openrct2/Editor.cpp +++ b/src/openrct2/Editor.cpp @@ -415,12 +415,12 @@ namespace Editor context_open_window(WC_EDITOR_SCENARIO_OPTIONS); break; case EDITOR_STEP_OBJECTIVE_SELECTION: - if (window_find_by_class(WC_EDTIOR_OBJECTIVE_OPTIONS)) + if (window_find_by_class(WC_EDITOR_OBJECTIVE_OPTIONS)) { return; } - context_open_window(WC_EDTIOR_OBJECTIVE_OPTIONS); + context_open_window(WC_EDITOR_OBJECTIVE_OPTIONS); break; } } diff --git a/src/openrct2/interface/InteractiveConsole.cpp b/src/openrct2/interface/InteractiveConsole.cpp index 7eaeb06ef0..2867bc345d 100644 --- a/src/openrct2/interface/InteractiveConsole.cpp +++ b/src/openrct2/interface/InteractiveConsole.cpp @@ -1162,7 +1162,7 @@ static int32_t cc_open(InteractiveConsole& console, const arguments_t& argv) } else if (argv[0] == "objective_options" && invalidArguments(&invalidTitle, !title)) { - context_open_window(WC_EDTIOR_OBJECTIVE_OPTIONS); + context_open_window(WC_EDITOR_OBJECTIVE_OPTIONS); } else if (argv[0] == "options") { diff --git a/src/openrct2/interface/Window.h b/src/openrct2/interface/Window.h index c612933204..e040aff8d5 100644 --- a/src/openrct2/interface/Window.h +++ b/src/openrct2/interface/Window.h @@ -461,7 +461,7 @@ enum WC_EDITOR_INVENTION_LIST = 43, WC_EDITOR_INVENTION_LIST_DRAG = 44, WC_EDITOR_SCENARIO_OPTIONS = 45, - WC_EDTIOR_OBJECTIVE_OPTIONS = 46, + WC_EDITOR_OBJECTIVE_OPTIONS = 46, WC_MANAGE_TRACK_DESIGN = 47, WC_TRACK_DELETE_PROMPT = 48, WC_INSTALL_TRACK = 49,