From 5fbe8d0ae16361b5e246819fb3f56588d43ecfaf Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Sun, 19 Jan 2025 15:50:54 +0100 Subject: [PATCH] Centralise external window signatures in Windows.h (#23653) --- src/openrct2-ui/ProvisionalElements.cpp | 2 +- src/openrct2-ui/TextComposition.cpp | 3 +- src/openrct2-ui/WindowManager.cpp | 5 +- src/openrct2-ui/input/InputManager.cpp | 3 +- src/openrct2-ui/input/MouseInput.cpp | 2 +- src/openrct2-ui/input/Shortcuts.cpp | 2 +- .../interface/ViewportInteraction.cpp | 2 +- src/openrct2-ui/interface/Widget.cpp | 1 + src/openrct2-ui/interface/Window.cpp | 2 +- src/openrct2-ui/interface/Window.h | 26 -- src/openrct2-ui/libopenrct2ui.vcxproj | 2 +- src/openrct2-ui/ride/VehicleSounds.cpp | 1 + src/openrct2-ui/scripting/CustomListView.cpp | 2 +- src/openrct2-ui/scripting/CustomWindow.cpp | 2 +- src/openrct2-ui/scripting/ScUi.hpp | 2 +- src/openrct2-ui/title/TitleSequencePlayer.cpp | 2 +- src/openrct2-ui/windows/About.cpp | 2 +- src/openrct2-ui/windows/AssetPacks.cpp | 2 +- src/openrct2-ui/windows/Banner.cpp | 2 +- src/openrct2-ui/windows/Changelog.cpp | 2 +- src/openrct2-ui/windows/Cheats.cpp | 2 +- src/openrct2-ui/windows/ClearScenery.cpp | 2 +- src/openrct2-ui/windows/CustomCurrency.cpp | 2 +- src/openrct2-ui/windows/DebugPaint.cpp | 2 +- .../windows/DemolishRidePrompt.cpp | 2 +- .../windows/EditorBottomToolbar.cpp | 2 +- .../windows/EditorInventionsList.cpp | 2 +- .../windows/EditorObjectSelection.cpp | 2 +- .../windows/EditorObjectiveOptions.cpp | 2 +- .../windows/EditorParkEntrance.cpp | 2 +- .../windows/EditorScenarioOptions.cpp | 2 +- src/openrct2-ui/windows/Error.cpp | 2 +- src/openrct2-ui/windows/Finances.cpp | 2 +- src/openrct2-ui/windows/Footpath.cpp | 2 +- src/openrct2-ui/windows/GameBottomToolbar.cpp | 2 +- src/openrct2-ui/windows/Guest.cpp | 2 +- src/openrct2-ui/windows/GuestList.cpp | 2 +- src/openrct2-ui/windows/InstallTrack.cpp | 2 +- src/openrct2-ui/windows/Land.cpp | 2 +- src/openrct2-ui/windows/LandRights.cpp | 2 +- src/openrct2-ui/windows/LoadSave.cpp | 2 +- src/openrct2-ui/windows/Main.cpp | 2 +- src/openrct2-ui/windows/Map.cpp | 2 +- src/openrct2-ui/windows/MapGen.cpp | 2 +- src/openrct2-ui/windows/MapTooltip.cpp | 2 +- src/openrct2-ui/windows/MazeConstruction.cpp | 2 +- src/openrct2-ui/windows/Multiplayer.cpp | 2 +- src/openrct2-ui/windows/NetworkStatus.cpp | 2 +- src/openrct2-ui/windows/NewCampaign.cpp | 2 +- src/openrct2-ui/windows/NewRide.cpp | 2 +- src/openrct2-ui/windows/News.cpp | 2 +- src/openrct2-ui/windows/NewsOptions.cpp | 2 +- src/openrct2-ui/windows/ObjectLoadError.cpp | 2 +- src/openrct2-ui/windows/Options.cpp | 2 +- src/openrct2-ui/windows/Park.cpp | 2 +- src/openrct2-ui/windows/PatrolArea.cpp | 2 +- src/openrct2-ui/windows/Player.cpp | 2 +- src/openrct2-ui/windows/ProgressWindow.cpp | 2 +- .../windows/RefurbishRidePrompt.cpp | 2 +- src/openrct2-ui/windows/Research.cpp | 2 +- src/openrct2-ui/windows/Ride.cpp | 2 +- src/openrct2-ui/windows/RideConstruction.cpp | 2 +- src/openrct2-ui/windows/RideList.cpp | 2 +- src/openrct2-ui/windows/SavePrompt.cpp | 2 +- src/openrct2-ui/windows/ScenarioSelect.cpp | 2 +- src/openrct2-ui/windows/Scenery.cpp | 2 +- src/openrct2-ui/windows/SceneryScatter.cpp | 2 +- src/openrct2-ui/windows/ServerList.cpp | 2 +- src/openrct2-ui/windows/ServerStart.cpp | 2 +- src/openrct2-ui/windows/ShortcutKeys.cpp | 2 +- src/openrct2-ui/windows/Sign.cpp | 2 +- src/openrct2-ui/windows/Staff.cpp | 2 +- src/openrct2-ui/windows/StaffFirePrompt.cpp | 2 +- src/openrct2-ui/windows/StaffList.cpp | 2 +- src/openrct2-ui/windows/TextInput.cpp | 2 +- src/openrct2-ui/windows/Themes.cpp | 2 +- src/openrct2-ui/windows/TileInspector.cpp | 2 +- src/openrct2-ui/windows/TitleExit.cpp | 2 +- src/openrct2-ui/windows/TitleLogo.cpp | 2 +- src/openrct2-ui/windows/TitleMenu.cpp | 2 +- src/openrct2-ui/windows/TitleOptions.cpp | 2 +- src/openrct2-ui/windows/TitleVersion.cpp | 2 +- src/openrct2-ui/windows/Tooltip.cpp | 2 +- src/openrct2-ui/windows/TopToolbar.cpp | 2 +- src/openrct2-ui/windows/TrackDesignManage.cpp | 2 +- src/openrct2-ui/windows/TrackDesignPlace.cpp | 2 +- src/openrct2-ui/windows/TrackList.cpp | 2 +- src/openrct2-ui/windows/Transparency.cpp | 2 +- src/openrct2-ui/windows/ViewClipping.cpp | 2 +- src/openrct2-ui/windows/Viewport.cpp | 2 +- src/openrct2-ui/windows/Water.cpp | 2 +- .../windows/{Window.h => Windows.h} | 378 ++++++++++++------ 92 files changed, 350 insertions(+), 237 deletions(-) rename src/openrct2-ui/windows/{Window.h => Windows.h} (76%) diff --git a/src/openrct2-ui/ProvisionalElements.cpp b/src/openrct2-ui/ProvisionalElements.cpp index 0d16339bdc..2735871555 100644 --- a/src/openrct2-ui/ProvisionalElements.cpp +++ b/src/openrct2-ui/ProvisionalElements.cpp @@ -9,7 +9,7 @@ #include "ProvisionalElements.h" -#include +#include #include #include #include diff --git a/src/openrct2-ui/TextComposition.cpp b/src/openrct2-ui/TextComposition.cpp index 55bbf7eeb9..789fc979c3 100644 --- a/src/openrct2-ui/TextComposition.cpp +++ b/src/openrct2-ui/TextComposition.cpp @@ -12,9 +12,10 @@ #include "UiContext.h" #include "UiStringIds.h" #include "interface/InGameConsole.h" +#include "interface/Window.h" #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/WindowManager.cpp b/src/openrct2-ui/WindowManager.cpp index 6f1068b239..1c77a8d232 100644 --- a/src/openrct2-ui/WindowManager.cpp +++ b/src/openrct2-ui/WindowManager.cpp @@ -10,15 +10,16 @@ #include "WindowManager.h" #include "interface/Theme.h" +#include "interface/Window.h" #include "ride/VehicleSounds.h" -#include "windows/Window.h" +#include "windows/Windows.h" #include #include #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/input/InputManager.cpp b/src/openrct2-ui/input/InputManager.cpp index 0ec239cabe..13de6798b2 100644 --- a/src/openrct2-ui/input/InputManager.cpp +++ b/src/openrct2-ui/input/InputManager.cpp @@ -16,7 +16,8 @@ #include #include #include -#include +#include +#include #include #include #include diff --git a/src/openrct2-ui/input/MouseInput.cpp b/src/openrct2-ui/input/MouseInput.cpp index 49fef8388e..2a6087a2d8 100644 --- a/src/openrct2-ui/input/MouseInput.cpp +++ b/src/openrct2-ui/input/MouseInput.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/input/Shortcuts.cpp b/src/openrct2-ui/input/Shortcuts.cpp index 4f7e51738f..de1401101c 100644 --- a/src/openrct2-ui/input/Shortcuts.cpp +++ b/src/openrct2-ui/input/Shortcuts.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/interface/ViewportInteraction.cpp b/src/openrct2-ui/interface/ViewportInteraction.cpp index e8dd7577e6..75b8669152 100644 --- a/src/openrct2-ui/interface/ViewportInteraction.cpp +++ b/src/openrct2-ui/interface/ViewportInteraction.cpp @@ -11,7 +11,7 @@ #include "../ProvisionalElements.h" #include "../UiStringIds.h" -#include "../windows/Window.h" +#include "../windows/Windows.h" #include "Viewport.h" #include "Window.h" diff --git a/src/openrct2-ui/interface/Widget.cpp b/src/openrct2-ui/interface/Widget.cpp index 50ef0d8234..17fe158387 100644 --- a/src/openrct2-ui/interface/Widget.cpp +++ b/src/openrct2-ui/interface/Widget.cpp @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include diff --git a/src/openrct2-ui/interface/Window.cpp b/src/openrct2-ui/interface/Window.cpp index 970a8408f6..82a567b29f 100644 --- a/src/openrct2-ui/interface/Window.cpp +++ b/src/openrct2-ui/interface/Window.cpp @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/interface/Window.h b/src/openrct2-ui/interface/Window.h index 107610f47d..a05dc8acd7 100644 --- a/src/openrct2-ui/interface/Window.h +++ b/src/openrct2-ui/interface/Window.h @@ -55,32 +55,6 @@ namespace OpenRCT2 namespace OpenRCT2::Ui::Windows { - void RideConstructionToolupdateEntranceExit(const ScreenCoordsXY& screenCoords); - void RideConstructionToolupdateConstruct(const ScreenCoordsXY& screenCoords); - void RideConstructionTooldownConstruct(const ScreenCoordsXY& screenCoords); - void UpdateGhostTrackAndArrow(); - void WindowRideConstructionKeyboardShortcutTurnLeft(); - void WindowRideConstructionKeyboardShortcutTurnRight(); - void WindowRideConstructionKeyboardShortcutUseTrackDefault(); - void WindowRideConstructionKeyboardShortcutSlopeDown(); - void WindowRideConstructionKeyboardShortcutSlopeUp(); - void WindowRideConstructionKeyboardShortcutChainLiftToggle(); - void WindowRideConstructionKeyboardShortcutBankLeft(); - void WindowRideConstructionKeyboardShortcutBankRight(); - void WindowRideConstructionKeyboardShortcutPreviousTrack(); - void WindowRideConstructionKeyboardShortcutNextTrack(); - void WindowRideConstructionKeyboardShortcutBuildCurrent(); - void WindowRideConstructionKeyboardShortcutDemolishCurrent(); - - void WindowFootpathKeyboardShortcutTurnLeft(); - void WindowFootpathKeyboardShortcutTurnRight(); - void WindowFootpathKeyboardShortcutSlopeDown(); - void WindowFootpathKeyboardShortcutSlopeUp(); - void WindowFootpathKeyboardShortcutBuildCurrent(); - void WindowFootpathKeyboardShortcutDemolishCurrent(); - - void WindowTileInspectorKeyboardShortcutToggleInvisibility(); - extern const StringId ColourSchemeNames[4]; WindowBase* WindowGetListening(); diff --git a/src/openrct2-ui/libopenrct2ui.vcxproj b/src/openrct2-ui/libopenrct2ui.vcxproj index ff830f6af9..7f0ebcde92 100644 --- a/src/openrct2-ui/libopenrct2ui.vcxproj +++ b/src/openrct2-ui/libopenrct2ui.vcxproj @@ -101,7 +101,7 @@ - + diff --git a/src/openrct2-ui/ride/VehicleSounds.cpp b/src/openrct2-ui/ride/VehicleSounds.cpp index 6e5ec4a89a..9f081c4c8a 100644 --- a/src/openrct2-ui/ride/VehicleSounds.cpp +++ b/src/openrct2-ui/ride/VehicleSounds.cpp @@ -2,6 +2,7 @@ #include "../interface/Viewport.h" #include "../interface/Window.h" +#include "../windows/Windows.h" #include #include diff --git a/src/openrct2-ui/scripting/CustomListView.cpp b/src/openrct2-ui/scripting/CustomListView.cpp index c7841755d9..5039e8162d 100644 --- a/src/openrct2-ui/scripting/CustomListView.cpp +++ b/src/openrct2-ui/scripting/CustomListView.cpp @@ -13,7 +13,7 @@ #include "../interface/Viewport.h" #include "../interface/Widget.h" - #include "../interface/Window.h" + #include "../windows/Windows.h" #include #include diff --git a/src/openrct2-ui/scripting/CustomWindow.cpp b/src/openrct2-ui/scripting/CustomWindow.cpp index b1dffc6b3e..ff5d1605e5 100644 --- a/src/openrct2-ui/scripting/CustomWindow.cpp +++ b/src/openrct2-ui/scripting/CustomWindow.cpp @@ -15,7 +15,7 @@ #include "../interface/Widget.h" #include "../scripting/ScGraphicsContext.hpp" #include "../scripting/ScWidget.hpp" - #include "../windows/Window.h" + #include "../windows/Windows.h" #include "CustomListView.h" #include "ScUi.hpp" #include "ScWindow.hpp" diff --git a/src/openrct2-ui/scripting/ScUi.hpp b/src/openrct2-ui/scripting/ScUi.hpp index 1b9503021e..4c38829832 100644 --- a/src/openrct2-ui/scripting/ScUi.hpp +++ b/src/openrct2-ui/scripting/ScUi.hpp @@ -11,7 +11,7 @@ #ifdef ENABLE_SCRIPTING - #include "../windows/Window.h" + #include "../windows/Windows.h" #include "CustomMenu.h" #include "ScImageManager.hpp" #include "ScTileSelection.hpp" diff --git a/src/openrct2-ui/title/TitleSequencePlayer.cpp b/src/openrct2-ui/title/TitleSequencePlayer.cpp index f4da02696f..28a215dc60 100644 --- a/src/openrct2-ui/title/TitleSequencePlayer.cpp +++ b/src/openrct2-ui/title/TitleSequencePlayer.cpp @@ -12,7 +12,7 @@ #include "../interface/Window.h" #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/About.cpp b/src/openrct2-ui/windows/About.cpp index 4e1c58483f..7724b10b54 100644 --- a/src/openrct2-ui/windows/About.cpp +++ b/src/openrct2-ui/windows/About.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/AssetPacks.cpp b/src/openrct2-ui/windows/AssetPacks.cpp index 4ed2ca6fc0..1f3dbe48dd 100644 --- a/src/openrct2-ui/windows/AssetPacks.cpp +++ b/src/openrct2-ui/windows/AssetPacks.cpp @@ -10,7 +10,7 @@ #include "../UiStringIds.h" #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Banner.cpp b/src/openrct2-ui/windows/Banner.cpp index 6f7b77a772..5779bc398f 100644 --- a/src/openrct2-ui/windows/Banner.cpp +++ b/src/openrct2-ui/windows/Banner.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Changelog.cpp b/src/openrct2-ui/windows/Changelog.cpp index 39f95be5e8..71a000a4a6 100644 --- a/src/openrct2-ui/windows/Changelog.cpp +++ b/src/openrct2-ui/windows/Changelog.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Cheats.cpp b/src/openrct2-ui/windows/Cheats.cpp index e1db565d5d..f27abb9144 100644 --- a/src/openrct2-ui/windows/Cheats.cpp +++ b/src/openrct2-ui/windows/Cheats.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/ClearScenery.cpp b/src/openrct2-ui/windows/ClearScenery.cpp index 998046d7c1..95b838b646 100644 --- a/src/openrct2-ui/windows/ClearScenery.cpp +++ b/src/openrct2-ui/windows/ClearScenery.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/CustomCurrency.cpp b/src/openrct2-ui/windows/CustomCurrency.cpp index 8046781859..c5882a1651 100644 --- a/src/openrct2-ui/windows/CustomCurrency.cpp +++ b/src/openrct2-ui/windows/CustomCurrency.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/DebugPaint.cpp b/src/openrct2-ui/windows/DebugPaint.cpp index 776136cf4a..cb015859e5 100644 --- a/src/openrct2-ui/windows/DebugPaint.cpp +++ b/src/openrct2-ui/windows/DebugPaint.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/DemolishRidePrompt.cpp b/src/openrct2-ui/windows/DemolishRidePrompt.cpp index d3d87a8f5c..1e5715a57f 100644 --- a/src/openrct2-ui/windows/DemolishRidePrompt.cpp +++ b/src/openrct2-ui/windows/DemolishRidePrompt.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/EditorBottomToolbar.cpp b/src/openrct2-ui/windows/EditorBottomToolbar.cpp index c0264ffd2c..518be08b66 100644 --- a/src/openrct2-ui/windows/EditorBottomToolbar.cpp +++ b/src/openrct2-ui/windows/EditorBottomToolbar.cpp @@ -10,7 +10,7 @@ #include "../interface/Theme.h" #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/EditorInventionsList.cpp b/src/openrct2-ui/windows/EditorInventionsList.cpp index 3b535d9915..cf05cc2111 100644 --- a/src/openrct2-ui/windows/EditorInventionsList.cpp +++ b/src/openrct2-ui/windows/EditorInventionsList.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp index fd5ccec6c6..e53405712b 100644 --- a/src/openrct2-ui/windows/EditorObjectSelection.cpp +++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp index 2a7002d732..8b3a7ffdfe 100644 --- a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp +++ b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp @@ -11,7 +11,7 @@ #include "../interface/Dropdown.h" #include "../interface/Widget.h" #include "../interface/Window.h" -#include "Window.h" +#include "Windows.h" #include #include diff --git a/src/openrct2-ui/windows/EditorParkEntrance.cpp b/src/openrct2-ui/windows/EditorParkEntrance.cpp index b5633a30c5..8eb06b6479 100644 --- a/src/openrct2-ui/windows/EditorParkEntrance.cpp +++ b/src/openrct2-ui/windows/EditorParkEntrance.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/EditorScenarioOptions.cpp b/src/openrct2-ui/windows/EditorScenarioOptions.cpp index f391348aad..617ac2810b 100644 --- a/src/openrct2-ui/windows/EditorScenarioOptions.cpp +++ b/src/openrct2-ui/windows/EditorScenarioOptions.cpp @@ -11,7 +11,7 @@ #include "../interface/Dropdown.h" #include "../interface/Widget.h" #include "../interface/Window.h" -#include "Window.h" +#include "Windows.h" #include #include diff --git a/src/openrct2-ui/windows/Error.cpp b/src/openrct2-ui/windows/Error.cpp index 7321420fa0..4bb7d73e89 100644 --- a/src/openrct2-ui/windows/Error.cpp +++ b/src/openrct2-ui/windows/Error.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp index 4805454247..6992a2bdc8 100644 --- a/src/openrct2-ui/windows/Finances.cpp +++ b/src/openrct2-ui/windows/Finances.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Footpath.cpp b/src/openrct2-ui/windows/Footpath.cpp index 86721e5db8..fdf0344045 100644 --- a/src/openrct2-ui/windows/Footpath.cpp +++ b/src/openrct2-ui/windows/Footpath.cpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/GameBottomToolbar.cpp b/src/openrct2-ui/windows/GameBottomToolbar.cpp index 427a004750..4a33c57e4a 100644 --- a/src/openrct2-ui/windows/GameBottomToolbar.cpp +++ b/src/openrct2-ui/windows/GameBottomToolbar.cpp @@ -10,7 +10,7 @@ #include "../interface/Theme.h" #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index d980fa7b19..15e5f9d15f 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/GuestList.cpp b/src/openrct2-ui/windows/GuestList.cpp index e4b5d54208..31b15cf339 100644 --- a/src/openrct2-ui/windows/GuestList.cpp +++ b/src/openrct2-ui/windows/GuestList.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/InstallTrack.cpp b/src/openrct2-ui/windows/InstallTrack.cpp index b6fbae9d20..91eb196d9f 100644 --- a/src/openrct2-ui/windows/InstallTrack.cpp +++ b/src/openrct2-ui/windows/InstallTrack.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Land.cpp b/src/openrct2-ui/windows/Land.cpp index d2284302af..e0975597ed 100644 --- a/src/openrct2-ui/windows/Land.cpp +++ b/src/openrct2-ui/windows/Land.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/LandRights.cpp b/src/openrct2-ui/windows/LandRights.cpp index 9fc9a52a12..19bee0c291 100644 --- a/src/openrct2-ui/windows/LandRights.cpp +++ b/src/openrct2-ui/windows/LandRights.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/LoadSave.cpp b/src/openrct2-ui/windows/LoadSave.cpp index b5f907984b..a356701ea1 100644 --- a/src/openrct2-ui/windows/LoadSave.cpp +++ b/src/openrct2-ui/windows/LoadSave.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Main.cpp b/src/openrct2-ui/windows/Main.cpp index f77f751ff5..e82644cb51 100644 --- a/src/openrct2-ui/windows/Main.cpp +++ b/src/openrct2-ui/windows/Main.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index 1e0cd726de..1f27a32131 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/MapGen.cpp b/src/openrct2-ui/windows/MapGen.cpp index d5d71c1015..22ccfaeeef 100644 --- a/src/openrct2-ui/windows/MapGen.cpp +++ b/src/openrct2-ui/windows/MapGen.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/MapTooltip.cpp b/src/openrct2-ui/windows/MapTooltip.cpp index 847bb67ff7..111460ad0e 100644 --- a/src/openrct2-ui/windows/MapTooltip.cpp +++ b/src/openrct2-ui/windows/MapTooltip.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/MazeConstruction.cpp b/src/openrct2-ui/windows/MazeConstruction.cpp index 65644d6846..7e6fa9aa16 100644 --- a/src/openrct2-ui/windows/MazeConstruction.cpp +++ b/src/openrct2-ui/windows/MazeConstruction.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Multiplayer.cpp b/src/openrct2-ui/windows/Multiplayer.cpp index 86620fa64a..baeeb8a986 100644 --- a/src/openrct2-ui/windows/Multiplayer.cpp +++ b/src/openrct2-ui/windows/Multiplayer.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/NetworkStatus.cpp b/src/openrct2-ui/windows/NetworkStatus.cpp index 0872cbf66c..b38958ca77 100644 --- a/src/openrct2-ui/windows/NetworkStatus.cpp +++ b/src/openrct2-ui/windows/NetworkStatus.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/NewCampaign.cpp b/src/openrct2-ui/windows/NewCampaign.cpp index 054fbc3973..26beebf5ff 100644 --- a/src/openrct2-ui/windows/NewCampaign.cpp +++ b/src/openrct2-ui/windows/NewCampaign.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index 1cc4a7b5ee..6a596e16d9 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/News.cpp b/src/openrct2-ui/windows/News.cpp index 17119ac073..974db6a587 100644 --- a/src/openrct2-ui/windows/News.cpp +++ b/src/openrct2-ui/windows/News.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/NewsOptions.cpp b/src/openrct2-ui/windows/NewsOptions.cpp index 8e2e6de69b..fbdeefc87f 100644 --- a/src/openrct2-ui/windows/NewsOptions.cpp +++ b/src/openrct2-ui/windows/NewsOptions.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/ObjectLoadError.cpp b/src/openrct2-ui/windows/ObjectLoadError.cpp index f64c3c873f..3f2d0d2bcf 100644 --- a/src/openrct2-ui/windows/ObjectLoadError.cpp +++ b/src/openrct2-ui/windows/ObjectLoadError.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp index 8b44038a59..19d55ac6b5 100644 --- a/src/openrct2-ui/windows/Options.cpp +++ b/src/openrct2-ui/windows/Options.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp index 8ecee3d564..ab45c15289 100644 --- a/src/openrct2-ui/windows/Park.cpp +++ b/src/openrct2-ui/windows/Park.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/PatrolArea.cpp b/src/openrct2-ui/windows/PatrolArea.cpp index 0cc33b2eab..e2fcb7cb6d 100644 --- a/src/openrct2-ui/windows/PatrolArea.cpp +++ b/src/openrct2-ui/windows/PatrolArea.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Player.cpp b/src/openrct2-ui/windows/Player.cpp index e068814e95..116d63dd41 100644 --- a/src/openrct2-ui/windows/Player.cpp +++ b/src/openrct2-ui/windows/Player.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/ProgressWindow.cpp b/src/openrct2-ui/windows/ProgressWindow.cpp index 4cd6dc0a35..e80b0188b0 100644 --- a/src/openrct2-ui/windows/ProgressWindow.cpp +++ b/src/openrct2-ui/windows/ProgressWindow.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/RefurbishRidePrompt.cpp b/src/openrct2-ui/windows/RefurbishRidePrompt.cpp index 8c1c42a794..ac48088e42 100644 --- a/src/openrct2-ui/windows/RefurbishRidePrompt.cpp +++ b/src/openrct2-ui/windows/RefurbishRidePrompt.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Research.cpp b/src/openrct2-ui/windows/Research.cpp index 6dfcf99581..e15635a210 100644 --- a/src/openrct2-ui/windows/Research.cpp +++ b/src/openrct2-ui/windows/Research.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 9ecf0f8142..aa5c262f8b 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index 0730fff378..5d300dd4bc 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/RideList.cpp b/src/openrct2-ui/windows/RideList.cpp index 07c974170b..f397053326 100644 --- a/src/openrct2-ui/windows/RideList.cpp +++ b/src/openrct2-ui/windows/RideList.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/SavePrompt.cpp b/src/openrct2-ui/windows/SavePrompt.cpp index 2a100d9f2a..3af8820646 100644 --- a/src/openrct2-ui/windows/SavePrompt.cpp +++ b/src/openrct2-ui/windows/SavePrompt.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/ScenarioSelect.cpp b/src/openrct2-ui/windows/ScenarioSelect.cpp index b524bfa72a..7341aafffa 100644 --- a/src/openrct2-ui/windows/ScenarioSelect.cpp +++ b/src/openrct2-ui/windows/ScenarioSelect.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp index 08e315a076..074018defd 100644 --- a/src/openrct2-ui/windows/Scenery.cpp +++ b/src/openrct2-ui/windows/Scenery.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/SceneryScatter.cpp b/src/openrct2-ui/windows/SceneryScatter.cpp index 5c05106491..5775a10127 100644 --- a/src/openrct2-ui/windows/SceneryScatter.cpp +++ b/src/openrct2-ui/windows/SceneryScatter.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/ServerList.cpp b/src/openrct2-ui/windows/ServerList.cpp index 8974796987..e8f6307966 100644 --- a/src/openrct2-ui/windows/ServerList.cpp +++ b/src/openrct2-ui/windows/ServerList.cpp @@ -13,7 +13,7 @@ #include #include #include - #include + #include #include #include #include diff --git a/src/openrct2-ui/windows/ServerStart.cpp b/src/openrct2-ui/windows/ServerStart.cpp index 543b74b3c9..05dad60489 100644 --- a/src/openrct2-ui/windows/ServerStart.cpp +++ b/src/openrct2-ui/windows/ServerStart.cpp @@ -12,7 +12,7 @@ #include "../interface/Theme.h" #include - #include + #include #include #include #include diff --git a/src/openrct2-ui/windows/ShortcutKeys.cpp b/src/openrct2-ui/windows/ShortcutKeys.cpp index 781c17b7b0..ccf85a7475 100644 --- a/src/openrct2-ui/windows/ShortcutKeys.cpp +++ b/src/openrct2-ui/windows/ShortcutKeys.cpp @@ -7,7 +7,7 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "Window.h" +#include "Windows.h" #include #include diff --git a/src/openrct2-ui/windows/Sign.cpp b/src/openrct2-ui/windows/Sign.cpp index 3f140a5256..09ad795111 100644 --- a/src/openrct2-ui/windows/Sign.cpp +++ b/src/openrct2-ui/windows/Sign.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp index 9eeb6bf6e4..b7a8290f91 100644 --- a/src/openrct2-ui/windows/Staff.cpp +++ b/src/openrct2-ui/windows/Staff.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/StaffFirePrompt.cpp b/src/openrct2-ui/windows/StaffFirePrompt.cpp index e8c1336db0..40a6a3eb0c 100644 --- a/src/openrct2-ui/windows/StaffFirePrompt.cpp +++ b/src/openrct2-ui/windows/StaffFirePrompt.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/StaffList.cpp b/src/openrct2-ui/windows/StaffList.cpp index 63984bc27e..b66b2d280c 100644 --- a/src/openrct2-ui/windows/StaffList.cpp +++ b/src/openrct2-ui/windows/StaffList.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/TextInput.cpp b/src/openrct2-ui/windows/TextInput.cpp index d8f458a533..931d5ad063 100644 --- a/src/openrct2-ui/windows/TextInput.cpp +++ b/src/openrct2-ui/windows/TextInput.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Themes.cpp b/src/openrct2-ui/windows/Themes.cpp index 0bf940d865..79e6094e5f 100644 --- a/src/openrct2-ui/windows/Themes.cpp +++ b/src/openrct2-ui/windows/Themes.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp index 43b4473e88..02670ae7e8 100644 --- a/src/openrct2-ui/windows/TileInspector.cpp +++ b/src/openrct2-ui/windows/TileInspector.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/TitleExit.cpp b/src/openrct2-ui/windows/TitleExit.cpp index 27f8a17f2d..b5a88e9600 100644 --- a/src/openrct2-ui/windows/TitleExit.cpp +++ b/src/openrct2-ui/windows/TitleExit.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/TitleLogo.cpp b/src/openrct2-ui/windows/TitleLogo.cpp index fc2502b098..f5b425a5ea 100644 --- a/src/openrct2-ui/windows/TitleLogo.cpp +++ b/src/openrct2-ui/windows/TitleLogo.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/TitleMenu.cpp b/src/openrct2-ui/windows/TitleMenu.cpp index fa60549afd..6c58d6d378 100644 --- a/src/openrct2-ui/windows/TitleMenu.cpp +++ b/src/openrct2-ui/windows/TitleMenu.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/TitleOptions.cpp b/src/openrct2-ui/windows/TitleOptions.cpp index 6aa1ba29ec..5358c56fd8 100644 --- a/src/openrct2-ui/windows/TitleOptions.cpp +++ b/src/openrct2-ui/windows/TitleOptions.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ #include -#include +#include #include #include diff --git a/src/openrct2-ui/windows/TitleVersion.cpp b/src/openrct2-ui/windows/TitleVersion.cpp index f117afc087..3e9735d89e 100644 --- a/src/openrct2-ui/windows/TitleVersion.cpp +++ b/src/openrct2-ui/windows/TitleVersion.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Tooltip.cpp b/src/openrct2-ui/windows/Tooltip.cpp index 848d391444..9382a3f9ea 100644 --- a/src/openrct2-ui/windows/Tooltip.cpp +++ b/src/openrct2-ui/windows/Tooltip.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index 845dc8b122..b1cf496345 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/TrackDesignManage.cpp b/src/openrct2-ui/windows/TrackDesignManage.cpp index dd1153d6c0..402c8bbee6 100644 --- a/src/openrct2-ui/windows/TrackDesignManage.cpp +++ b/src/openrct2-ui/windows/TrackDesignManage.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/TrackDesignPlace.cpp b/src/openrct2-ui/windows/TrackDesignPlace.cpp index b92f2983d5..8f7d521ccf 100644 --- a/src/openrct2-ui/windows/TrackDesignPlace.cpp +++ b/src/openrct2-ui/windows/TrackDesignPlace.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/TrackList.cpp b/src/openrct2-ui/windows/TrackList.cpp index d52cd5b8a4..4841a6a05b 100644 --- a/src/openrct2-ui/windows/TrackList.cpp +++ b/src/openrct2-ui/windows/TrackList.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Transparency.cpp b/src/openrct2-ui/windows/Transparency.cpp index 9324e76085..6656dcb31f 100644 --- a/src/openrct2-ui/windows/Transparency.cpp +++ b/src/openrct2-ui/windows/Transparency.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/ViewClipping.cpp b/src/openrct2-ui/windows/ViewClipping.cpp index 9acb3b3836..2758f22886 100644 --- a/src/openrct2-ui/windows/ViewClipping.cpp +++ b/src/openrct2-ui/windows/ViewClipping.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Viewport.cpp b/src/openrct2-ui/windows/Viewport.cpp index 2c9b7d3e80..368e8fb701 100644 --- a/src/openrct2-ui/windows/Viewport.cpp +++ b/src/openrct2-ui/windows/Viewport.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Water.cpp b/src/openrct2-ui/windows/Water.cpp index 50f56e7a36..8d7e4c635a 100644 --- a/src/openrct2-ui/windows/Water.cpp +++ b/src/openrct2-ui/windows/Water.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Window.h b/src/openrct2-ui/windows/Windows.h similarity index 76% rename from src/openrct2-ui/windows/Window.h rename to src/openrct2-ui/windows/Windows.h index a953b8954c..548abfc9b5 100644 --- a/src/openrct2-ui/windows/Window.h +++ b/src/openrct2-ui/windows/Windows.h @@ -9,12 +9,16 @@ #pragma once -#include #include +#include #include +#include #include +class Formatter; + struct ObjectEntryDescriptor; +struct OpenRCT2String; struct Peep; struct Ride; struct RideSelection; @@ -37,109 +41,175 @@ namespace OpenRCT2::Ui::Windows extern bool gWindowSceneryEyedropperEnabled; extern bool gDisableErrorWindowSound; + // About WindowBase* AboutOpen(); - void WindowCampaignRefreshRides(); + + // AssetPacks + WindowBase* AssetPacksOpen(); + + // Banner + WindowBase* BannerOpen(rct_windownumber number); + + // Changelog WindowBase* ChangelogOpen(int personality); + + // Cheats WindowBase* CheatsOpen(); + // ClearScenery WindowBase* ClearSceneryOpen(); void ToggleClearSceneryWindow(); + // CustomCurrency WindowBase* CustomCurrencyOpen(); + + // DebugPaint WindowBase* DebugPaintOpen(); + + // DemolishRidePrompt + WindowBase* RideDemolishPromptOpen(const Ride& ride); + + // EditorInventionsList WindowBase* EditorInventionsListOpen(); - WindowBase* EditorMainOpen(); + + // EditorBottomToolbar + WindowBase* EditorBottomToolbarOpen(); + + // EditorObjectiveOptions WindowBase* EditorObjectiveOptionsOpen(); - WindowBase* EditorScenarioOptionsOpen(); - WindowBase* FootpathOpen(); - void WindowFootpathResetSelectedPath(); - void ToggleFootpathWindow(); + // EditorObjectSelection + WindowBase* EditorObjectSelectionOpen(); + bool EditorObjectSelectionWindowCheck(); - WindowBase* GuestOpen(Peep* peep); - - WindowBase* LandOpen(); - void ToggleLandWindow(); - - WindowBase* LandRightsOpen(); - - WindowBase* MainOpen(); - WindowBase* MapgenOpen(); - WindowBase* MultiplayerOpen(); - WindowBase* NewsOpen(); - WindowBase* NewsOptionsOpen(); - WindowBase* OptionsOpen(); - WindowBase* SavePromptOpen(); -#ifndef DISABLE_NETWORK - WindowBase* ServerListOpen(); - WindowBase* ServerStartOpen(); -#endif - WindowBase* ShortcutKeysOpen(); - WindowBase* StaffListOpen(); - WindowBase* StaffOpen(Peep* peep); - void WindowStaffListRefresh(); - WindowBase* ThemesOpen(); - WindowBase* TitleExitOpen(); - WindowBase* TitleLogoOpen(); - WindowBase* TitleMenuOpen(); - WindowBase* TitleOptionsOpen(); - WindowBase* TitleVersionOpen(); - WindowBase* ViewportOpen(); - - WindowBase* WaterOpen(); - void ToggleWaterWindow(); - - WindowBase* ViewClippingOpen(); - WindowBase* TransparencyOpen(); - WindowBase* AssetPacksOpen(); + // EditorParkEntrance WindowBase* EditorParkEntranceOpen(); - // WC_FINANCES + // EditorScenarioOptions + WindowBase* EditorScenarioOptionsOpen(); + + // Error + WindowBase* ErrorOpen(StringId title, StringId message, const class Formatter& formatter, bool autoClose = false); + WindowBase* ErrorOpen(std::string_view title, std::string_view message, bool autoClose = false); + + // Finances WindowBase* FinancesOpen(); WindowBase* FinancesResearchOpen(); WindowBase* FinancesMarketingOpen(); - // WC_PARK_INFORMATION - WindowBase* ParkAwardsOpen(); - WindowBase* ParkEntranceOpen(); - WindowBase* ParkGuestsOpen(); - WindowBase* ParkObjectiveOpen(); - WindowBase* ParkRatingOpen(); + // Footpath + WindowBase* FootpathOpen(); + void WindowFootpathResetSelectedPath(); + void ToggleFootpathWindow(); + void WindowFootpathKeyboardShortcutTurnLeft(); + void WindowFootpathKeyboardShortcutTurnRight(); + void WindowFootpathKeyboardShortcutSlopeDown(); + void WindowFootpathKeyboardShortcutSlopeUp(); + void WindowFootpathKeyboardShortcutBuildCurrent(); + void WindowFootpathKeyboardShortcutDemolishCurrent(); - WindowBase* BannerOpen(rct_windownumber number); - WindowBase* RideDemolishPromptOpen(const Ride& ride); - WindowBase* RideRefurbishPromptOpen(const Ride& ride); - WindowBase* SignOpen(rct_windownumber number); - WindowBase* SignSmallOpen(rct_windownumber number); - WindowBase* PlayerOpen(uint8_t id); - WindowBase* NewCampaignOpen(int16_t campaignType); + // GameBottomToolbar + extern uint8_t gToolbarDirtyFlags; + WindowBase* GameBottomToolbarOpen(); + void WindowGameBottomToolbarInvalidateNewsItem(); - WindowBase* InstallTrackOpen(const utf8* path); - void WindowGuestListRefreshList(); + // Guest + WindowBase* GuestOpen(Peep* peep); + + // GuestList WindowBase* GuestListOpen(); WindowBase* GuestListOpenWithFilter(GuestListFilterType type, int32_t index); - WindowBase* StaffFirePromptOpen(Peep* peep); - WindowBase* ScenarioselectOpen(ScenarioSelectCallback callback); - WindowBase* ScenarioselectOpen(std::function callback); + void WindowGuestListRefreshList(); - WindowBase* ErrorOpen(StringId title, StringId message, const class Formatter& formatter, bool autoClose = false); - WindowBase* ErrorOpen(std::string_view title, std::string_view message, bool autoClose = false); + // InstallTrack + WindowBase* InstallTrackOpen(const utf8* path); + // Land + WindowBase* LandOpen(); + void ToggleLandWindow(); + + // LandRights + WindowBase* LandRightsOpen(); + + // LoadSave WindowBase* LoadsaveOpen( int32_t type, std::string_view defaultPath, std::function callback, TrackDesign* trackDesign); void WindowLoadSaveInputKey(WindowBase* w, uint32_t keycode); void WindowLoadSaveOverwritePromptInputKey(WindowBase* w, uint32_t keycode); - WindowBase* TrackPlaceOpen(const struct TrackDesignFileRef* tdFileRef); - WindowBase* TrackManageOpen(struct TrackDesignFileRef* tdFileRef); - - void TrackPlaceClearProvisionalTemporarily(); - void TrackPlaceRestoreProvisional(); + // Main + WindowBase* MainOpen(); + // Map WindowBase* MapOpen(); void WindowMapReset(); + // MapGen + WindowBase* MapgenOpen(); + + // MapTooltip + void SetMapTooltip(Formatter& ft); + const Formatter& GetMapTooltip(); + void WindowMapTooltipUpdateVisibility(); + + // MazeConstruction + WindowBase* MazeConstructionOpen(); + void WindowMazeConstructionUpdatePressedWidgets(); + + // Multiplatyer + WindowBase* MultiplayerOpen(); + + // NewCampaign + WindowBase* NewCampaignOpen(int16_t campaignType); + void WindowCampaignRefreshRides(); + + // NewRide + WindowBase* NewRideOpen(); + WindowBase* NewRideOpenResearch(); + void WindowNewRideInitVars(); + void WindowNewRideFocus(RideSelection rideItem); + + // News + WindowBase* NewsOpen(); + + // NewsOptions + WindowBase* NewsOptionsOpen(); + + // NetworkStatus + WindowBase* NetworkStatusOpen(const std::string& text, CloseCallback onClose); + WindowBase* NetworkStatusOpenPassword(); + void WindowNetworkStatusClose(); + + // ObjectLoadError + WindowBase* ObjectLoadErrorOpen(utf8* path, size_t numMissingObjects, const ObjectEntryDescriptor* missingObjects); + + // Options + WindowBase* OptionsOpen(); + + // Park + WindowBase* ParkAwardsOpen(); + WindowBase* ParkEntranceOpen(); + WindowBase* ParkGuestsOpen(); + WindowBase* ParkObjectiveOpen(); + WindowBase* ParkRatingOpen(); + + // Player + WindowBase* PlayerOpen(uint8_t id); + + // ProgressWindow + WindowBase* ProgressWindowOpen(const std::string& text, CloseCallback onClose = nullptr); + void ProgressWindowSet(uint32_t currentProgress, uint32_t totalCount, StringId format = STR_NONE); + void ProgressWindowClose(); + + // PatrolArea + WindowBase* PatrolAreaOpen(EntityId staffId); + EntityId WindowPatrolAreaGetCurrentStaffId(); + + // RefurbishRidePrompt + WindowBase* RideRefurbishPromptOpen(const Ride& ride); + + // Research WindowBase* ResearchOpen(); void WindowResearchDevelopmentMouseUp(WidgetIndex widgetIndex, WidgetIndex baseWidgetIndex); void WindowResearchDevelopmentPrepareDraw(WindowBase* w, WidgetIndex baseWidgetIndex); @@ -150,14 +220,7 @@ namespace OpenRCT2::Ui::Windows void WindowResearchFundingPrepareDraw(WindowBase* w, WidgetIndex baseWidgetIndex); void WindowResearchFundingDraw(WindowBase* w, DrawPixelInfo& dpi); - WindowBase* NewRideOpen(); - WindowBase* NewRideOpenResearch(); - void WindowNewRideInitVars(); - void WindowNewRideFocus(RideSelection rideItem); - - WindowBase* RideListOpen(); - void WindowRideListRefreshList(WindowBase* w); - + // Ride WindowBase* RideMainOpen(const Ride& ride); WindowBase* RideOpenTrack(TileElement* tileElement); WindowBase* RideOpenVehicle(Vehicle* vehicle); @@ -165,49 +228,41 @@ namespace OpenRCT2::Ui::Windows void WindowRidePaintResetVehicle(RideId rideIndex); void WindowRideMeasurementsDesignCancel(); - // rct2: 0x00F635EE - extern RideSelection _window_track_list_item; - WindowBase* TrackListOpen(RideSelection item); - void WindowTrackDesignListReloadTracks(); - void WindowTrackDesignListSetBeingUpdated(bool beingUpdated); - - void SetMapTooltip(Formatter& ft); - const Formatter& GetMapTooltip(); - void WindowMapTooltipUpdateVisibility(); - - WindowBase* MazeConstructionOpen(); - void WindowMazeConstructionUpdatePressedWidgets(); - - WindowBase* NetworkStatusOpen(const std::string& text, CloseCallback onClose); - WindowBase* NetworkStatusOpenPassword(); - void WindowNetworkStatusClose(); - - WindowBase* ProgressWindowOpen(const std::string& text, CloseCallback onClose = nullptr); - void ProgressWindowSet(uint32_t currentProgress, uint32_t totalCount, StringId format = STR_NONE); - void ProgressWindowClose(); - - void WindowTextInputKey(WindowBase* w, uint32_t keycode); - void WindowTextInputOpen( - WindowBase* call_w, WidgetIndex call_widget, StringId title, StringId description, const Formatter& descriptionArgs, - StringId existing_text, uintptr_t existing_args, int32_t maxLength); - void WindowTextInputRawOpen( - WindowBase* call_w, WidgetIndex call_widget, StringId title, StringId description, const Formatter& descriptionArgs, - const_utf8string existing_text, int32_t maxLength); - - void WindowTextInputOpen( - std::string_view title, std::string_view description, std::string_view initialValue, size_t maxLength, - std::function okCallback, std::function cancelCallback); - - WindowBase* ObjectLoadErrorOpen(utf8* path, size_t numMissingObjects, const ObjectEntryDescriptor* missingObjects); - + // RideConstruction WindowBase* RideConstructionOpen(); void WindowRideConstructionUpdateActiveElementsImpl(); void WindowRideConstructionUpdateEnabledTrackPieces(); void RideRestoreProvisionalTrackPiece(); void RideRemoveProvisionalTrackPiece(); + void RideConstructionToolupdateEntranceExit(const ScreenCoordsXY& screenCoords); + void RideConstructionToolupdateConstruct(const ScreenCoordsXY& screenCoords); + void RideConstructionTooldownConstruct(const ScreenCoordsXY& screenCoords); + void UpdateGhostTrackAndArrow(); + void WindowRideConstructionKeyboardShortcutTurnLeft(); + void WindowRideConstructionKeyboardShortcutTurnRight(); + void WindowRideConstructionKeyboardShortcutUseTrackDefault(); + void WindowRideConstructionKeyboardShortcutSlopeDown(); + void WindowRideConstructionKeyboardShortcutSlopeUp(); + void WindowRideConstructionKeyboardShortcutChainLiftToggle(); + void WindowRideConstructionKeyboardShortcutBankLeft(); + void WindowRideConstructionKeyboardShortcutBankRight(); + void WindowRideConstructionKeyboardShortcutPreviousTrack(); + void WindowRideConstructionKeyboardShortcutNextTrack(); + void WindowRideConstructionKeyboardShortcutBuildCurrent(); + void WindowRideConstructionKeyboardShortcutDemolishCurrent(); - WindowBase* TopToolbarOpen(); + // RideList + WindowBase* RideListOpen(); + void WindowRideListRefreshList(WindowBase* w); + // SavePrompt + WindowBase* SavePromptOpen(); + + // ScenarioSelect + WindowBase* ScenarioselectOpen(ScenarioSelectCallback callback); + WindowBase* ScenarioselectOpen(std::function callback); + + // Scenery WindowBase* SceneryOpen(); void WindowScenerySetSelectedItem( const ScenerySelection& sceneryconst, std::optional primary, const std::optional secondary, @@ -219,24 +274,103 @@ namespace OpenRCT2::Ui::Windows const ScenerySelection WindowSceneryGetTabSelection(); void ToggleSceneryWindow(); - extern uint8_t gToolbarDirtyFlags; - WindowBase* GameBottomToolbarOpen(); - void WindowGameBottomToolbarInvalidateNewsItem(); + // SceneryScatter + WindowBase* SceneryScatterOpen(); - WindowBase* EditorBottomToolbarOpen(); +#ifndef DISABLE_NETWORK + // ServerList + WindowBase* ServerListOpen(); + // ServerStart + WindowBase* ServerStartOpen(); +#endif + + // ShortcutKeys + WindowBase* ShortcutKeysOpen(); + + // Sign + WindowBase* SignOpen(rct_windownumber number); + WindowBase* SignSmallOpen(rct_windownumber number); + + // Staff + WindowBase* StaffOpen(Peep* peep); + + // StaffFirePrompt + WindowBase* StaffFirePromptOpen(Peep* peep); + + // StaffList + WindowBase* StaffListOpen(); + void WindowStaffListRefresh(); + + // TextInput + void WindowTextInputKey(WindowBase* w, uint32_t keycode); + void WindowTextInputOpen( + WindowBase* call_w, WidgetIndex call_widget, StringId title, StringId description, const Formatter& descriptionArgs, + StringId existing_text, uintptr_t existing_args, int32_t maxLength); + void WindowTextInputRawOpen( + WindowBase* call_w, WidgetIndex call_widget, StringId title, StringId description, const Formatter& descriptionArgs, + const_utf8string existing_text, int32_t maxLength); + void WindowTextInputOpen( + std::string_view title, std::string_view description, std::string_view initialValue, size_t maxLength, + std::function okCallback, std::function cancelCallback); + + // Themes + WindowBase* ThemesOpen(); + + // TileInspector WindowBase* TileInspectorOpen(); void WindowTileInspectorClearClipboard(); + void WindowTileInspectorKeyboardShortcutToggleInvisibility(); - WindowBase* EditorObjectSelectionOpen(); - bool EditorObjectSelectionWindowCheck(); + // TitleExit + WindowBase* TitleExitOpen(); + // TitleLogo + WindowBase* TitleLogoOpen(); + + // TitleMenu + WindowBase* TitleMenuOpen(); + + // TitleOptions + WindowBase* TitleOptionsOpen(); + + // TitleVersion + WindowBase* TitleVersionOpen(); + + // Tooltip void WindowTooltipReset(const ScreenCoordsXY& screenCoords); void WindowTooltipShow(const OpenRCT2String& message, ScreenCoordsXY screenCoords); void WindowTooltipOpen(WindowBase* widgetWindow, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords); void WindowTooltipClose(); - WindowBase* SceneryScatterOpen(); - WindowBase* PatrolAreaOpen(EntityId staffId); - EntityId WindowPatrolAreaGetCurrentStaffId(); + // TopToolbar + WindowBase* TopToolbarOpen(); + + // TrackDesignPlace + WindowBase* TrackPlaceOpen(const struct TrackDesignFileRef* tdFileRef); + void TrackPlaceClearProvisionalTemporarily(); + void TrackPlaceRestoreProvisional(); + + // TrackDesignManage + WindowBase* TrackManageOpen(struct TrackDesignFileRef* tdFileRef); + + // TrackList + // rct2: 0x00F635EE + extern RideSelection _window_track_list_item; + WindowBase* TrackListOpen(RideSelection item); + void WindowTrackDesignListReloadTracks(); + void WindowTrackDesignListSetBeingUpdated(bool beingUpdated); + + // Transparency + WindowBase* TransparencyOpen(); + + // ViewClipping + WindowBase* ViewClippingOpen(); + + // Viewport + WindowBase* ViewportOpen(); + + // Water + WindowBase* WaterOpen(); + void ToggleWaterWindow(); } // namespace OpenRCT2::Ui::Windows