diff --git a/contributors.md b/contributors.md index e83a06460b..a85cd73001 100644 --- a/contributors.md +++ b/contributors.md @@ -235,6 +235,7 @@ Appreciation for contributors who have provided substantial work, but are no lon * Aram Kazorian (aramk-hub) * Harry Hopkinson (Harry-Hopkinson) * Jan Kelemen (jan-kelemen) +* Cory Ye (CoryfY) ## Toolchain * (Balletie) - macOS diff --git a/src/openrct2-ui/WindowManager.cpp b/src/openrct2-ui/WindowManager.cpp index 5d47c35b3f..7c98b8b031 100644 --- a/src/openrct2-ui/WindowManager.cpp +++ b/src/openrct2-ui/WindowManager.cpp @@ -44,101 +44,101 @@ public: switch (wc) { case WindowClass::About: - return WindowAboutOpen(); + return AboutOpen(); case WindowClass::BottomToolbar: - return WindowGameBottomToolbarOpen(); + return GameBottomToolbarOpen(); case WindowClass::Changelog: return OpenView(WV_CHANGELOG); case WindowClass::Cheats: - return WindowCheatsOpen(); + return CheatsOpen(); case WindowClass::ClearScenery: - return WindowClearSceneryOpen(); + return ClearSceneryOpen(); case WindowClass::CustomCurrencyConfig: - return CustomCurrencyWindowOpen(); + return CustomCurrencyOpen(); case WindowClass::DebugPaint: - return WindowDebugPaintOpen(); + return DebugPaintOpen(); case WindowClass::EditorInventionList: - return WindowEditorInventionsListOpen(); + return EditorInventionsListOpen(); case WindowClass::EditorObjectSelection: - return WindowEditorObjectSelectionOpen(); + return EditorObjectSelectionOpen(); case WindowClass::EditorObjectiveOptions: - return WindowEditorObjectiveOptionsOpen(); + return EditorObjectiveOptionsOpen(); case WindowClass::EditorScenarioOptions: - return WindowEditorScenarioOptionsOpen(); + return EditorScenarioOptionsOpen(); case WindowClass::Finances: - return WindowFinancesOpen(); + return FinancesOpen(); case WindowClass::Footpath: - return WindowFootpathOpen(); + return FootpathOpen(); case WindowClass::GuestList: - return WindowGuestListOpen(); + return GuestListOpen(); case WindowClass::Land: - return WindowLandOpen(); + return LandOpen(); case WindowClass::LandRights: - return WindowLandRightsOpen(); + return LandRightsOpen(); case WindowClass::MainWindow: - return WindowMainOpen(); + return MainOpen(); case WindowClass::Map: - return WindowMapOpen(); + return MapOpen(); case WindowClass::Mapgen: - return WindowMapgenOpen(); + return MapgenOpen(); case WindowClass::Multiplayer: - return WindowMultiplayerOpen(); + return MultiplayerOpen(); case WindowClass::ConstructRide: - return WindowNewRideOpen(); + return NewRideOpen(); case WindowClass::ParkInformation: - return WindowParkEntranceOpen(); + return ParkEntranceOpen(); case WindowClass::RecentNews: - return WindowNewsOpen(); + return NewsOpen(); case WindowClass::RideConstruction: - return WindowRideConstructionOpen(); + return RideConstructionOpen(); case WindowClass::Research: - return WindowResearchOpen(); + return ResearchOpen(); case WindowClass::RideList: - return WindowRideListOpen(); + return RideListOpen(); case WindowClass::NotificationOptions: - return WindowNewsOptionsOpen(); + return NewsOptionsOpen(); case WindowClass::Options: - return WindowOptionsOpen(); + return OptionsOpen(); case WindowClass::SavePrompt: - return WindowSavePromptOpen(); + return SavePromptOpen(); case WindowClass::Scenery: - return WindowSceneryOpen(); + return SceneryOpen(); case WindowClass::SceneryScatter: - return WindowSceneryScatterOpen(); + return SceneryScatterOpen(); #ifndef DISABLE_NETWORK case WindowClass::ServerList: - return WindowServerListOpen(); + return ServerListOpen(); case WindowClass::ServerStart: - return WindowServerStartOpen(); + return ServerStartOpen(); #endif case WindowClass::KeyboardShortcutList: - return WindowShortcutKeysOpen(); + return ShortcutKeysOpen(); case WindowClass::StaffList: - return WindowStaffListOpen(); + return StaffListOpen(); case WindowClass::Themes: - return WindowThemesOpen(); + return ThemesOpen(); case WindowClass::TileInspector: - return WindowTileInspectorOpen(); + return TileInspectorOpen(); case WindowClass::TitleExit: - return WindowTitleExitOpen(); + return TitleExitOpen(); case WindowClass::TitleLogo: - return WindowTitleLogoOpen(); + return TitleLogoOpen(); case WindowClass::TitleMenu: - return WindowTitleMenuOpen(); + return TitleMenuOpen(); case WindowClass::TitleOptions: - return WindowTitleOptionsOpen(); + return TitleOptionsOpen(); case WindowClass::TopToolbar: - return WindowTopToolbarOpen(); + return TopToolbarOpen(); case WindowClass::ViewClipping: - return WindowViewClippingOpen(); + return ViewClippingOpen(); case WindowClass::Viewport: - return WindowViewportOpen(); + return ViewportOpen(); case WindowClass::Water: - return WindowWaterOpen(); + return WaterOpen(); case WindowClass::Transparency: - return WindowTransparencyOpen(); + return TransparencyOpen(); case WindowClass::AssetPacks: - return WindowAssetPacksOpen(); + return AssetPacksOpen(); default: Console::Error::WriteLine("Unhandled window class (%d)", wc); return nullptr; @@ -150,35 +150,35 @@ public: switch (view) { case WV_PARK_AWARDS: - return WindowParkAwardsOpen(); + return ParkAwardsOpen(); case WV_PARK_RATING: - return WindowParkRatingOpen(); + return ParkRatingOpen(); case WV_PARK_OBJECTIVE: - return WindowParkObjectiveOpen(); + return ParkObjectiveOpen(); case WV_PARK_GUESTS: - return WindowParkGuestsOpen(); + return ParkGuestsOpen(); case WV_FINANCES_RESEARCH: - return WindowFinancesResearchOpen(); + return FinancesResearchOpen(); case WV_RIDE_RESEARCH: if (gConfigInterface.ToolbarShowResearch) { return this->OpenWindow(WindowClass::Research); } - return WindowNewRideOpenResearch(); + return NewRideOpenResearch(); case WV_MAZE_CONSTRUCTION: - return WindowMazeConstructionOpen(); + return MazeConstructionOpen(); case WV_NETWORK_PASSWORD: - return WindowNetworkStatusOpenPassword(); + return NetworkStatusOpenPassword(); case WV_EDITOR_BOTTOM_TOOLBAR: - return WindowEditorBottomToolbarOpen(); + return EditorBottomToolbarOpen(); case WV_CHANGELOG: - return WindowChangelogOpen(WV_CHANGELOG); + return ChangelogOpen(WV_CHANGELOG); case WV_NEW_VERSION_INFO: - return WindowChangelogOpen(WV_NEW_VERSION_INFO); + return ChangelogOpen(WV_NEW_VERSION_INFO); case WV_CONTRIBUTORS: - return WindowChangelogOpen(WV_CONTRIBUTORS); + return ChangelogOpen(WV_CONTRIBUTORS); case WV_FINANCE_MARKETING: - return WindowFinancesMarketingOpen(); + return FinancesMarketingOpen(); default: return nullptr; } @@ -189,19 +189,19 @@ public: switch (type) { case WD_BANNER: - return WindowBannerOpen(id); + return BannerOpen(id); case WD_NEW_CAMPAIGN: - return WindowNewCampaignOpen(id); + return NewCampaignOpen(id); case WD_DEMOLISH_RIDE: - return WindowRideDemolishPromptOpen(*GetRide(RideId::FromUnderlying(id))); + return RideDemolishPromptOpen(*GetRide(RideId::FromUnderlying(id))); case WD_REFURBISH_RIDE: - return WindowRideRefurbishPromptOpen(*GetRide(RideId::FromUnderlying(id))); + return RideRefurbishPromptOpen(*GetRide(RideId::FromUnderlying(id))); case WD_SIGN: - return WindowSignOpen(id); + return SignOpen(id); case WD_SIGN_SMALL: - return WindowSignSmallOpen(id); + return SignSmallOpen(id); case WD_PLAYER: - return WindowPlayerOpen(id); + return PlayerOpen(id); default: return nullptr; @@ -210,12 +210,12 @@ public: WindowBase* ShowError(StringId title, StringId message, const Formatter& args) override { - return WindowErrorOpen(title, message, args); + return ErrorOpen(title, message, args); } WindowBase* ShowError(std::string_view title, std::string_view message) override { - return WindowErrorOpen(title, message); + return ErrorOpen(title, message); } WindowBase* OpenIntent(Intent* intent) override @@ -223,13 +223,13 @@ public: switch (intent->GetWindowClass()) { case WindowClass::Peep: - return WindowGuestOpen(static_cast(intent->GetPointerExtra(INTENT_EXTRA_PEEP))); + return GuestOpen(static_cast(intent->GetPointerExtra(INTENT_EXTRA_PEEP))); case WindowClass::FirePrompt: - return WindowStaffFirePromptOpen(static_cast(intent->GetPointerExtra(INTENT_EXTRA_PEEP))); + return StaffFirePromptOpen(static_cast(intent->GetPointerExtra(INTENT_EXTRA_PEEP))); case WindowClass::InstallTrack: - return WindowInstallTrackOpen(intent->GetStringExtra(INTENT_EXTRA_PATH).c_str()); + return InstallTrackOpen(intent->GetStringExtra(INTENT_EXTRA_PATH).c_str()); case WindowClass::GuestList: - return WindowGuestListOpenWithFilter( + return GuestListOpenWithFilter( static_cast(intent->GetSIntExtra(INTENT_EXTRA_GUEST_LIST_FILTER)), intent->GetSIntExtra(INTENT_EXTRA_RIDE_ID)); case WindowClass::Loadsave: @@ -239,7 +239,7 @@ public: loadsave_callback callback = reinterpret_cast( intent->GetPointerExtra(INTENT_EXTRA_CALLBACK)); TrackDesign* trackDesign = static_cast(intent->GetPointerExtra(INTENT_EXTRA_TRACK_DESIGN)); - auto* w = WindowLoadsaveOpen( + auto* w = LoadsaveOpen( type, defaultName, [callback](int32_t result, std::string_view path) { if (callback != nullptr) @@ -251,20 +251,19 @@ public: return w; } case WindowClass::ManageTrackDesign: - return WindowTrackManageOpen( - static_cast(intent->GetPointerExtra(INTENT_EXTRA_TRACK_DESIGN))); + return TrackManageOpen(static_cast(intent->GetPointerExtra(INTENT_EXTRA_TRACK_DESIGN))); case WindowClass::NetworkStatus: { std::string message = intent->GetStringExtra(INTENT_EXTRA_MESSAGE); close_callback callback = intent->GetCloseCallbackExtra(INTENT_EXTRA_CALLBACK); - return WindowNetworkStatusOpen(message, callback); + return NetworkStatusOpen(message, callback); } case WindowClass::ObjectLoadError: { std::string path = intent->GetStringExtra(INTENT_EXTRA_PATH); auto objects = static_cast(intent->GetPointerExtra(INTENT_EXTRA_LIST)); size_t count = intent->GetUIntExtra(INTENT_EXTRA_LIST_COUNT); - WindowObjectLoadErrorOpen(const_cast(path.c_str()), count, objects); + ObjectLoadErrorOpen(const_cast(path.c_str()), count, objects); return nullptr; } @@ -272,20 +271,19 @@ public: { const auto rideId = RideId::FromUnderlying(intent->GetSIntExtra(INTENT_EXTRA_RIDE_ID)); auto ride = GetRide(rideId); - return ride == nullptr ? nullptr : WindowRideMainOpen(*ride); + return ride == nullptr ? nullptr : RideMainOpen(*ride); } case WindowClass::TrackDesignPlace: - return WindowTrackPlaceOpen( - static_cast(intent->GetPointerExtra(INTENT_EXTRA_TRACK_DESIGN))); + return TrackPlaceOpen(static_cast(intent->GetPointerExtra(INTENT_EXTRA_TRACK_DESIGN))); case WindowClass::TrackDesignList: { RideSelection rideItem; rideItem.Type = intent->GetUIntExtra(INTENT_EXTRA_RIDE_TYPE); rideItem.EntryIndex = intent->GetUIntExtra(INTENT_EXTRA_RIDE_ENTRY_INDEX); - return WindowTrackListOpen(rideItem); + return TrackListOpen(rideItem); } case WindowClass::ScenarioSelect: - return WindowScenarioselectOpen( + return ScenarioselectOpen( reinterpret_cast(intent->GetPointerExtra(INTENT_EXTRA_CALLBACK))); case WindowClass::Null: @@ -302,7 +300,7 @@ public: case INTENT_ACTION_NEW_RIDE_OF_TYPE: { // Open ride list window - auto w = WindowNewRideOpen(); + auto w = NewRideOpen(); // Switch to right tab and scroll to ride location RideSelection rideItem; @@ -325,7 +323,7 @@ public: if (!ToolSet(*tlbrWindow, WC_TOP_TOOLBAR__WIDX_SCENERY, Tool::Arrow)) { InputSetFlag(INPUT_FLAG_6, true); - window = WindowSceneryOpen(); + window = SceneryOpen(); } } } @@ -347,9 +345,9 @@ public: switch (intent->GetWindowDetail()) { case WD_VEHICLE: - return WindowRideOpenVehicle(static_cast(intent->GetPointerExtra(INTENT_EXTRA_VEHICLE))); + return RideOpenVehicle(static_cast(intent->GetPointerExtra(INTENT_EXTRA_VEHICLE))); case WD_TRACK: - return WindowRideOpenTrack(static_cast(intent->GetPointerExtra(INTENT_EXTRA_TILE_ELEMENT))); + return RideOpenTrack(static_cast(intent->GetPointerExtra(INTENT_EXTRA_TILE_ELEMENT))); case WD_NULL: // Intent does not hold an window detail diff --git a/src/openrct2-ui/input/Shortcuts.cpp b/src/openrct2-ui/input/Shortcuts.cpp index 1f457247e7..d589537f58 100644 --- a/src/openrct2-ui/input/Shortcuts.cpp +++ b/src/openrct2-ui/input/Shortcuts.cpp @@ -390,7 +390,7 @@ static void ShortcutOpenCheatWindow() static void ShortcutOpenKeyboardShortcutsWindow() { - WindowShortcutKeysOpen(); + ShortcutKeysOpen(); } static void ShortcutOpenTransparencyWindow() diff --git a/src/openrct2-ui/scripting/ScUi.hpp b/src/openrct2-ui/scripting/ScUi.hpp index 05c4b508f6..f77003dfab 100644 --- a/src/openrct2-ui/scripting/ScUi.hpp +++ b/src/openrct2-ui/scripting/ScUi.hpp @@ -231,7 +231,7 @@ namespace OpenRCT2::Scripting void showError(const std::string& title, const std::string& message) { - WindowErrorOpen(title, message); + ErrorOpen(title, message); } void showTextInput(const DukValue& desc) @@ -282,7 +282,7 @@ namespace OpenRCT2::Scripting else throw DukException(); - WindowLoadsaveOpen( + LoadsaveOpen( loadSaveType, defaultPath, [this, plugin, callback](int32_t result, std::string_view path) { if (result == MODAL_RESULT_OK) @@ -304,7 +304,7 @@ namespace OpenRCT2::Scripting auto plugin = _scriptEngine.GetExecInfo().GetCurrentPlugin(); auto callback = desc["callback"]; - WindowScenarioselectOpen([this, plugin, callback](std::string_view path) { + ScenarioselectOpen([this, plugin, callback](std::string_view path) { auto dukValue = GetScenarioFile(path); _scriptEngine.ExecutePluginCall(plugin, callback, { dukValue }, false); }); diff --git a/src/openrct2-ui/windows/About.cpp b/src/openrct2-ui/windows/About.cpp index d5b358aaa2..aa6f6ec439 100644 --- a/src/openrct2-ui/windows/About.cpp +++ b/src/openrct2-ui/windows/About.cpp @@ -282,7 +282,7 @@ static Widget *_windowAboutPageWidgets[] = { * * rct2: 0x0066D2AC */ - WindowBase* WindowAboutOpen() + WindowBase* AboutOpen() { return WindowFocusOrCreate(WindowClass::About, WW, WH, WF_CENTRE_SCREEN); } diff --git a/src/openrct2-ui/windows/AssetPacks.cpp b/src/openrct2-ui/windows/AssetPacks.cpp index 812c87c31c..2c425e8172 100644 --- a/src/openrct2-ui/windows/AssetPacks.cpp +++ b/src/openrct2-ui/windows/AssetPacks.cpp @@ -339,7 +339,7 @@ static Widget WindowAssetPacksWidgets[] = { } }; - WindowBase* WindowAssetPacksOpen() + WindowBase* AssetPacksOpen() { auto flags = WF_AUTO_POSITION | WF_CENTRE_SCREEN; return WindowFocusOrCreate(WindowClass::AssetPacks, WW, WH, flags); diff --git a/src/openrct2-ui/windows/Banner.cpp b/src/openrct2-ui/windows/Banner.cpp index 948d39b76f..c454f7c4d6 100644 --- a/src/openrct2-ui/windows/Banner.cpp +++ b/src/openrct2-ui/windows/Banner.cpp @@ -308,7 +308,7 @@ static Widget window_banner_widgets[] = { * * rct2: 0x006BA305 */ - WindowBase* WindowBannerOpen(rct_windownumber number) + WindowBase* BannerOpen(rct_windownumber number) { auto w = static_cast(WindowBringToFrontByNumber(WindowClass::Banner, number)); diff --git a/src/openrct2-ui/windows/Changelog.cpp b/src/openrct2-ui/windows/Changelog.cpp index 79dbd31113..4c227c27bc 100644 --- a/src/openrct2-ui/windows/Changelog.cpp +++ b/src/openrct2-ui/windows/Changelog.cpp @@ -319,7 +319,7 @@ static Widget _windowChangelogWidgets[] = { } }; - WindowBase* WindowChangelogOpen(int personality) + WindowBase* ChangelogOpen(int personality) { auto* window = WindowBringToFrontByClass(WindowClass::Changelog); if (window == nullptr) diff --git a/src/openrct2-ui/windows/Cheats.cpp b/src/openrct2-ui/windows/Cheats.cpp index 80d4c536bf..3291f90931 100644 --- a/src/openrct2-ui/windows/Cheats.cpp +++ b/src/openrct2-ui/windows/Cheats.cpp @@ -1149,7 +1149,7 @@ static StringId window_cheats_page_titles[] = { } }; - WindowBase* WindowCheatsOpen() + WindowBase* CheatsOpen() { auto* window = WindowBringToFrontByClass(WindowClass::Cheats); if (window == nullptr) diff --git a/src/openrct2-ui/windows/ClearScenery.cpp b/src/openrct2-ui/windows/ClearScenery.cpp index 9909bda483..7efe3ae5a7 100644 --- a/src/openrct2-ui/windows/ClearScenery.cpp +++ b/src/openrct2-ui/windows/ClearScenery.cpp @@ -208,7 +208,7 @@ namespace OpenRCT2::Ui::Windows } }; - WindowBase* WindowClearSceneryOpen() + WindowBase* ClearSceneryOpen() { auto* w = static_cast(WindowBringToFrontByClass(WindowClass::ClearScenery)); diff --git a/src/openrct2-ui/windows/CustomCurrency.cpp b/src/openrct2-ui/windows/CustomCurrency.cpp index 6f58f25074..25960fc494 100644 --- a/src/openrct2-ui/windows/CustomCurrency.cpp +++ b/src/openrct2-ui/windows/CustomCurrency.cpp @@ -228,7 +228,7 @@ static Widget window_custom_currency_widgets[] = { } }; - WindowBase* CustomCurrencyWindowOpen() + WindowBase* CustomCurrencyOpen() { return WindowFocusOrCreate(WindowClass::CustomCurrencyConfig, WW, WH, WF_CENTRE_SCREEN); } diff --git a/src/openrct2-ui/windows/DebugPaint.cpp b/src/openrct2-ui/windows/DebugPaint.cpp index 383df00ee1..42627d6003 100644 --- a/src/openrct2-ui/windows/DebugPaint.cpp +++ b/src/openrct2-ui/windows/DebugPaint.cpp @@ -146,7 +146,7 @@ static Widget window_debug_paint_widgets[] = { } }; - WindowBase* WindowDebugPaintOpen() + WindowBase* DebugPaintOpen() { auto* window = WindowFocusOrCreate( WindowClass::DebugPaint, { 16, ContextGetHeight() - 16 - 33 - WINDOW_HEIGHT }, WINDOW_WIDTH, WINDOW_HEIGHT, diff --git a/src/openrct2-ui/windows/DemolishRidePrompt.cpp b/src/openrct2-ui/windows/DemolishRidePrompt.cpp index 8d8dc2d0d1..e9ab8914f4 100644 --- a/src/openrct2-ui/windows/DemolishRidePrompt.cpp +++ b/src/openrct2-ui/windows/DemolishRidePrompt.cpp @@ -101,7 +101,7 @@ static Widget window_ride_demolish_widgets[] = } }; - WindowBase* WindowRideDemolishPromptOpen(const Ride& ride) + WindowBase* RideDemolishPromptOpen(const Ride& ride) { WindowBase* w; DemolishRidePromptWindow* newWindow; diff --git a/src/openrct2-ui/windows/EditorBottomToolbar.cpp b/src/openrct2-ui/windows/EditorBottomToolbar.cpp index 238ed308e8..4e8308eddb 100644 --- a/src/openrct2-ui/windows/EditorBottomToolbar.cpp +++ b/src/openrct2-ui/windows/EditorBottomToolbar.cpp @@ -399,7 +399,7 @@ static Widget _editorBottomToolbarWidgets[] = { * Creates the main editor top toolbar window. * rct2: 0x0066F052 (part of 0x0066EF38) */ - WindowBase* WindowEditorBottomToolbarOpen() + WindowBase* EditorBottomToolbarOpen() { auto* window = WindowCreate( WindowClass::BottomToolbar, ScreenCoordsXY(0, ContextGetHeight() - 32), ContextGetWidth(), 32, diff --git a/src/openrct2-ui/windows/EditorInventionsList.cpp b/src/openrct2-ui/windows/EditorInventionsList.cpp index a64b1035ff..bc81650b1b 100644 --- a/src/openrct2-ui/windows/EditorInventionsList.cpp +++ b/src/openrct2-ui/windows/EditorInventionsList.cpp @@ -588,7 +588,7 @@ static Widget _inventionListDragWidgets[] = { * * rct2: 0x00684E04 */ - WindowBase* WindowEditorInventionsListOpen() + WindowBase* EditorInventionsListOpen() { return WindowFocusOrCreate( WindowClass::EditorInventionList, WW, WH, WF_NO_SCROLLING | WF_RESIZABLE | WF_CENTRE_SCREEN); diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp index d0c5eef8f0..d460443d17 100644 --- a/src/openrct2-ui/windows/EditorObjectSelection.cpp +++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp @@ -1568,7 +1568,7 @@ static std::vector _window_editor_object_selection_widgets = { * * rct2: 0x006AA64E */ - WindowBase* WindowEditorObjectSelectionOpen() + WindowBase* EditorObjectSelectionOpen() { return WindowFocusOrCreate( WindowClass::EditorObjectSelection, 755, 400, WF_10 | WF_RESIZABLE | WF_CENTRE_SCREEN); diff --git a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp index c71eaced17..3cea51f898 100644 --- a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp +++ b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp @@ -1193,7 +1193,7 @@ static uint64_t window_editor_objective_options_page_hold_down_widgets[] = { * * rct2: 0x0067137D */ - WindowBase* WindowEditorObjectiveOptionsOpen() + WindowBase* EditorObjectiveOptionsOpen() { auto window = WindowBringToFrontByClass(WindowClass::EditorObjectiveOptions); if (window != nullptr) diff --git a/src/openrct2-ui/windows/EditorScenarioOptions.cpp b/src/openrct2-ui/windows/EditorScenarioOptions.cpp index dc4101f236..bd98594969 100644 --- a/src/openrct2-ui/windows/EditorScenarioOptions.cpp +++ b/src/openrct2-ui/windows/EditorScenarioOptions.cpp @@ -1282,7 +1282,7 @@ static uint32_t window_editor_scenario_options_page_hold_down_widgets[] = { #pragma endregion }; - WindowBase* WindowEditorScenarioOptionsOpen() + WindowBase* EditorScenarioOptionsOpen() { return WindowFocusOrCreate(WindowClass::EditorScenarioOptions, 280, 148, WF_NO_SCROLLING); } diff --git a/src/openrct2-ui/windows/Error.cpp b/src/openrct2-ui/windows/Error.cpp index 1ba83e1758..192492711f 100644 --- a/src/openrct2-ui/windows/Error.cpp +++ b/src/openrct2-ui/windows/Error.cpp @@ -111,7 +111,7 @@ static Widget window_error_widgets[] = { } }; - WindowBase* WindowErrorOpen(std::string_view title, std::string_view message) + WindowBase* ErrorOpen(std::string_view title, std::string_view message) { std::string buffer = "{BLACK}"; buffer.append(title); @@ -166,10 +166,10 @@ static Widget window_error_widgets[] = { WF_STICK_TO_FRONT | WF_TRANSPARENT | WF_RESIZABLE); } - WindowBase* WindowErrorOpen(StringId title, StringId message, const Formatter& args) + WindowBase* ErrorOpen(StringId title, StringId message, const Formatter& args) { auto titlez = FormatStringIDLegacy(title, args.Data()); auto messagez = FormatStringIDLegacy(message, args.Data()); - return WindowErrorOpen(titlez, messagez); + return ErrorOpen(titlez, messagez); } } // namespace OpenRCT2::Ui::Windows diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp index 5a192397cb..f1fa47c280 100644 --- a/src/openrct2-ui/windows/Finances.cpp +++ b/src/openrct2-ui/windows/Finances.cpp @@ -968,17 +968,17 @@ static Widget _windowFinancesResearchWidgets[] = return window; } - WindowBase* WindowFinancesOpen() + WindowBase* FinancesOpen() { return WindowFocusOrCreate(WindowClass::Finances, WW_OTHER_TABS, WH_SUMMARY, WF_10); } - WindowBase* WindowFinancesResearchOpen() + WindowBase* FinancesResearchOpen() { return FinancesWindowOpen(WINDOW_FINANCES_PAGE_RESEARCH); } - WindowBase* WindowFinancesMarketingOpen() + WindowBase* FinancesMarketingOpen() { return FinancesWindowOpen(WINDOW_FINANCES_PAGE_MARKETING); } diff --git a/src/openrct2-ui/windows/Footpath.cpp b/src/openrct2-ui/windows/Footpath.cpp index 1f744ea857..627e41c1cd 100644 --- a/src/openrct2-ui/windows/Footpath.cpp +++ b/src/openrct2-ui/windows/Footpath.cpp @@ -1426,7 +1426,7 @@ static constexpr uint8_t ConstructionPreviewImages[][4] = { * * rct2: 0x006A7C43 */ - WindowBase* WindowFootpathOpen() + WindowBase* FootpathOpen() { if (!FootpathSelectDefault()) { diff --git a/src/openrct2-ui/windows/GameBottomToolbar.cpp b/src/openrct2-ui/windows/GameBottomToolbar.cpp index e78c49cfe3..ee2e5461d1 100644 --- a/src/openrct2-ui/windows/GameBottomToolbar.cpp +++ b/src/openrct2-ui/windows/GameBottomToolbar.cpp @@ -672,7 +672,7 @@ static Widget window_game_bottom_toolbar_widgets[] = /** * Creates the main game bottom toolbar window. */ - WindowBase* WindowGameBottomToolbarOpen() + WindowBase* GameBottomToolbarOpen() { int32_t screenWidth = ContextGetWidth(); int32_t screenHeight = ContextGetHeight(); diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index 8f2aaac172..fadc34476a 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -1906,7 +1906,7 @@ static_assert(_guestWindowPageWidgets.size() == WINDOW_GUEST_PAGE_COUNT); * rct2: 0x006989E9 * */ - WindowBase* WindowGuestOpen(Peep* peep) + WindowBase* GuestOpen(Peep* peep) { if (peep == nullptr) { @@ -1914,7 +1914,7 @@ static_assert(_guestWindowPageWidgets.size() == WINDOW_GUEST_PAGE_COUNT); } if (peep->Is()) { - return WindowStaffOpen(peep); + return StaffOpen(peep); } auto* window = static_cast(WindowBringToFrontByNumber(WindowClass::Peep, peep->Id.ToUnderlying())); diff --git a/src/openrct2-ui/windows/GuestList.cpp b/src/openrct2-ui/windows/GuestList.cpp index 6ab7db86c1..423f0161c1 100644 --- a/src/openrct2-ui/windows/GuestList.cpp +++ b/src/openrct2-ui/windows/GuestList.cpp @@ -565,7 +565,7 @@ static Widget window_guest_list_widgets[] = { auto guest = GetEntity(guestItem.Id); if (guest != nullptr) { - WindowGuestOpen(guest); + GuestOpen(guest); } break; } @@ -965,7 +965,7 @@ static Widget window_guest_list_widgets[] = { } }; - WindowBase* WindowGuestListOpen() + WindowBase* GuestListOpen() { auto* window = WindowBringToFrontByClass(WindowClass::GuestList); if (window == nullptr) @@ -978,9 +978,9 @@ static Widget window_guest_list_widgets[] = { /** * @param index The number of the ride or index of the thought */ - WindowBase* WindowGuestListOpenWithFilter(GuestListFilterType type, int32_t index) + WindowBase* GuestListOpenWithFilter(GuestListFilterType type, int32_t index) { - auto* w = static_cast(WindowGuestListOpen()); + auto* w = static_cast(GuestListOpen()); if (w != nullptr) { w->SetFilter(type, index); diff --git a/src/openrct2-ui/windows/InstallTrack.cpp b/src/openrct2-ui/windows/InstallTrack.cpp index 3ee93e8253..0ea2d19d33 100644 --- a/src/openrct2-ui/windows/InstallTrack.cpp +++ b/src/openrct2-ui/windows/InstallTrack.cpp @@ -406,7 +406,7 @@ static Widget window_install_track_widgets[] = { } }; - WindowBase* WindowInstallTrackOpen(const utf8* path) + WindowBase* InstallTrackOpen(const utf8* path) { auto trackDesign = TrackDesignImport(path); if (trackDesign == nullptr) diff --git a/src/openrct2-ui/windows/Land.cpp b/src/openrct2-ui/windows/Land.cpp index f3c8cc3098..d019d2c3df 100644 --- a/src/openrct2-ui/windows/Land.cpp +++ b/src/openrct2-ui/windows/Land.cpp @@ -348,7 +348,7 @@ static Widget window_land_widgets[] = { } }; - WindowBase* WindowLandOpen() + WindowBase* LandOpen() { return WindowFocusOrCreate(WindowClass::Land, ScreenCoordsXY(ContextGetWidth() - WW, 29), WW, WH, 0); } diff --git a/src/openrct2-ui/windows/LandRights.cpp b/src/openrct2-ui/windows/LandRights.cpp index a0415bb3ab..9bdc0fb49e 100644 --- a/src/openrct2-ui/windows/LandRights.cpp +++ b/src/openrct2-ui/windows/LandRights.cpp @@ -410,7 +410,7 @@ static Widget window_land_rights_widgets[] = { } }; - WindowBase* WindowLandRightsOpen() + WindowBase* LandRightsOpen() { return WindowFocusOrCreate( WindowClass::LandRights, ScreenCoordsXY(ContextGetWidth() - WW, 29), WW, WH, 0); diff --git a/src/openrct2-ui/windows/LoadSave.cpp b/src/openrct2-ui/windows/LoadSave.cpp index ca1f80dc80..81bb0eadef 100644 --- a/src/openrct2-ui/windows/LoadSave.cpp +++ b/src/openrct2-ui/windows/LoadSave.cpp @@ -1014,7 +1014,7 @@ static Widget window_loadsave_widgets[] = #pragma endregion }; - WindowBase* WindowLoadsaveOpen( + WindowBase* LoadsaveOpen( int32_t type, std::string_view defaultPath, std::function callback, TrackDesign* trackDesign) { diff --git a/src/openrct2-ui/windows/Main.cpp b/src/openrct2-ui/windows/Main.cpp index 29fd68f364..ad1a749eee 100644 --- a/src/openrct2-ui/windows/Main.cpp +++ b/src/openrct2-ui/windows/Main.cpp @@ -73,7 +73,7 @@ static Widget _mainWidgets[] = { * Creates the main window that holds the main viewport. * rct2: 0x0066B3E8 */ - WindowBase* WindowMainOpen() + WindowBase* MainOpen() { return WindowCreate( WindowClass::MainWindow, { 0, 0 }, ContextGetWidth(), ContextGetHeight(), WF_STICK_TO_BACK); diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index b6aa56a318..554c4a8e4e 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -1495,7 +1495,7 @@ static constexpr ScreenCoordsXY MiniMapOffsets[] = { } }; - WindowBase* WindowMapOpen() + WindowBase* MapOpen() { try { diff --git a/src/openrct2-ui/windows/MapGen.cpp b/src/openrct2-ui/windows/MapGen.cpp index d421df45d1..89e7943a85 100644 --- a/src/openrct2-ui/windows/MapGen.cpp +++ b/src/openrct2-ui/windows/MapGen.cpp @@ -1390,14 +1390,14 @@ static uint64_t PressedWidgets[WINDOW_MAPGEN_PAGE_COUNT] = { } }; - WindowBase* WindowMapgenOpen() + WindowBase* MapgenOpen() { return WindowFocusOrCreate(WindowClass::Mapgen, WW, WH, WF_10 | WF_AUTO_POSITION | WF_CENTRE_SCREEN); } static void HeightmapLoadsaveCallback(int32_t result, const utf8* path) { - auto* w = static_cast(WindowMapgenOpen()); + auto* w = static_cast(MapgenOpen()); w->AfterLoadingHeightMap(result, path); } } // namespace OpenRCT2::Ui::Windows diff --git a/src/openrct2-ui/windows/MazeConstruction.cpp b/src/openrct2-ui/windows/MazeConstruction.cpp index 34cde8c77c..8e230d3d74 100644 --- a/src/openrct2-ui/windows/MazeConstruction.cpp +++ b/src/openrct2-ui/windows/MazeConstruction.cpp @@ -429,7 +429,7 @@ static Widget window_maze_construction_widgets[] = { } }; - WindowBase* WindowMazeConstructionOpen() + WindowBase* MazeConstructionOpen() { return WindowFocusOrCreate( WindowClass::RideConstruction, ScreenCoordsXY(0, 29), WW, WH, WF_NO_AUTO_CLOSE); diff --git a/src/openrct2-ui/windows/Multiplayer.cpp b/src/openrct2-ui/windows/Multiplayer.cpp index 08eccaece4..6978e8fc9f 100644 --- a/src/openrct2-ui/windows/Multiplayer.cpp +++ b/src/openrct2-ui/windows/Multiplayer.cpp @@ -183,7 +183,7 @@ static constexpr StringId WindowMultiplayerPageTitles[] = { void OnScrollDraw(int32_t scrollIndex, DrawPixelInfo& dpi) override; }; - WindowBase* WindowMultiplayerOpen() + WindowBase* MultiplayerOpen() { // Check if window is already open WindowBase* window = WindowBringToFrontByClass(WindowClass::Multiplayer); @@ -620,7 +620,7 @@ static constexpr StringId WindowMultiplayerPageTitles[] = { Invalidate(); int32_t player = (IsServerPlayerInvisible() ? index + 1 : index); - WindowPlayerOpen(NetworkGetPlayerID(player)); + PlayerOpen(NetworkGetPlayerID(player)); break; } diff --git a/src/openrct2-ui/windows/NetworkStatus.cpp b/src/openrct2-ui/windows/NetworkStatus.cpp index 6dafc0c5ad..248371af3c 100644 --- a/src/openrct2-ui/windows/NetworkStatus.cpp +++ b/src/openrct2-ui/windows/NetworkStatus.cpp @@ -130,7 +130,7 @@ static Widget window_network_status_widgets[] = { std::string _password; }; - WindowBase* WindowNetworkStatusOpen(const std::string& text, close_callback onClose) + WindowBase* NetworkStatusOpen(const std::string& text, close_callback onClose) { auto window = WindowFocusOrCreate( WindowClass::NetworkStatus, 420, 90, WF_10 | WF_TRANSPARENT | WF_CENTRE_SCREEN); @@ -152,7 +152,7 @@ static Widget window_network_status_widgets[] = { networkWindow->Close(); } - WindowBase* WindowNetworkStatusOpenPassword() + WindowBase* NetworkStatusOpenPassword() { auto window = WindowFocusOrCreate( WindowClass::NetworkStatus, 420, 90, WF_10 | WF_TRANSPARENT | WF_CENTRE_SCREEN); diff --git a/src/openrct2-ui/windows/NewCampaign.cpp b/src/openrct2-ui/windows/NewCampaign.cpp index 218c7cd41f..7fe8428455 100644 --- a/src/openrct2-ui/windows/NewCampaign.cpp +++ b/src/openrct2-ui/windows/NewCampaign.cpp @@ -392,7 +392,7 @@ static Widget window_new_campaign_widgets[] = { } }; - WindowBase* WindowNewCampaignOpen(int16_t campaignType) + WindowBase* NewCampaignOpen(int16_t campaignType) { auto w = static_cast(WindowBringToFrontByClass(WindowClass::NewCampaign)); if (w != nullptr) diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index 805f254de6..a3422995f2 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -1041,7 +1041,7 @@ static Widget window_new_ride_widgets[] = { * * rct2: 0x006B3CFF */ - WindowBase* WindowNewRideOpen() + WindowBase* NewRideOpen() { WindowBase* window; @@ -1058,9 +1058,9 @@ static Widget window_new_ride_widgets[] = { return window; } - WindowBase* WindowNewRideOpenResearch() + WindowBase* NewRideOpenResearch() { - auto w = static_cast(WindowNewRideOpen()); + auto w = static_cast(NewRideOpen()); w->SetPage(RESEARCH_TAB); return w; } diff --git a/src/openrct2-ui/windows/News.cpp b/src/openrct2-ui/windows/News.cpp index c23bbf25d3..de5368749a 100644 --- a/src/openrct2-ui/windows/News.cpp +++ b/src/openrct2-ui/windows/News.cpp @@ -317,7 +317,7 @@ static Widget window_news_widgets[] = { } }; - WindowBase* WindowNewsOpen() + WindowBase* NewsOpen() { return WindowFocusOrCreate(WindowClass::RecentNews, WW, WH, 0); } diff --git a/src/openrct2-ui/windows/NewsOptions.cpp b/src/openrct2-ui/windows/NewsOptions.cpp index 69c387405a..90613b6cd6 100644 --- a/src/openrct2-ui/windows/NewsOptions.cpp +++ b/src/openrct2-ui/windows/NewsOptions.cpp @@ -278,7 +278,7 @@ static Widget WindowNewsOptionsWidgets[] = { }; }; - WindowBase* WindowNewsOptionsOpen() + WindowBase* NewsOptionsOpen() { return WindowFocusOrCreate(WindowClass::NotificationOptions, WW, WH, WF_CENTRE_SCREEN); } diff --git a/src/openrct2-ui/windows/ObjectLoadError.cpp b/src/openrct2-ui/windows/ObjectLoadError.cpp index c5100c7277..ad141cf333 100644 --- a/src/openrct2-ui/windows/ObjectLoadError.cpp +++ b/src/openrct2-ui/windows/ObjectLoadError.cpp @@ -570,7 +570,7 @@ static Widget window_object_load_error_widgets[] = { } }; - WindowBase* WindowObjectLoadErrorOpen(utf8* path, size_t numMissingObjects, const ObjectEntryDescriptor* missingObjects) + WindowBase* ObjectLoadErrorOpen(utf8* path, size_t numMissingObjects, const ObjectEntryDescriptor* missingObjects) { // Check if window is already open auto* window = WindowBringToFrontByClass(WindowClass::ObjectLoadError); diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp index 5cea541b8e..325f915ff5 100644 --- a/src/openrct2-ui/windows/Options.cpp +++ b/src/openrct2-ui/windows/Options.cpp @@ -2201,7 +2201,7 @@ static Widget *window_options_page_widgets[] = { * * rct2: 0x006BAC5B */ - WindowBase* WindowOptionsOpen() + WindowBase* OptionsOpen() { return WindowFocusOrCreate(WindowClass::Options, WW, WH, WF_CENTRE_SCREEN); } diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp index 28392fbac8..17d79524db 100644 --- a/src/openrct2-ui/windows/Park.cpp +++ b/src/openrct2-ui/windows/Park.cpp @@ -1331,7 +1331,7 @@ static constexpr WindowParkAward _parkAwards[] = { * * rct2: 0x00667C48 */ - WindowBase* WindowParkEntranceOpen() + WindowBase* ParkEntranceOpen() { return ParkWindowOpen(WINDOW_PARK_PAGE_ENTRANCE); } @@ -1340,7 +1340,7 @@ static constexpr WindowParkAward _parkAwards[] = { * * rct2: 0x00667CA4 */ - WindowBase* WindowParkRatingOpen() + WindowBase* ParkRatingOpen() { return ParkWindowOpen(WINDOW_PARK_PAGE_RATING); } @@ -1349,7 +1349,7 @@ static constexpr WindowParkAward _parkAwards[] = { * * rct2: 0x00667D35 */ - WindowBase* WindowParkGuestsOpen() + WindowBase* ParkGuestsOpen() { return ParkWindowOpen(WINDOW_PARK_PAGE_GUESTS); } @@ -1358,7 +1358,7 @@ static constexpr WindowParkAward _parkAwards[] = { * * rct2: 0x00667E57 */ - WindowBase* WindowParkObjectiveOpen() + WindowBase* ParkObjectiveOpen() { auto* wnd = ParkWindowOpen(WINDOW_PARK_PAGE_OBJECTIVE); if (wnd != nullptr) @@ -1375,7 +1375,7 @@ static constexpr WindowParkAward _parkAwards[] = { * * rct2: 0x00667DC6 */ - WindowBase* WindowParkAwardsOpen() + WindowBase* ParkAwardsOpen() { return ParkWindowOpen(WINDOW_PARK_PAGE_AWARDS); } diff --git a/src/openrct2-ui/windows/PatrolArea.cpp b/src/openrct2-ui/windows/PatrolArea.cpp index 388d74f4c4..4b6d01b0ce 100644 --- a/src/openrct2-ui/windows/PatrolArea.cpp +++ b/src/openrct2-ui/windows/PatrolArea.cpp @@ -293,7 +293,7 @@ static Widget PatrolAreaWidgets[] = { } }; - WindowBase* WindowPatrolAreaOpen(EntityId staffId) + WindowBase* PatrolAreaOpen(EntityId staffId) { auto w = WindowFocusOrCreate( WindowClass::PatrolArea, ScreenCoordsXY(ContextGetWidth() - WW, 29), WW, WH, 0); diff --git a/src/openrct2-ui/windows/Player.cpp b/src/openrct2-ui/windows/Player.cpp index 3a76fc9eac..14d722d22b 100644 --- a/src/openrct2-ui/windows/Player.cpp +++ b/src/openrct2-ui/windows/Player.cpp @@ -640,7 +640,7 @@ static Widget *window_player_page_widgets[] = { #pragma endregion }; - WindowBase* WindowPlayerOpen(uint8_t id) + WindowBase* PlayerOpen(uint8_t id) { auto* window = static_cast(WindowBringToFrontByNumber(WindowClass::Player, id)); if (window == nullptr) diff --git a/src/openrct2-ui/windows/RefurbishRidePrompt.cpp b/src/openrct2-ui/windows/RefurbishRidePrompt.cpp index a25a3edb70..1afb893d01 100644 --- a/src/openrct2-ui/windows/RefurbishRidePrompt.cpp +++ b/src/openrct2-ui/windows/RefurbishRidePrompt.cpp @@ -100,7 +100,7 @@ static Widget window_ride_refurbish_widgets[] = } }; - WindowBase* WindowRideRefurbishPromptOpen(const Ride& ride) + WindowBase* RideRefurbishPromptOpen(const Ride& ride) { WindowBase* w; RefurbishRidePromptWindow* newWindow; diff --git a/src/openrct2-ui/windows/Research.cpp b/src/openrct2-ui/windows/Research.cpp index 02a254bb8d..73a0e23a68 100644 --- a/src/openrct2-ui/windows/Research.cpp +++ b/src/openrct2-ui/windows/Research.cpp @@ -311,7 +311,7 @@ static Widget *window_research_page_widgets[] = { } }; - WindowBase* WindowResearchOpen() + WindowBase* ResearchOpen() { ResearchWindow* window = WindowFocusOrCreate(WindowClass::Research, WW_FUNDING, WH_FUNDING, WF_10); window->SetPage(WINDOW_RESEARCH_PAGE_DEVELOPMENT); diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index a7c4a112f7..b5b1b73b64 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -6667,7 +6667,7 @@ static_assert(std::size(RatingNames) == 6); * * rct2: 0x006ACC28 */ - WindowBase* WindowRideMainOpen(const Ride& ride) + WindowBase* RideMainOpen(const Ride& ride) { if (ride.type >= RIDE_TYPE_COUNT) { @@ -6712,7 +6712,7 @@ static_assert(std::size(RatingNames) == 6); return nullptr; if (ride.GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_NO_VEHICLES)) - return WindowRideMainOpen(ride); + return RideMainOpen(ride); auto* w = static_cast(WindowBringToFrontByNumber(WindowClass::Ride, ride.id.ToUnderlying())); if (w == nullptr) @@ -6740,7 +6740,7 @@ static_assert(std::size(RatingNames) == 6); return w; } - WindowBase* WindowRideOpenTrack(TileElement* tileElement) + WindowBase* RideOpenTrack(TileElement* tileElement) { assert(tileElement != nullptr); auto rideIndex = tileElement->GetRideIndex(); @@ -6771,7 +6771,7 @@ static_assert(std::size(RatingNames) == 6); } // Open ride window in overview mode - return WindowRideMainOpen(*ride); + return RideMainOpen(*ride); } } return nullptr; @@ -6781,7 +6781,7 @@ static_assert(std::size(RatingNames) == 6); * * rct2: 0x006ACAC2 */ - WindowBase* WindowRideOpenVehicle(Vehicle* vehicle) + WindowBase* RideOpenVehicle(Vehicle* vehicle) { if (vehicle == nullptr) return nullptr; diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index 0149e5580e..f3ce047542 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -2748,7 +2748,7 @@ static Widget _rideConstructionWidgets[] = { * * rct2: 0x006CB481 */ - WindowBase* WindowRideConstructionOpen() + WindowBase* RideConstructionOpen() { RideId rideIndex = _currentRideIndex; CloseRideWindowForConstruction(rideIndex); diff --git a/src/openrct2-ui/windows/RideList.cpp b/src/openrct2-ui/windows/RideList.cpp index 3a4426c6f0..23604fcce9 100644 --- a/src/openrct2-ui/windows/RideList.cpp +++ b/src/openrct2-ui/windows/RideList.cpp @@ -961,7 +961,7 @@ static Widget _rideListWidgets[] = { * * rct2: 0x006B30BC */ - WindowBase* WindowRideListOpen() + WindowBase* RideListOpen() { // Check if window is already open auto* window = WindowBringToFrontByClass(WindowClass::RideList); diff --git a/src/openrct2-ui/windows/SavePrompt.cpp b/src/openrct2-ui/windows/SavePrompt.cpp index 6171ca20c7..d4c80757e2 100644 --- a/src/openrct2-ui/windows/SavePrompt.cpp +++ b/src/openrct2-ui/windows/SavePrompt.cpp @@ -194,7 +194,7 @@ static constexpr StringId window_save_prompt_labels[][2] = { } }; - WindowBase* WindowSavePromptOpen() + WindowBase* SavePromptOpen() { PromptMode prompt_mode = gSavePromptMode; if (prompt_mode == PromptMode::Quit) diff --git a/src/openrct2-ui/windows/ScenarioSelect.cpp b/src/openrct2-ui/windows/ScenarioSelect.cpp index c545df6ec6..8996b3faf2 100644 --- a/src/openrct2-ui/windows/ScenarioSelect.cpp +++ b/src/openrct2-ui/windows/ScenarioSelect.cpp @@ -762,12 +762,12 @@ static Widget _scenarioSelectWidgets[] = { } }; - WindowBase* WindowScenarioselectOpen(scenarioselect_callback callback) + WindowBase* ScenarioselectOpen(scenarioselect_callback callback) { - return WindowScenarioselectOpen([callback](std::string_view scenario) { callback(std::string(scenario).c_str()); }); + return ScenarioselectOpen([callback](std::string_view scenario) { callback(std::string(scenario).c_str()); }); } - WindowBase* WindowScenarioselectOpen(std::function callback) + WindowBase* ScenarioselectOpen(std::function callback) { auto* window = static_cast(WindowBringToFrontByClass(WindowClass::ScenarioSelect)); if (window != nullptr) diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp index 52591abaca..5730eee5ee 100644 --- a/src/openrct2-ui/windows/Scenery.cpp +++ b/src/openrct2-ui/windows/Scenery.cpp @@ -267,7 +267,7 @@ static Widget WindowSceneryBaseWidgets[] = { NetworkGetMode() != NETWORK_MODE_CLIENT || NetworkCanPerformCommand(NetworkGetCurrentPlayerGroupIndex(), -2)) { - WindowSceneryScatterOpen(); + SceneryScatterOpen(); } else { @@ -1693,7 +1693,7 @@ static Widget WindowSceneryBaseWidgets[] = { } }; - WindowBase* WindowSceneryOpen() + WindowBase* SceneryOpen() { auto* w = static_cast(WindowBringToFrontByClass(WindowClass::Scenery)); if (w == nullptr) diff --git a/src/openrct2-ui/windows/SceneryScatter.cpp b/src/openrct2-ui/windows/SceneryScatter.cpp index cf1014d16b..2293b5810d 100644 --- a/src/openrct2-ui/windows/SceneryScatter.cpp +++ b/src/openrct2-ui/windows/SceneryScatter.cpp @@ -201,7 +201,7 @@ static Widget _sceneryScatterWidgets[] = { } }; - WindowBase* WindowSceneryScatterOpen() + WindowBase* SceneryScatterOpen() { // Check if window is already open auto* window = WindowFindByClass(WindowClass::SceneryScatter); diff --git a/src/openrct2-ui/windows/ServerList.cpp b/src/openrct2-ui/windows/ServerList.cpp index 40ddebecae..29bb122642 100644 --- a/src/openrct2-ui/windows/ServerList.cpp +++ b/src/openrct2-ui/windows/ServerList.cpp @@ -542,7 +542,7 @@ static Widget _serverListWidgets[] = { } }; - WindowBase* WindowServerListOpen() + WindowBase* ServerListOpen() { // Check if window is already open auto* window = WindowBringToFrontByClass(WindowClass::ServerList); diff --git a/src/openrct2-ui/windows/ServerStart.cpp b/src/openrct2-ui/windows/ServerStart.cpp index 619bff5db9..24dbb0081c 100644 --- a/src/openrct2-ui/windows/ServerStart.cpp +++ b/src/openrct2-ui/windows/ServerStart.cpp @@ -132,7 +132,7 @@ static Widget _windowServerStartWidgets[] = { break; case WIDX_START_SERVER: NetworkSetPassword(_password); - WindowScenarioselectOpen(ScenarioSelectCallback); + ScenarioselectOpen(ScenarioSelectCallback); break; case WIDX_LOAD_SERVER: NetworkSetPassword(_password); @@ -281,7 +281,7 @@ static Widget _windowServerStartWidgets[] = { } }; - WindowBase* WindowServerStartOpen() + WindowBase* ServerStartOpen() { return WindowFocusOrCreate(WindowClass::ServerStart, WW, WH, WF_CENTRE_SCREEN); } diff --git a/src/openrct2-ui/windows/ShortcutKeys.cpp b/src/openrct2-ui/windows/ShortcutKeys.cpp index 99a3a8b781..cc9f3d7339 100644 --- a/src/openrct2-ui/windows/ShortcutKeys.cpp +++ b/src/openrct2-ui/windows/ShortcutKeys.cpp @@ -552,7 +552,7 @@ static Widget window_shortcut_change_widgets[] = { } } - WindowBase* WindowShortcutKeysOpen() + WindowBase* ShortcutKeysOpen() { auto w = WindowBringToFrontByClass(WindowClass::KeyboardShortcutList); if (w == nullptr) diff --git a/src/openrct2-ui/windows/Sign.cpp b/src/openrct2-ui/windows/Sign.cpp index 0584cea2e2..5e21545df7 100644 --- a/src/openrct2-ui/windows/Sign.cpp +++ b/src/openrct2-ui/windows/Sign.cpp @@ -331,7 +331,7 @@ static Widget _signWidgets[] = { * * rct2: 0x006BA305 */ - WindowBase* WindowSignOpen(rct_windownumber number) + WindowBase* SignOpen(rct_windownumber number) { auto* w = static_cast(WindowBringToFrontByNumber(WindowClass::Banner, number)); @@ -354,7 +354,7 @@ static Widget _signWidgets[] = { * * rct2: 0x6E5F52 */ - WindowBase* WindowSignSmallOpen(rct_windownumber number) + WindowBase* SignSmallOpen(rct_windownumber number) { auto* w = static_cast(WindowBringToFrontByNumber(WindowClass::Banner, number)); diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp index e98a3d52b0..b743ae7090 100644 --- a/src/openrct2-ui/windows/Staff.cpp +++ b/src/openrct2-ui/windows/Staff.cpp @@ -477,7 +477,7 @@ static Widget _staffOptionsWidgets[] = { } else { - WindowPatrolAreaOpen(staffId); + PatrolAreaOpen(staffId); } } break; @@ -1241,7 +1241,7 @@ static Widget _staffOptionsWidgets[] = { static constexpr int32_t TabAnimationFrames = 7; }; - WindowBase* WindowStaffOpen(Peep* peep) + WindowBase* StaffOpen(Peep* peep) { auto w = static_cast(WindowBringToFrontByNumber(WindowClass::Peep, peep->Id.ToUnderlying())); diff --git a/src/openrct2-ui/windows/StaffFirePrompt.cpp b/src/openrct2-ui/windows/StaffFirePrompt.cpp index 637c9f7b71..0839cbb8a4 100644 --- a/src/openrct2-ui/windows/StaffFirePrompt.cpp +++ b/src/openrct2-ui/windows/StaffFirePrompt.cpp @@ -92,7 +92,7 @@ static Widget _staffFireWidgets[] = { } }; - WindowBase* WindowStaffFirePromptOpen(Peep* peep) + WindowBase* StaffFirePromptOpen(Peep* peep) { // Check if the confirm window already exists auto* window = WindowFocusOrCreate( diff --git a/src/openrct2-ui/windows/StaffList.cpp b/src/openrct2-ui/windows/StaffList.cpp index 0ddf7019c4..6493660c19 100644 --- a/src/openrct2-ui/windows/StaffList.cpp +++ b/src/openrct2-ui/windows/StaffList.cpp @@ -464,7 +464,7 @@ static Widget _staffListWidgets[] = { if (closestStaffMember != nullptr) { ToolCancel(); - auto* staffWindow = WindowStaffOpen(closestStaffMember); + auto* staffWindow = StaffOpen(closestStaffMember); staffWindow->OnDropdown(WC_PEEP__WIDX_PATROL, 0); } else @@ -750,7 +750,7 @@ static Widget _staffListWidgets[] = { } }; - WindowBase* WindowStaffListOpen() + WindowBase* StaffListOpen() { return WindowFocusOrCreate(WindowClass::StaffList, WW, WH, WF_10 | WF_RESIZABLE); } diff --git a/src/openrct2-ui/windows/Themes.cpp b/src/openrct2-ui/windows/Themes.cpp index 168291d695..52958a812c 100644 --- a/src/openrct2-ui/windows/Themes.cpp +++ b/src/openrct2-ui/windows/Themes.cpp @@ -873,7 +873,7 @@ static WindowClass window_themes_tab_7_classes[] = { } }; - WindowBase* WindowThemesOpen() + WindowBase* ThemesOpen() { WindowBase* window; diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp index 56831298ba..ced4d1c53f 100644 --- a/src/openrct2-ui/windows/TileInspector.cpp +++ b/src/openrct2-ui/windows/TileInspector.cpp @@ -2390,7 +2390,7 @@ static uint64_t PageDisabledWidgets[] = { } }; - WindowBase* WindowTileInspectorOpen() + WindowBase* TileInspectorOpen() { WindowBase* window = WindowBringToFrontByClass(WindowClass::TileInspector); if (window == nullptr) diff --git a/src/openrct2-ui/windows/TitleExit.cpp b/src/openrct2-ui/windows/TitleExit.cpp index 2afad31f02..0c56d4ab6e 100644 --- a/src/openrct2-ui/windows/TitleExit.cpp +++ b/src/openrct2-ui/windows/TitleExit.cpp @@ -60,7 +60,7 @@ static Widget _titleExitWidgets[] = { * Creates the window containing the exit button on the title screen. * rct2: 0x0066B624 (part of 0x0066B3E8) */ - WindowBase* WindowTitleExitOpen() + WindowBase* TitleExitOpen() { return WindowCreate( WindowClass::TitleExit, ScreenCoordsXY(ContextGetWidth() - 40, ContextGetHeight() - 64), 40, 64, diff --git a/src/openrct2-ui/windows/TitleLogo.cpp b/src/openrct2-ui/windows/TitleLogo.cpp index 8b68d437ca..16bd5bb8cd 100644 --- a/src/openrct2-ui/windows/TitleLogo.cpp +++ b/src/openrct2-ui/windows/TitleLogo.cpp @@ -50,7 +50,7 @@ namespace OpenRCT2::Ui::Windows switch (widgetIndex) { case WIDX_LOGO: - WindowAboutOpen(); + AboutOpen(); break; } } @@ -67,7 +67,7 @@ namespace OpenRCT2::Ui::Windows } }; - WindowBase* WindowTitleLogoOpen() + WindowBase* TitleLogoOpen() { auto* window = WindowBringToFrontByClass(WindowClass::TitleLogo); if (window == nullptr) diff --git a/src/openrct2-ui/windows/TitleMenu.cpp b/src/openrct2-ui/windows/TitleMenu.cpp index 06fec7320f..e506ac4cf1 100644 --- a/src/openrct2-ui/windows/TitleMenu.cpp +++ b/src/openrct2-ui/windows/TitleMenu.cpp @@ -134,7 +134,7 @@ static Widget _titleMenuWidgets[] = { { WindowCloseByClass(WindowClass::Loadsave); WindowCloseByClass(WindowClass::ServerList); - WindowScenarioselectOpen(WindowTitleMenuScenarioselectCallback); + ScenarioselectOpen(WindowTitleMenuScenarioselectCallback); } break; case WIDX_CONTINUE_SAVED_GAME: @@ -283,7 +283,7 @@ static Widget _titleMenuWidgets[] = { /** * Creates the window containing the menu buttons on the title screen. */ - WindowBase* WindowTitleMenuOpen() + WindowBase* TitleMenuOpen() { const uint16_t windowHeight = MenuButtonDims.height + UpdateButtonDims.height; return WindowCreate( diff --git a/src/openrct2-ui/windows/TitleOptions.cpp b/src/openrct2-ui/windows/TitleOptions.cpp index 639b960a17..07a359e3e7 100644 --- a/src/openrct2-ui/windows/TitleOptions.cpp +++ b/src/openrct2-ui/windows/TitleOptions.cpp @@ -55,7 +55,7 @@ static Widget _windowTitleOptionsWidgets[] = { /** * Creates the window containing the options button on the title screen. */ - WindowBase* WindowTitleOptionsOpen() + WindowBase* TitleOptionsOpen() { auto* window = WindowBringToFrontByClass(WindowClass::TitleOptions); if (window == nullptr) diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index b349881355..28cc31f993 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -3320,7 +3320,7 @@ static Widget _topToolbarWidgets[] = { * Creates the main game top toolbar window. * rct2: 0x0066B485 (part of 0x0066B3E8) */ - WindowBase* WindowTopToolbarOpen() + WindowBase* TopToolbarOpen() { TopToolbar* window = WindowCreate( WindowClass::TopToolbar, ScreenCoordsXY(0, 0), ContextGetWidth(), TOP_TOOLBAR_HEIGHT + 1, diff --git a/src/openrct2-ui/windows/TrackDesignManage.cpp b/src/openrct2-ui/windows/TrackDesignManage.cpp index 57e1650753..7283d4e41d 100644 --- a/src/openrct2-ui/windows/TrackDesignManage.cpp +++ b/src/openrct2-ui/windows/TrackDesignManage.cpp @@ -106,7 +106,7 @@ static Widget _trackDeletePromptWidgets[] = { * * rct2: 0x006D348F */ - WindowBase* WindowTrackManageOpen(TrackDesignFileRef* tdFileRef) + WindowBase* TrackManageOpen(TrackDesignFileRef* tdFileRef) { WindowCloseByClass(WindowClass::ManageTrackDesign); auto trackDesignManageWindow = std::make_unique(tdFileRef); diff --git a/src/openrct2-ui/windows/TrackDesignPlace.cpp b/src/openrct2-ui/windows/TrackDesignPlace.cpp index 75156eb9ca..83b47a8ce3 100644 --- a/src/openrct2-ui/windows/TrackDesignPlace.cpp +++ b/src/openrct2-ui/windows/TrackDesignPlace.cpp @@ -615,7 +615,7 @@ static Widget _trackPlaceWidgets[] = { } }; - WindowBase* WindowTrackPlaceOpen(const TrackDesignFileRef* tdFileRef) + WindowBase* TrackPlaceOpen(const TrackDesignFileRef* tdFileRef) { std::unique_ptr openTrackDesign = TrackDesignImport(tdFileRef->path.c_str()); diff --git a/src/openrct2-ui/windows/TrackList.cpp b/src/openrct2-ui/windows/TrackList.cpp index 440abd0cc3..9623bc6435 100644 --- a/src/openrct2-ui/windows/TrackList.cpp +++ b/src/openrct2-ui/windows/TrackList.cpp @@ -760,7 +760,7 @@ static Widget _trackListWidgets[] = { } }; - WindowBase* WindowTrackListOpen(const RideSelection item) + WindowBase* TrackListOpen(const RideSelection item) { WindowCloseConstructionWindows(); ScreenCoordsXY screenPos{}; diff --git a/src/openrct2-ui/windows/Transparency.cpp b/src/openrct2-ui/windows/Transparency.cpp index 823e53ddb3..5d8c50fd76 100644 --- a/src/openrct2-ui/windows/Transparency.cpp +++ b/src/openrct2-ui/windows/Transparency.cpp @@ -252,7 +252,7 @@ static Widget _transparancyWidgets[] = } }; - WindowBase* WindowTransparencyOpen() + WindowBase* TransparencyOpen() { auto* window = WindowBringToFrontByClass(WindowClass::Transparency); if (window == nullptr) diff --git a/src/openrct2-ui/windows/ViewClipping.cpp b/src/openrct2-ui/windows/ViewClipping.cpp index cf4815ba61..4c653da6d3 100644 --- a/src/openrct2-ui/windows/ViewClipping.cpp +++ b/src/openrct2-ui/windows/ViewClipping.cpp @@ -403,7 +403,7 @@ static Widget _viewClippingWidgets[] = { } }; - WindowBase* WindowViewClippingOpen() + WindowBase* ViewClippingOpen() { auto* window = WindowBringToFrontByClass(WindowClass::ViewClipping); if (window == nullptr) diff --git a/src/openrct2-ui/windows/Viewport.cpp b/src/openrct2-ui/windows/Viewport.cpp index 22091cec83..0653182632 100644 --- a/src/openrct2-ui/windows/Viewport.cpp +++ b/src/openrct2-ui/windows/Viewport.cpp @@ -84,7 +84,7 @@ static Widget _viewportWidgets[] = if (viewport == nullptr) { Close(); - WindowErrorOpen("Unexpected Error", "Failed to create viewport window."); + ErrorOpen("Unexpected Error", "Failed to create viewport window."); return; } @@ -226,7 +226,7 @@ static Widget _viewportWidgets[] = } }; - WindowBase* WindowViewportOpen() + WindowBase* ViewportOpen() { int32_t screenWidth = ContextGetWidth(); int32_t screenHeight = ContextGetHeight(); diff --git a/src/openrct2-ui/windows/Water.cpp b/src/openrct2-ui/windows/Water.cpp index fe82ebe890..838e74a087 100644 --- a/src/openrct2-ui/windows/Water.cpp +++ b/src/openrct2-ui/windows/Water.cpp @@ -193,7 +193,7 @@ static Widget _waterWidgets[] = { } }; - WindowBase* WindowWaterOpen() + WindowBase* WaterOpen() { return WindowFocusOrCreate(WindowClass::Water, ScreenCoordsXY(ContextGetWidth() - WW, 29), WW, WH, 0); } diff --git a/src/openrct2-ui/windows/Window.h b/src/openrct2-ui/windows/Window.h index 5c484af922..c750d60d1d 100644 --- a/src/openrct2-ui/windows/Window.h +++ b/src/openrct2-ui/windows/Window.h @@ -37,92 +37,92 @@ namespace OpenRCT2::Ui::Windows extern colour_t gWindowSceneryTertiaryColour; extern bool gWindowSceneryEyedropperEnabled; - WindowBase* WindowAboutOpen(); + WindowBase* AboutOpen(); void WindowCampaignRefreshRides(); - WindowBase* WindowChangelogOpen(int personality); - WindowBase* WindowCheatsOpen(); - WindowBase* WindowClearSceneryOpen(); - WindowBase* CustomCurrencyWindowOpen(); - WindowBase* WindowDebugPaintOpen(); - WindowBase* WindowEditorInventionsListOpen(); - WindowBase* WindowEditorMainOpen(); - WindowBase* WindowEditorObjectiveOptionsOpen(); - WindowBase* WindowEditorScenarioOptionsOpen(); - WindowBase* WindowFootpathOpen(); + WindowBase* ChangelogOpen(int personality); + WindowBase* CheatsOpen(); + WindowBase* ClearSceneryOpen(); + WindowBase* CustomCurrencyOpen(); + WindowBase* DebugPaintOpen(); + WindowBase* EditorInventionsListOpen(); + WindowBase* EditorMainOpen(); + WindowBase* EditorObjectiveOptionsOpen(); + WindowBase* EditorScenarioOptionsOpen(); + WindowBase* FootpathOpen(); void WindowFootpathResetSelectedPath(); - WindowBase* WindowGuestOpen(Peep* peep); - WindowBase* WindowLandOpen(); - WindowBase* WindowLandRightsOpen(); - WindowBase* WindowMainOpen(); - WindowBase* WindowMapgenOpen(); - WindowBase* WindowMultiplayerOpen(); - WindowBase* WindowNewsOpen(); - WindowBase* WindowNewsOptionsOpen(); - WindowBase* WindowOptionsOpen(); - WindowBase* WindowSavePromptOpen(); + WindowBase* GuestOpen(Peep* peep); + WindowBase* LandOpen(); + WindowBase* LandRightsOpen(); + WindowBase* MainOpen(); + WindowBase* MapgenOpen(); + WindowBase* MultiplayerOpen(); + WindowBase* NewsOpen(); + WindowBase* NewsOptionsOpen(); + WindowBase* OptionsOpen(); + WindowBase* SavePromptOpen(); #ifndef DISABLE_NETWORK - WindowBase* WindowServerListOpen(); - WindowBase* WindowServerStartOpen(); + WindowBase* ServerListOpen(); + WindowBase* ServerStartOpen(); #endif - WindowBase* WindowShortcutKeysOpen(); - WindowBase* WindowStaffListOpen(); - WindowBase* WindowStaffOpen(Peep* peep); + WindowBase* ShortcutKeysOpen(); + WindowBase* StaffListOpen(); + WindowBase* StaffOpen(Peep* peep); void WindowStaffListRefresh(); - WindowBase* WindowThemesOpen(); - WindowBase* WindowTitleExitOpen(); - WindowBase* WindowTitleLogoOpen(); - WindowBase* WindowTitleMenuOpen(); - WindowBase* WindowTitleOptionsOpen(); - WindowBase* WindowViewportOpen(); - WindowBase* WindowWaterOpen(); - WindowBase* WindowViewClippingOpen(); - WindowBase* WindowTransparencyOpen(); - WindowBase* WindowAssetPacksOpen(); + WindowBase* ThemesOpen(); + WindowBase* TitleExitOpen(); + WindowBase* TitleLogoOpen(); + WindowBase* TitleMenuOpen(); + WindowBase* TitleOptionsOpen(); + WindowBase* ViewportOpen(); + WindowBase* WaterOpen(); + WindowBase* ViewClippingOpen(); + WindowBase* TransparencyOpen(); + WindowBase* AssetPacksOpen(); // WC_FINANCES - WindowBase* WindowFinancesOpen(); - WindowBase* WindowFinancesResearchOpen(); - WindowBase* WindowFinancesMarketingOpen(); + WindowBase* FinancesOpen(); + WindowBase* FinancesResearchOpen(); + WindowBase* FinancesMarketingOpen(); // WC_PARK_INFORMATION - WindowBase* WindowParkAwardsOpen(); - WindowBase* WindowParkEntranceOpen(); - WindowBase* WindowParkGuestsOpen(); - WindowBase* WindowParkObjectiveOpen(); - WindowBase* WindowParkRatingOpen(); + WindowBase* ParkAwardsOpen(); + WindowBase* ParkEntranceOpen(); + WindowBase* ParkGuestsOpen(); + WindowBase* ParkObjectiveOpen(); + WindowBase* ParkRatingOpen(); - WindowBase* WindowBannerOpen(rct_windownumber number); - WindowBase* WindowRideDemolishPromptOpen(const Ride& ride); - WindowBase* WindowRideRefurbishPromptOpen(const Ride& ride); - WindowBase* WindowSignOpen(rct_windownumber number); - WindowBase* WindowSignSmallOpen(rct_windownumber number); - WindowBase* WindowPlayerOpen(uint8_t id); - WindowBase* WindowNewCampaignOpen(int16_t campaignType); + 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); - WindowBase* WindowInstallTrackOpen(const utf8* path); + WindowBase* InstallTrackOpen(const utf8* path); void WindowGuestListRefreshList(); - WindowBase* WindowGuestListOpen(); - WindowBase* WindowGuestListOpenWithFilter(GuestListFilterType type, int32_t index); - WindowBase* WindowStaffFirePromptOpen(Peep* peep); - WindowBase* WindowScenarioselectOpen(scenarioselect_callback callback); - WindowBase* WindowScenarioselectOpen(std::function callback); + WindowBase* GuestListOpen(); + WindowBase* GuestListOpenWithFilter(GuestListFilterType type, int32_t index); + WindowBase* StaffFirePromptOpen(Peep* peep); + WindowBase* ScenarioselectOpen(scenarioselect_callback callback); + WindowBase* ScenarioselectOpen(std::function callback); - WindowBase* WindowErrorOpen(StringId title, StringId message, const class Formatter& formatter); - WindowBase* WindowErrorOpen(std::string_view title, std::string_view message); + WindowBase* ErrorOpen(StringId title, StringId message, const class Formatter& formatter); + WindowBase* ErrorOpen(std::string_view title, std::string_view message); - WindowBase* WindowLoadsaveOpen( + WindowBase* LoadsaveOpen( int32_t type, std::string_view defaultPath, std::function callback, TrackDesign* trackDesign); - WindowBase* WindowTrackPlaceOpen(const struct TrackDesignFileRef* tdFileRef); - WindowBase* WindowTrackManageOpen(struct TrackDesignFileRef* tdFileRef); + WindowBase* TrackPlaceOpen(const struct TrackDesignFileRef* tdFileRef); + WindowBase* TrackManageOpen(struct TrackDesignFileRef* tdFileRef); void TrackPlaceClearProvisionalTemporarily(); void TrackPlaceRestoreProvisional(); - WindowBase* WindowMapOpen(); + WindowBase* MapOpen(); void WindowMapReset(); - WindowBase* WindowResearchOpen(); + WindowBase* ResearchOpen(); void WindowResearchDevelopmentMouseUp(WidgetIndex widgetIndex, WidgetIndex baseWidgetIndex); void WindowResearchDevelopmentPrepareDraw(WindowBase* w, WidgetIndex baseWidgetIndex); void WindowResearchDevelopmentDraw(WindowBase* w, DrawPixelInfo& dpi, WidgetIndex baseWidgetIndex); @@ -132,24 +132,24 @@ namespace OpenRCT2::Ui::Windows void WindowResearchFundingPrepareDraw(WindowBase* w, WidgetIndex baseWidgetIndex); void WindowResearchFundingDraw(WindowBase* w, DrawPixelInfo& dpi); - WindowBase* WindowNewRideOpen(); - WindowBase* WindowNewRideOpenResearch(); + WindowBase* NewRideOpen(); + WindowBase* NewRideOpenResearch(); void WindowNewRideInitVars(); void WindowNewRideFocus(RideSelection rideItem); - WindowBase* WindowRideListOpen(); + WindowBase* RideListOpen(); void WindowRideListRefreshList(WindowBase* w); - WindowBase* WindowRideMainOpen(const Ride& ride); - WindowBase* WindowRideOpenTrack(TileElement* tileElement); - WindowBase* WindowRideOpenVehicle(Vehicle* vehicle); + WindowBase* RideMainOpen(const Ride& ride); + WindowBase* RideOpenTrack(TileElement* tileElement); + WindowBase* RideOpenVehicle(Vehicle* vehicle); void WindowRideInvalidateVehicle(const Vehicle& vehicle); void WindowRidePaintResetVehicle(RideId rideIndex); void WindowRideMeasurementsDesignCancel(); // rct2: 0x00F635EE extern RideSelection _window_track_list_item; - WindowBase* WindowTrackListOpen(RideSelection item); + WindowBase* TrackListOpen(RideSelection item); void WindowTrackDesignListReloadTracks(); void WindowTrackDesignListSetBeingUpdated(bool beingUpdated); @@ -157,11 +157,11 @@ namespace OpenRCT2::Ui::Windows const Formatter& GetMapTooltip(); void WindowMapTooltipUpdateVisibility(); - WindowBase* WindowMazeConstructionOpen(); + WindowBase* MazeConstructionOpen(); void WindowMazeConstructionUpdatePressedWidgets(); - WindowBase* WindowNetworkStatusOpen(const std::string& text, close_callback onClose); - WindowBase* WindowNetworkStatusOpenPassword(); + WindowBase* NetworkStatusOpen(const std::string& text, close_callback onClose); + WindowBase* NetworkStatusOpenPassword(); void WindowNetworkStatusClose(); void WindowTextInputKey(WindowBase* w, uint32_t keycode); @@ -176,18 +176,18 @@ namespace OpenRCT2::Ui::Windows std::string_view title, std::string_view description, std::string_view initialValue, size_t maxLength, std::function okCallback, std::function cancelCallback); - WindowBase* WindowObjectLoadErrorOpen(utf8* path, size_t numMissingObjects, const ObjectEntryDescriptor* missingObjects); + WindowBase* ObjectLoadErrorOpen(utf8* path, size_t numMissingObjects, const ObjectEntryDescriptor* missingObjects); - WindowBase* WindowRideConstructionOpen(); + WindowBase* RideConstructionOpen(); void WindowRideConstructionUpdateActiveElementsImpl(); void WindowRideConstructionUpdateEnabledTrackPieces(); - WindowBase* WindowTopToolbarOpen(); + WindowBase* TopToolbarOpen(); bool LandToolIsActive(); bool ClearSceneryToolIsActive(); bool WaterToolIsActive(); - WindowBase* WindowSceneryOpen(); + WindowBase* SceneryOpen(); void WindowScenerySetSelectedItem( const ScenerySelection& sceneryconst, std::optional primary, const std::optional secondary, const std::optional tertiary, const std::optional rotation); @@ -198,23 +198,23 @@ namespace OpenRCT2::Ui::Windows const ScenerySelection WindowSceneryGetTabSelection(); extern uint8_t gToolbarDirtyFlags; - WindowBase* WindowGameBottomToolbarOpen(); + WindowBase* GameBottomToolbarOpen(); void WindowGameBottomToolbarInvalidateNewsItem(); - WindowBase* WindowEditorBottomToolbarOpen(); + WindowBase* EditorBottomToolbarOpen(); - WindowBase* WindowTileInspectorOpen(); + WindowBase* TileInspectorOpen(); void WindowTileInspectorClearClipboard(); - WindowBase* WindowEditorObjectSelectionOpen(); + WindowBase* EditorObjectSelectionOpen(); void WindowTooltipReset(const ScreenCoordsXY& screenCoords); void WindowTooltipShow(const OpenRCT2String& message, ScreenCoordsXY screenCoords); void WindowTooltipOpen(WindowBase* widgetWindow, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords); void WindowTooltipClose(); - WindowBase* WindowSceneryScatterOpen(); - WindowBase* WindowPatrolAreaOpen(EntityId staffId); + WindowBase* SceneryScatterOpen(); + WindowBase* PatrolAreaOpen(EntityId staffId); EntityId WindowPatrolAreaGetCurrentStaffId(); // clang-format off diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp index 3302aff33c..a6f6cebc80 100644 --- a/src/openrct2/network/NetworkBase.cpp +++ b/src/openrct2/network/NetworkBase.cpp @@ -2758,7 +2758,7 @@ void NetworkBase::Client_Handle_MAP([[maybe_unused]] NetworkConnection& connecti GameLoadScripts(); GameNotifyMapChanged(); _serverState.tick = GetGameState().CurrentTicks; - // WindowNetworkStatusOpen("Loaded new map from network"); + // NetworkStatusOpen("Loaded new map from network"); _serverState.state = NetworkServerStatus::Ok; _clientMapLoaded = true; gFirstTimeSaving = true;