mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clang tidy Part 1: Ui Project Function Names (#15956) 

* Add NOLINT around STL using classes and vendor functions

* Apply clang-tidy to ui project function names

* Undo scripting clang-format

* Upper case OpenRCT2 and RCT2
This commit is contained in:
Duncan 2021-11-23 13:18:07 +00:00 committed by GitHub
parent fcf587dfa4
commit bb2c7dbaca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
84 changed files with 3939 additions and 3959 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/openrct2-ui/CursorRepository.cpp
View File

@ -40,36 +40,36 @@ void CursorRepository::SetCurrentCursor(CursorID cursorId)
{
if (_currentCursor != cursorId)
{
SDL_Cursor* cursor = _scaledCursors.at(_currentCursorScale).getScaledCursor(cursorId);
SDL_Cursor* cursor = _scaledCursors.at(_currentCursorScale).GetScaledCursor(cursorId);
SDL_SetCursor(cursor);
_currentCursor = cursorId;
}
}
static bool getBit(const uint8_t data[], size_t x, size_t y, size_t width) noexcept
static bool GetBit(const uint8_t data[], size_t x, size_t y, size_t width) noexcept
{
const size_t position = y * width + x;
return (data[position / 8] & (1 << (7 - (x % 8)))) != 0;
}
static void setBit(uint8_t data[], size_t x, size_t y, size_t width) noexcept
static void SetBit(uint8_t data[], size_t x, size_t y, size_t width) noexcept
{
size_t position = y * width + x;
data[position / 8] |= (1 << (7 - (position % 8)));
}
static void drawRect(uint8_t data[], size_t x, size_t y, size_t width, size_t scale) noexcept
static void DrawRect(uint8_t data[], size_t x, size_t y, size_t width, size_t scale) noexcept
{
for (size_t outY = (y * scale); outY < ((1 + y) * scale); outY++)
{
for (size_t outX = (x * scale); outX < ((1 + x) * scale); outX++)
{
setBit(data, outX, outY, width * scale);
SetBit(data, outX, outY, width * scale);
}
}
}
static std::vector<uint8_t> scaleDataArray(const uint8_t data[], size_t width, size_t height, size_t scale)
static std::vector<uint8_t> ScaleDataArray(const uint8_t data[], size_t width, size_t height, size_t scale)
{
const size_t length = width * height;
@ -80,11 +80,11 @@ static std::vector<uint8_t> scaleDataArray(const uint8_t data[], size_t width, s
{
for (size_t x = 0; x < width; x++)
{
const bool value = getBit(data, x, y, width);
const bool value = GetBit(data, x, y, width);
if (!value)
continue;
drawRect(res.data(), x, y, width, scale);
DrawRect(res.data(), x, y, width, scale);
}
}
@ -95,8 +95,8 @@ SDL_Cursor* CursorRepository::Create(const CursorData* cursorInfo, uint8_t scale
{
const auto integer_scale = static_cast<int>(round(scale));
auto data = scaleDataArray(cursorInfo->Data, CURSOR_BIT_WIDTH, CURSOR_HEIGHT, static_cast<size_t>(integer_scale));
auto mask = scaleDataArray(cursorInfo->Mask, CURSOR_BIT_WIDTH, CURSOR_HEIGHT, static_cast<size_t>(integer_scale));
auto data = ScaleDataArray(cursorInfo->Data, CURSOR_BIT_WIDTH, CURSOR_HEIGHT, static_cast<size_t>(integer_scale));
auto mask = ScaleDataArray(cursorInfo->Mask, CURSOR_BIT_WIDTH, CURSOR_HEIGHT, static_cast<size_t>(integer_scale));
auto* cursor = SDL_CreateCursor(
data.data(), mask.data(), BASE_CURSOR_WIDTH * integer_scale, BASE_CURSOR_HEIGHT * integer_scale,

2
src/openrct2-ui/CursorRepository.h
View File

@ -44,7 +44,7 @@ namespace OpenRCT2::Ui
}
}
SDL_Cursor* getScaledCursor(CursorID cursorId)
SDL_Cursor* GetScaledCursor(CursorID cursorId)
{
return _cursors[EnumValue(cursorId)];
}

8
src/openrct2-ui/Ui.cpp
View File

@ -25,7 +25,7 @@ using namespace OpenRCT2;
using namespace OpenRCT2::Audio;
using namespace OpenRCT2::Ui;
template<typename T> static std::shared_ptr<T> to_shared(std::unique_ptr<T>&& src)
template<typename T> static std::shared_ptr<T> ToShared(std::unique_ptr<T>&& src)
{
return std::shared_ptr<T>(std::move(src));
}
@ -54,9 +54,9 @@ int main(int argc, const char** argv)
else
{
// Run OpenRCT2 with a UI context
auto env = to_shared(CreatePlatformEnvironment());
auto audioContext = to_shared(CreateAudioContext());
auto uiContext = to_shared(CreateUiContext(env));
auto env = ToShared(CreatePlatformEnvironment());
auto audioContext = ToShared(CreateAudioContext());
auto uiContext = ToShared(CreateUiContext(env));
context = CreateContext(env, audioContext, uiContext);
}
rc = context->RunOpenRCT2(argc, argv);

194
src/openrct2-ui/WindowManager.cpp
View File

@ -32,7 +32,7 @@ public:
void Init() override
{
ThemeManagerInitialise();
window_new_ride_init_vars();
WindowNewRideInitVars();
}
rct_window* OpenWindow(rct_windowclass wc) override
@ -40,97 +40,97 @@ public:
switch (wc)
{
case WC_ABOUT:
return window_about_open();
return WindowAboutOpen();
case WC_BOTTOM_TOOLBAR:
return window_game_bottom_toolbar_open();
return WindowGameBottomToolbarOpen();
case WC_CHANGELOG:
return OpenView(WV_CHANGELOG);
case WC_CHEATS:
return window_cheats_open();
return WindowCheatsOpen();
case WC_CLEAR_SCENERY:
return window_clear_scenery_open();
return WindowClearSceneryOpen();
case WC_CUSTOM_CURRENCY_CONFIG:
return custom_currency_window_open();
return CustomCurrencyWindowOpen();
case WC_DEBUG_PAINT:
return window_debug_paint_open();
return WindowDebugPaintOpen();
case WC_EDITOR_INVENTION_LIST:
return window_editor_inventions_list_open();
return WindowEditorInventionsListOpen();
case WC_EDITOR_OBJECT_SELECTION:
return window_editor_object_selection_open();
return WindowEditorObjectSelectionOpen();
case WC_EDITOR_OBJECTIVE_OPTIONS:
return window_editor_objective_options_open();
return WindowEditorObjectiveOptionsOpen();
case WC_EDITOR_SCENARIO_OPTIONS:
return window_editor_scenario_options_open();
return WindowEditorScenarioOptionsOpen();
case WC_FINANCES:
return window_finances_open();
return WindowFinancesOpen();
case WC_FOOTPATH:
return window_footpath_open();
return WindowFootpathOpen();
case WC_GUEST_LIST:
return window_guest_list_open();
return WindowGuestListOpen();
case WC_LAND:
return window_land_open();
return WindowLandOpen();
case WC_LAND_RIGHTS:
return window_land_rights_open();
return WindowLandRightsOpen();
case WC_MAIN_WINDOW:
return window_main_open();
return WindowMainOpen();
case WC_MAP:
return window_map_open();
return WindowMapOpen();
case WC_MAPGEN:
return window_mapgen_open();
return WindowMapgenOpen();
case WC_MULTIPLAYER:
return window_multiplayer_open();
return WindowMultiplayerOpen();
case WC_CONSTRUCT_RIDE:
return window_new_ride_open();
return WindowNewRideOpen();
case WC_PARK_INFORMATION:
return window_park_entrance_open();
return WindowParkEntranceOpen();
case WC_RECENT_NEWS:
return window_news_open();
return WindowNewsOpen();
case WC_RIDE_CONSTRUCTION:
return window_ride_construction_open();
return WindowRideConstructionOpen();
case WC_RESEARCH:
return window_research_open();
return WindowResearchOpen();
case WC_RIDE_LIST:
return window_ride_list_open();
return WindowRideListOpen();
case WC_NOTIFICATION_OPTIONS:
return window_news_options_open();
return WindowNewsOptionsOpen();
case WC_OPTIONS:
return window_options_open();
return WindowOptionsOpen();
case WC_SAVE_PROMPT:
return window_save_prompt_open();
return WindowSavePromptOpen();
case WC_SCENERY:
return window_scenery_open();
return WindowSceneryOpen();
case WC_SCENERY_SCATTER:
return window_scenery_scatter_open();
return WindowSceneryScatterOpen();
#ifndef DISABLE_NETWORK
case WC_SERVER_LIST:
return window_server_list_open();
return WindowServerListOpen();
case WC_SERVER_START:
return window_server_start_open();
return WindowServerStartOpen();
#endif
case WC_KEYBOARD_SHORTCUT_LIST:
return window_shortcut_keys_open();
return WindowShortcutKeysOpen();
case WC_STAFF_LIST:
return window_staff_list_open();
return WindowStaffListOpen();
case WC_THEMES:
return window_themes_open();
return WindowThemesOpen();
case WC_TILE_INSPECTOR:
return window_tile_inspector_open();
return WindowTileInspectorOpen();
case WC_TITLE_EXIT:
return window_title_exit_open();
return WindowTitleExitOpen();
case WC_TITLE_LOGO:
return window_title_logo_open();
return WindowTitleLogoOpen();
case WC_TITLE_MENU:
return window_title_menu_open();
return WindowTitleMenuOpen();
case WC_TITLE_OPTIONS:
return window_title_options_open();
return WindowTitleOptionsOpen();
case WC_TOP_TOOLBAR:
return window_top_toolbar_open();
return WindowTopToolbarOpen();
case WC_VIEW_CLIPPING:
return window_view_clipping_open();
return WindowViewClippingOpen();
case WC_VIEWPORT:
return window_viewport_open();
return WindowViewportOpen();
case WC_WATER:
return window_water_open();
return WindowWaterOpen();
default:
Console::Error::WriteLine("Unhandled window class (%d)", wc);
return nullptr;
@ -142,33 +142,33 @@ public:
switch (view)
{
case WV_PARK_AWARDS:
return window_park_awards_open();
return WindowParkAwardsOpen();
case WV_PARK_RATING:
return window_park_rating_open();
return WindowParkRatingOpen();
case WV_PARK_OBJECTIVE:
return window_park_objective_open();
return WindowParkObjectiveOpen();
case WV_PARK_GUESTS:
return window_park_guests_open();
return WindowParkGuestsOpen();
case WV_FINANCES_RESEARCH:
return window_finances_research_open();
return WindowFinancesResearchOpen();
case WV_RIDE_RESEARCH:
if (gConfigInterface.toolbar_show_research)
{
return this->OpenWindow(WC_RESEARCH);
}
return window_new_ride_open_research();
return WindowNewRideOpenResearch();
case WV_MAZE_CONSTRUCTION:
return window_maze_construction_open();
return WindowMazeConstructionOpen();
case WV_NETWORK_PASSWORD:
return window_network_status_open_password();
return WindowNetworkStatusOpenPassword();
case WV_EDITOR_BOTTOM_TOOLBAR:
return window_editor_bottom_toolbar_open();
return WindowEditorBottomToolbarOpen();
case WV_EDITOR_MAIN:
return window_editor_main_open();
return WindowEditorMainOpen();
case WV_CHANGELOG:
return window_changelog_open(WV_CHANGELOG);
return WindowChangelogOpen(WV_CHANGELOG);
case WV_NEW_VERSION_INFO:
return window_changelog_open(WV_NEW_VERSION_INFO);
return WindowChangelogOpen(WV_NEW_VERSION_INFO);
default:
return nullptr;
}
@ -179,20 +179,20 @@ public:
switch (type)
{
case WD_BANNER:
return window_banner_open(id);
return WindowBannerOpen(id);
case WD_DEMOLISH_RIDE:
return window_ride_demolish_prompt_open(get_ride(static_cast<ride_id_t>(id)));
return WindowRideDemolishPromptOpen(get_ride(static_cast<ride_id_t>(id)));
case WD_REFURBISH_RIDE:
return window_ride_refurbish_prompt_open(get_ride(static_cast<ride_id_t>(id)));
return WindowRideRefurbishPromptOpen(get_ride(static_cast<ride_id_t>(id)));
case WD_NEW_CAMPAIGN:
return window_new_campaign_open(id);
return WindowNewCampaignOpen(id);
case WD_SIGN:
return window_sign_open(id);
return WindowSignOpen(id);
case WD_SIGN_SMALL:
return window_sign_small_open(id);
return WindowSignSmallOpen(id);
case WD_PLAYER:
return window_player_open(id);
return WindowPlayerOpen(id);
default:
return nullptr;
@ -201,12 +201,12 @@ public:
rct_window* ShowError(rct_string_id title, rct_string_id message, const Formatter& args) override
{
return window_error_open(title, message, args);
return WindowErrorOpen(title, message, args);
}
rct_window* ShowError(std::string_view title, std::string_view message) override
{
return window_error_open(title, message);
return WindowErrorOpen(title, message);
}
rct_window* OpenIntent(Intent* intent) override
@ -214,13 +214,13 @@ public:
switch (intent->GetWindowClass())
{
case WC_PEEP:
return window_guest_open(static_cast<Peep*>(intent->GetPointerExtra(INTENT_EXTRA_PEEP)));
return WindowGuestOpen(static_cast<Peep*>(intent->GetPointerExtra(INTENT_EXTRA_PEEP)));
case WC_FIRE_PROMPT:
return window_staff_fire_prompt_open(static_cast<Peep*>(intent->GetPointerExtra(INTENT_EXTRA_PEEP)));
return WindowStaffFirePromptOpen(static_cast<Peep*>(intent->GetPointerExtra(INTENT_EXTRA_PEEP)));
case WC_INSTALL_TRACK:
return window_install_track_open(intent->GetStringExtra(INTENT_EXTRA_PATH).c_str());
return WindowInstallTrackOpen(intent->GetStringExtra(INTENT_EXTRA_PATH).c_str());
case WC_GUEST_LIST:
return window_guest_list_open_with_filter(
return WindowGuestListOpenWithFilter(
static_cast<GuestListFilterType>(intent->GetSIntExtra(INTENT_EXTRA_GUEST_LIST_FILTER)),
intent->GetSIntExtra(INTENT_EXTRA_RIDE_ID));
case WC_LOADSAVE:
@ -230,7 +230,7 @@ public:
loadsave_callback callback = reinterpret_cast<loadsave_callback>(
intent->GetPointerExtra(INTENT_EXTRA_CALLBACK));
TrackDesign* trackDesign = static_cast<TrackDesign*>(intent->GetPointerExtra(INTENT_EXTRA_TRACK_DESIGN));
auto* w = window_loadsave_open(
auto* w = WindowLoadsaveOpen(
type, defaultName,
[callback](int32_t result, std::string_view path) {
if (callback != nullptr)
@ -242,20 +242,20 @@ public:
return w;
}
case WC_MANAGE_TRACK_DESIGN:
return window_track_manage_open(
return WindowTrackManageOpen(
static_cast<track_design_file_ref*>(intent->GetPointerExtra(INTENT_EXTRA_TRACK_DESIGN)));
case WC_NETWORK_STATUS:
{
std::string message = intent->GetStringExtra(INTENT_EXTRA_MESSAGE);
close_callback callback = intent->GetCloseCallbackExtra(INTENT_EXTRA_CALLBACK);
return window_network_status_open(message.c_str(), callback);
return WindowNetworkStatusOpen(message.c_str(), callback);
}
case WC_OBJECT_LOAD_ERROR:
{
std::string path = intent->GetStringExtra(INTENT_EXTRA_PATH);
auto objects = static_cast<const ObjectEntryDescriptor*>(intent->GetPointerExtra(INTENT_EXTRA_LIST));
size_t count = intent->GetUIntExtra(INTENT_EXTRA_LIST_COUNT);
window_object_load_error_open(const_cast<utf8*>(path.c_str()), count, objects);
WindowObjectLoadErrorOpen(const_cast<utf8*>(path.c_str()), count, objects);
return nullptr;
}
@ -263,35 +263,35 @@ public:
{
const auto rideId = static_cast<ride_id_t>(intent->GetSIntExtra(INTENT_EXTRA_RIDE_ID));
auto ride = get_ride(rideId);
return ride == nullptr ? nullptr : window_ride_main_open(ride);
return ride == nullptr ? nullptr : WindowRideMainOpen(ride);
}
case WC_TRACK_DESIGN_PLACE:
return window_track_place_open(
return WindowTrackPlaceOpen(
static_cast<track_design_file_ref*>(intent->GetPointerExtra(INTENT_EXTRA_TRACK_DESIGN)));
case WC_TRACK_DESIGN_LIST:
{
RideSelection rideItem;
rideItem.Type = intent->GetUIntExtra(INTENT_EXTRA_RIDE_TYPE);
rideItem.EntryIndex = intent->GetUIntExtra(INTENT_EXTRA_RIDE_ENTRY_INDEX);
return window_track_list_open(rideItem);
return WindowTrackListOpen(rideItem);
}
case WC_SCENARIO_SELECT:
return window_scenarioselect_open(
return WindowScenarioselectOpen(
reinterpret_cast<scenarioselect_callback>(intent->GetPointerExtra(INTENT_EXTRA_CALLBACK)), false);
case WD_VEHICLE:
return window_ride_open_vehicle(static_cast<Vehicle*>(intent->GetPointerExtra(INTENT_EXTRA_VEHICLE)));
return WindowRideOpenVehicle(static_cast<Vehicle*>(intent->GetPointerExtra(INTENT_EXTRA_VEHICLE)));
case WD_TRACK:
return window_ride_open_track(static_cast<TileElement*>(intent->GetPointerExtra(INTENT_EXTRA_TILE_ELEMENT)));
return WindowRideOpenTrack(static_cast<TileElement*>(intent->GetPointerExtra(INTENT_EXTRA_TILE_ELEMENT)));
case INTENT_ACTION_NEW_RIDE_OF_TYPE:
{
// Open ride list window
auto w = window_new_ride_open();
auto w = WindowNewRideOpen();
// Switch to right tab and scroll to ride location
RideSelection rideItem;
rideItem.Type = intent->GetUIntExtra(INTENT_EXTRA_RIDE_TYPE);
rideItem.EntryIndex = intent->GetUIntExtra(INTENT_EXTRA_RIDE_ENTRY_INDEX);
window_new_ride_focus(rideItem);
WindowNewRideFocus(rideItem);
return w;
}
@ -306,11 +306,11 @@ public:
switch (intent.GetWindowClass())
{
case INTENT_ACTION_MAP:
window_map_reset();
WindowMapReset();
break;
case INTENT_ACTION_REFRESH_NEW_RIDES:
window_new_ride_init_vars();
WindowNewRideInitVars();
break;
case INTENT_ACTION_REFRESH_CAMPAIGN_RIDE_LIST:
@ -324,14 +324,14 @@ public:
auto window = window_find_by_class(WC_RIDE_LIST);
if (window != nullptr)
{
window_ride_list_refresh_list(window);
WindowRideListRefreshList(window);
}
break;
}
case INTENT_ACTION_UPDATE_MAZE_CONSTRUCTION:
window_maze_construction_update_pressed_widgets();
WindowMazeConstructionUpdatePressedWidgets();
break;
case INTENT_ACTION_RIDE_CONSTRUCTION_FOCUS:
@ -353,31 +353,31 @@ public:
}
case INTENT_ACTION_RIDE_CONSTRUCTION_UPDATE_PIECES:
window_ride_construction_update_enabled_track_pieces();
WindowRideConstructionUpdateEnabledTrackPieces();
break;
case INTENT_ACTION_RIDE_CONSTRUCTION_UPDATE_ACTIVE_ELEMENTS:
window_ride_construction_update_active_elements_impl();
WindowRideConstructionUpdateActiveElementsImpl();
break;
case INTENT_ACTION_INIT_SCENERY:
window_scenery_init();
WindowSceneryInit();
break;
case INTENT_ACTION_SET_DEFAULT_SCENERY_CONFIG:
window_scenery_set_default_placement_configuration();
WindowScenerySetDefaultPlacementConfiguration();
break;
case INTENT_ACTION_REFRESH_SCENERY:
window_scenery_reset_selected_scenery_items();
WindowSceneryResetSelectedSceneryItems();
break;
case INTENT_ACTION_INVALIDATE_TICKER_NEWS:
window_game_bottom_toolbar_invalidate_news_item();
WindowGameBottomToolbarInvalidateNewsItem();
break;
case INTENT_ACTION_REFRESH_GUEST_LIST:
window_guest_list_refresh_list();
WindowGuestListRefreshList();
break;
case INTENT_ACTION_REFRESH_STAFF_LIST:
@ -387,7 +387,7 @@ public:
}
case INTENT_ACTION_CLEAR_TILE_INSPECTOR_CLIPBOARD:
window_tile_inspector_clear_clipboard();
WindowTileInspectorClearClipboard();
break;
case INTENT_ACTION_INVALIDATE_VEHICLE_WINDOW:
@ -433,7 +433,7 @@ public:
gToolbarDirtyFlags |= BTM_TB_DIRTY_FLAG_PEEP_COUNT;
window_invalidate_by_class(WC_GUEST_LIST);
window_invalidate_by_class(WC_PARK_INFORMATION);
window_guest_list_refresh_list();
WindowGuestListRefreshList();
break;
case INTENT_ACTION_UPDATE_PARK_RATING:
@ -491,7 +491,7 @@ public:
switch (windowClass)
{
case WC_NETWORK_STATUS:
window_network_status_close();
WindowNetworkStatusClose();
break;
default:
@ -501,7 +501,7 @@ public:
void UpdateMapTooltip() override
{
window_map_tooltip_update_visibility();
WindowMapTooltipUpdateVisibility();
}
void HandleInput() override

25
src/openrct2-ui/drawing/engines/opengl/DrawCommands.h
View File

@ -27,15 +27,16 @@ public:
: _numInstances(0)
{
}
[[nodiscard]] bool empty() const
[[nodiscard]] bool empty() const // NOLINT(readability-identifier-naming)
{
return _numInstances == 0;
}
void clear()
void clear() // NOLINT(readability-identifier-naming)
{
_numInstances = 0;
}
T& allocate()
T& allocate() // NOLINT(readability-identifier-naming)
{
if (_numInstances + 1 > _instances.size())
{
@ -43,7 +44,7 @@ public:
}
return _instances[_numInstances++];
}
T& insert(const T& value)
T& insert(const T& value) // NOLINT(readability-identifier-naming)
{
if (_numInstances + 1 > _instances.size())
{
@ -51,11 +52,11 @@ public:
}
return _instances[_numInstances++] = value;
}
[[nodiscard]] size_t size() const
[[nodiscard]] size_t size() const // NOLINT(readability-identifier-naming)
{
return _numInstances;
}
const T* data() const
const T* data() const // NOLINT(readability-identifier-naming)
{
return _instances.data();
}
@ -64,27 +65,27 @@ public:
return _instances.at(idx);
}
typename std::vector<T>::iterator begin()
typename std::vector<T>::iterator begin() // NOLINT(readability-identifier-naming)
{
return _instances.begin();
}
typename std::vector<T>::const_iterator begin() const
typename std::vector<T>::const_iterator begin() const // NOLINT(readability-identifier-naming)
{
return _instances.cbegin();
}
typename std::vector<T>::const_iterator cbegin() const
typename std::vector<T>::const_iterator cbegin() const // NOLINT(readability-identifier-naming)
{
return _instances.cbegin();
}
typename std::vector<T>::iterator end()
typename std::vector<T>::iterator end() // NOLINT(readability-identifier-naming)
{
return _instances.begin() + _numInstances;
}
typename std::vector<T>::const_iterator end() const
typename std::vector<T>::const_iterator end() const // NOLINT(readability-identifier-naming)
{
return _instances.cbegin() + _numInstances;
}
typename std::vector<T>::const_iterator cend() const
typename std::vector<T>::const_iterator cend() const // NOLINT(readability-identifier-naming)
{
return _instances.cbegin() + _numInstances;
}

2
src/openrct2-ui/input/InputManager.cpp
View File

@ -202,7 +202,7 @@ void InputManager::Process(const InputEvent& e)
{
if (e.State == InputEventState::Release)
{
window_text_input_key(w, e.Button);
WindowTextInputKey(w, e.Button);
}
return;
}

14
src/openrct2-ui/input/MouseInput.cpp
View File

@ -280,7 +280,7 @@ static void GameHandleInputMouse(const ScreenCoordsXY& screenCoords, MouseState
switch (_inputState)
{
case InputState::Reset:
window_tooltip_reset(screenCoords);
WindowTooltipReset(screenCoords);
// fall-through
case InputState::Normal:
switch (state)
@ -936,7 +936,7 @@ static void InputWidgetOver(const ScreenCoordsXY& screenCoords, rct_window* w, r
WidgetScrollGetPart(w, widget, screenCoords, newScreenCoords, &scroll_part, &scrollId);
if (scroll_part != SCROLL_PART_VIEW)
window_tooltip_close();
WindowTooltipClose();
else
{
window_event_scroll_mouseover_call(w, scrollId, newScreenCoords);
@ -1374,7 +1374,7 @@ void InputStateWidgetPressed(
if (gDropdownIsColour && gDropdownLastColourHover != dropdown_index)
{
gDropdownLastColourHover = dropdown_index;
window_tooltip_close();
WindowTooltipClose();
static constexpr const rct_string_id colourTooltips[] = {
STR_COLOUR_BLACK_TIP,
@ -1410,7 +1410,7 @@ void InputStateWidgetPressed(
STR_COLOUR_BRIGHT_PINK_TIP,
STR_COLOUR_LIGHT_PINK_TIP,
};
window_tooltip_show(OpenRCT2String{ colourTooltips[dropdown_index], {} }, screenCoords);
WindowTooltipShow(OpenRCT2String{ colourTooltips[dropdown_index], {} }, screenCoords);
}
if (dropdown_index < Dropdown::ItemsMaxSize && Dropdown::IsDisabled(dropdown_index))
@ -1429,7 +1429,7 @@ void InputStateWidgetPressed(
else
{
gDropdownLastColourHover = -1;
window_tooltip_close();
WindowTooltipClose();
}
}
@ -1443,7 +1443,7 @@ static void InputUpdateTooltip(rct_window* w, rct_widgetindex widgetIndex, const
if (_tooltipNotShownTicks > 50 && w != nullptr && WidgetIsVisible(w, widgetIndex))
{
gTooltipTimeout = 0;
window_tooltip_open(w, widgetIndex, screenCoords);
WindowTooltipOpen(w, widgetIndex, screenCoords);
}
}
@ -1458,7 +1458,7 @@ static void InputUpdateTooltip(rct_window* w, rct_widgetindex widgetIndex, const
|| gTooltipWidget.window_number != w->number || gTooltipWidget.widget_index != widgetIndex
|| !WidgetIsVisible(w, widgetIndex))
{
window_tooltip_close();
WindowTooltipClose();
}
gTooltipTimeout += gCurrentDeltaTime;

5
src/openrct2-ui/interface/Graph.cpp
View File

@ -131,7 +131,7 @@ static const ScreenCoordsXY ScreenCoordsForHistoryIndex(
return coords;
}
static const FinancialTooltipInfo finance_tooltip_info_from_money(
static const FinancialTooltipInfo FinanceTooltipInfoFromMoney(
const money64* history, const int32_t historyCount, const int32_t modifier, const int32_t offset,
const ScreenRect& chartFrame, const ScreenCoordsXY& cursorPosition)
{
@ -246,8 +246,7 @@ namespace Graph
return;
}
const auto info = finance_tooltip_info_from_money(
history, ChartMaxDataCount, modifier, offset, chartFrame, cursorPosition);
const auto info = FinanceTooltipInfoFromMoney(history, ChartMaxDataCount, modifier, offset, chartFrame, cursorPosition);
if (info.money == MONEY64_UNDEFINED)
{

6
src/openrct2-ui/interface/Widget.cpp
View File

@ -436,7 +436,7 @@ static void WidgetTextInset(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetind
WidgetText(dpi, w, widgetIndex);
}
static std::pair<rct_string_id, void*> widget_get_stringid_and_args(const rct_widget& widget)
static std::pair<rct_string_id, void*> WidgetGetStringidAndArgs(const rct_widget& widget)
{
auto stringId = widget.text;
void* formatArgs = gCommonFormatArgs;
@ -471,7 +471,7 @@ static void WidgetGroupboxDraw(rct_drawpixelinfo* dpi, rct_window* w, rct_widget
auto textRight = l;
// Text
auto [stringId, formatArgs] = widget_get_stringid_and_args(widget);
auto [stringId, formatArgs] = WidgetGetStringidAndArgs(widget);
if (stringId != STR_NONE)
{
uint8_t colour = w->colours[widget.colour] & 0x7F;
@ -639,7 +639,7 @@ static void WidgetCheckboxDraw(rct_drawpixelinfo* dpi, rct_window* w, rct_widget
if (widget.text == STR_NONE)
return;
auto [stringId, formatArgs] = widget_get_stringid_and_args(widget);
auto [stringId, formatArgs] = WidgetGetStringidAndArgs(widget);
gfx_draw_string_left_centred(dpi, stringId, formatArgs, colour, { midLeft + ScreenCoordsXY{ 14, 0 } });
}

2
src/openrct2-ui/interface/Window.cpp
View File

@ -756,5 +756,5 @@ void Window::TextInputOpen(
rct_widgetindex callWidget, rct_string_id title, rct_string_id description, const Formatter& descriptionArgs,
rct_string_id existingText, uintptr_t existingArgs, int32_t maxLength)
{
window_text_input_open(this, callWidget, title, description, descriptionArgs, existingText, existingArgs, maxLength);
WindowTextInputOpen(this, callWidget, title, description, descriptionArgs, existingText, existingArgs, maxLength);
}

8
src/openrct2-ui/scripting/ScUi.hpp
View File

@ -215,7 +215,7 @@ namespace OpenRCT2::Scripting
void showError(const std::string& title, const std::string& message)
{
window_error_open(title, message);
WindowErrorOpen(title, message);
}
void showTextInput(const DukValue& desc)
@ -229,7 +229,7 @@ namespace OpenRCT2::Scripting
auto initialValue = AsOrDefault(desc["initialValue"], "");
auto maxLength = AsOrDefault(desc["maxLength"], MaxLengthAllowed);
auto callback = desc["callback"];
window_text_input_open(
WindowTextInputOpen(
title, description, initialValue, std::clamp(maxLength, 0, MaxLengthAllowed),
[this, plugin, callback](std::string_view value) {
auto dukValue = ToDuk(_scriptEngine.GetContext(), value);
@ -266,7 +266,7 @@ namespace OpenRCT2::Scripting
else
throw DukException();
window_loadsave_open(
WindowLoadsaveOpen(
loadSaveType, defaultPath,
[this, plugin, callback](int32_t result, std::string_view path) {
if (result == MODAL_RESULT_OK)
@ -288,7 +288,7 @@ namespace OpenRCT2::Scripting
auto plugin = _scriptEngine.GetExecInfo().GetCurrentPlugin();
auto callback = desc["callback"];
window_scenarioselect_open(
WindowScenarioselectOpen(
[this, plugin, callback](std::string_view path) {
auto dukValue = GetScenarioFile(path);
_scriptEngine.ExecutePluginCall(plugin, callback, { dukValue }, false);

50
src/openrct2-ui/windows/About.cpp
View File

@ -91,25 +91,25 @@ static uint64_t window_about_page_enabled_widgets[] = {
DEFAULT_ENABLED_WIDGETS,
};
static void window_about_openrct2_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_about_openrct2_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_about_openrct2_invalidate(rct_window *w);
static void WindowAboutOpenRCT2Mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowAboutOpenRCT2Paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowAboutOpenRCT2Invalidate(rct_window *w);
static void window_about_rct2_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_about_rct2_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_about_openrct2_common_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowAboutRCT2Mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowAboutRCT2Paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowAboutOpenRCT2CommonPaint(rct_window *w, rct_drawpixelinfo *dpi);
static rct_window_event_list window_about_openrct2_events([](auto& events)
{
events.mouse_up = &window_about_openrct2_mouseup;
events.invalidate = &window_about_openrct2_invalidate;
events.paint = &window_about_openrct2_paint;
events.mouse_up = &WindowAboutOpenRCT2Mouseup;
events.invalidate = &WindowAboutOpenRCT2Invalidate;
events.paint = &WindowAboutOpenRCT2Paint;
});
static rct_window_event_list window_about_rct2_events([](auto& events)
{
events.mouse_up = &window_about_rct2_mouseup;
events.paint = &window_about_rct2_paint;
events.mouse_up = &WindowAboutRCT2Mouseup;
events.paint = &WindowAboutRCT2Paint;
});
static rct_window_event_list *window_about_page_events[] = {
@ -118,13 +118,13 @@ static rct_window_event_list *window_about_page_events[] = {
};
// clang-format on
static void window_about_set_page(rct_window* w, int32_t page);
static void WindowAboutSetPage(rct_window* w, int32_t page);
/**
*
* rct2: 0x0066D2AC
*/
rct_window* window_about_open()
rct_window* WindowAboutOpen()
{
rct_window* window;
@ -135,7 +135,7 @@ rct_window* window_about_open()
window = WindowCreateCentred(WW, WH, window_about_page_events[WINDOW_ABOUT_PAGE_OPENRCT2], WC_ABOUT, 0);
window_about_set_page(window, WINDOW_ABOUT_PAGE_OPENRCT2);
WindowAboutSetPage(window, WINDOW_ABOUT_PAGE_OPENRCT2);
WindowInitScrollWidgets(window);
@ -144,7 +144,7 @@ rct_window* window_about_open()
#pragma region OpenRCT2
static void window_about_openrct2_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowAboutOpenRCT2Mouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -153,7 +153,7 @@ static void window_about_openrct2_mouseup(rct_window* w, rct_widgetindex widgetI
break;
case WIDX_TAB_ABOUT_OPENRCT2:
case WIDX_TAB_ABOUT_RCT2:
window_about_set_page(w, widgetIndex - WIDX_TAB_ABOUT_OPENRCT2);
WindowAboutSetPage(w, widgetIndex - WIDX_TAB_ABOUT_OPENRCT2);
break;
case WIDX_JOIN_DISCORD:
OpenRCT2::GetContext()->GetUiContext()->OpenURL("https://discord.gg/ZXZd8D8");
@ -170,7 +170,7 @@ static void window_about_openrct2_mouseup(rct_window* w, rct_widgetindex widgetI
}
}
static void window_about_openrct2_common_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowAboutOpenRCT2CommonPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
@ -196,9 +196,9 @@ static void window_about_openrct2_common_paint(rct_window* w, rct_drawpixelinfo*
}
}
static void window_about_openrct2_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowAboutOpenRCT2Paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_about_openrct2_common_paint(w, dpi);
WindowAboutOpenRCT2CommonPaint(w, dpi);
// Draw logo on placeholder widget
ScreenCoordsXY logoCoords = w->windowPos
@ -220,7 +220,7 @@ static void window_about_openrct2_paint(rct_window* w, rct_drawpixelinfo* dpi)
DrawTextWrapped(dpi, centrePos, width, STR_STRING, ft, { w->colours[1], TextAlignment::CENTRE });
}
static void window_about_openrct2_invalidate(rct_window* w)
static void WindowAboutOpenRCT2Invalidate(rct_window* w)
{
if (w->page == WINDOW_ABOUT_PAGE_OPENRCT2 && OpenRCT2::GetContext()->HasNewVersionInfo())
{
@ -238,7 +238,7 @@ static void window_about_openrct2_invalidate(rct_window* w)
*
* rct2: 0x0066D4D5
*/
static void window_about_rct2_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowAboutRCT2Mouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -247,7 +247,7 @@ static void window_about_rct2_mouseup(rct_window* w, rct_widgetindex widgetIndex
break;
case WIDX_TAB_ABOUT_OPENRCT2:
case WIDX_TAB_ABOUT_RCT2:
window_about_set_page(w, widgetIndex - WIDX_TAB_ABOUT_OPENRCT2);
WindowAboutSetPage(w, widgetIndex - WIDX_TAB_ABOUT_OPENRCT2);
break;
}
}
@ -256,9 +256,9 @@ static void window_about_rct2_mouseup(rct_window* w, rct_widgetindex widgetIndex
*
* rct2: 0x0066D321
*/
static void window_about_rct2_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowAboutRCT2Paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_about_openrct2_common_paint(w, dpi);
WindowAboutOpenRCT2CommonPaint(w, dpi);
int32_t yPage = w->windowPos.y + w->widgets[WIDX_PAGE_BACKGROUND].top + 5;
@ -293,7 +293,7 @@ static void window_about_rct2_paint(rct_window* w, rct_drawpixelinfo* dpi)
#pragma endregion RCT2
static void window_about_set_page(rct_window* w, int32_t page)
static void WindowAboutSetPage(rct_window* w, int32_t page)
{
w->page = page;
w->frame_no = 0;

4
src/openrct2-ui/windows/Banner.cpp
View File

@ -200,7 +200,7 @@ public:
break;
}
case WIDX_BANNER_TEXT:
window_text_input_raw_open(
WindowTextInputRawOpen(
this, WIDX_BANNER_TEXT, STR_BANNER_TEXT, STR_ENTER_BANNER_TEXT, {}, banner->GetText().c_str(), 32);
break;
case WIDX_BANNER_NO_ENTRY:
@ -297,7 +297,7 @@ public:
*
* rct2: 0x006BA305
*/
rct_window* window_banner_open(rct_windownumber number)
rct_window* WindowBannerOpen(rct_windownumber number)
{
auto w = static_cast<BannerWindow*>(window_bring_to_front_by_number(WC_BANNER, number));

2
src/openrct2-ui/windows/Changelog.cpp
View File

@ -314,7 +314,7 @@ private:
}
};
rct_window* window_changelog_open(int personality)
rct_window* WindowChangelogOpen(int personality)
{
auto* window = window_bring_to_front_by_class(WC_CHANGELOG);
if (window == nullptr)

4
src/openrct2-ui/windows/Cheats.cpp
View File

@ -866,7 +866,7 @@ private:
break;
case WIDX_MONEY_SPINNER:
money_to_string(_moneySpinnerValue, _moneySpinnerText, MONEY_STRING_MAXLENGTH, false);
window_text_input_raw_open(
WindowTextInputRawOpen(
this, WIDX_MONEY_SPINNER, STR_ENTER_NEW_VALUE, STR_ENTER_NEW_VALUE, {}, _moneySpinnerText,
MONEY_STRING_MAXLENGTH);
break;
@ -1199,7 +1199,7 @@ private:
}
};
rct_window* window_cheats_open()
rct_window* WindowCheatsOpen()
{
auto* window = window_bring_to_front_by_class(WC_CHEATS);
if (window == nullptr)

6
src/openrct2-ui/windows/ClearScenery.cpp
View File

@ -81,7 +81,7 @@ public:
void OnClose() override
{
if (clear_scenery_tool_is_active())
if (ClearSceneryToolIsActive())
tool_cancel();
}
@ -155,7 +155,7 @@ public:
{
frame_no++;
// Close window if another tool is open
if (!clear_scenery_tool_is_active())
if (!ClearSceneryToolIsActive())
Close();
}
@ -195,7 +195,7 @@ public:
}
};
rct_window* window_clear_scenery_open()
rct_window* WindowClearSceneryOpen()
{
auto* w = static_cast<CleanSceneryWindow*>(window_bring_to_front_by_class(WC_CLEAR_SCENERY));

36
src/openrct2-ui/windows/CustomCurrency.cpp
View File

@ -43,24 +43,24 @@ static rct_widget window_custom_currency_widgets[] = {
};
static void custom_currency_window_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget);
static void custom_currency_window_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void custom_currency_window_dropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void custom_currency_window_text_input(struct rct_window *w, rct_widgetindex widgetIndex, char *text);
static void custom_currency_window_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void CustomCurrencyWindowMousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget);
static void CustomCurrencyWindowMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void CustomCurrencyWindowDropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void CustomCurrencyWindowTextInput(struct rct_window *w, rct_widgetindex widgetIndex, char *text);
static void CustomCurrencyWindowPaint(rct_window *w, rct_drawpixelinfo *dpi);
static rct_window_event_list _windowCustomCurrencyEvents([](auto& events)
{
events.mouse_up = &custom_currency_window_mouseup;
events.mouse_down = &custom_currency_window_mousedown;
events.dropdown = &custom_currency_window_dropdown;
events.text_input = &custom_currency_window_text_input;
events.paint = &custom_currency_window_paint;
events.mouse_up = &CustomCurrencyWindowMouseup;
events.mouse_down = &CustomCurrencyWindowMousedown;
events.dropdown = &CustomCurrencyWindowDropdown;
events.text_input = &CustomCurrencyWindowTextInput;
events.paint = &CustomCurrencyWindowPaint;
});
// clang-format on
rct_window* custom_currency_window_open()
rct_window* CustomCurrencyWindowOpen()
{
rct_window* window;
@ -83,7 +83,7 @@ rct_window* custom_currency_window_open()
return window;
}
static void custom_currency_window_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void CustomCurrencyWindowMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
widget = &w->widgets[widgetIndex - 1];
@ -133,26 +133,26 @@ static void custom_currency_window_mousedown(rct_window* w, rct_widgetindex widg
break;
case WIDX_SYMBOL_TEXT:
window_text_input_raw_open(
WindowTextInputRawOpen(
w, WIDX_SYMBOL_TEXT, STR_CUSTOM_CURRENCY_SYMBOL_INPUT_TITLE, STR_CUSTOM_CURRENCY_SYMBOL_INPUT_DESC, {},
CurrencyDescriptors[EnumValue(CurrencyType::Custom)].symbol_unicode, CURRENCY_SYMBOL_MAX_SIZE);
break;
}
}
static void custom_currency_window_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void CustomCurrencyWindowMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
case WIDX_RATE:
window_text_input_open(
WindowTextInputOpen(
w, WIDX_RATE, STR_RATE_INPUT_TITLE, STR_RATE_INPUT_DESC, {}, STR_FORMAT_INTEGER,
static_cast<uint32_t>(CurrencyDescriptors[EnumValue(CurrencyType::Custom)].rate), CURRENCY_RATE_MAX_NUM_DIGITS);
break;
}
}
static void custom_currency_window_dropdown([[maybe_unused]] rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void CustomCurrencyWindowDropdown([[maybe_unused]] rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
{
if (dropdownIndex == -1)
return;
@ -177,7 +177,7 @@ static void custom_currency_window_dropdown([[maybe_unused]] rct_window* w, rct_
}
}
static void custom_currency_window_text_input([[maybe_unused]] struct rct_window* w, rct_widgetindex widgetIndex, char* text)
static void CustomCurrencyWindowTextInput([[maybe_unused]] struct rct_window* w, rct_widgetindex widgetIndex, char* text)
{
if (text == nullptr)
return;
@ -209,7 +209,7 @@ static void custom_currency_window_text_input([[maybe_unused]] struct rct_window
}
}
static void custom_currency_window_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void CustomCurrencyWindowPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
auto ft = Formatter::Common();
ft.Add<money64>(MONEY(10, 0));

20
src/openrct2-ui/windows/DebugPaint.cpp
View File

@ -45,19 +45,19 @@ static rct_widget window_debug_paint_widgets[] = {
WIDGETS_END,
};
static void window_debug_paint_mouseup(rct_window * w, rct_widgetindex widgetIndex);
static void window_debug_paint_invalidate(rct_window * w);
static void window_debug_paint_paint(rct_window * w, rct_drawpixelinfo * dpi);
static void WindowDebugPaintMouseup(rct_window * w, rct_widgetindex widgetIndex);
static void WindowDebugPaintInvalidate(rct_window * w);
static void WindowDebugPaintPaint(rct_window * w, rct_drawpixelinfo * dpi);
static rct_window_event_list window_debug_paint_events([](auto& events)
{
events.mouse_up = &window_debug_paint_mouseup;
events.invalidate = &window_debug_paint_invalidate;
events.paint = &window_debug_paint_paint;
events.mouse_up = &WindowDebugPaintMouseup;
events.invalidate = &WindowDebugPaintInvalidate;
events.paint = &WindowDebugPaintPaint;
});
// clang-format on
rct_window* window_debug_paint_open()
rct_window* WindowDebugPaintOpen()
{
rct_window* window;
@ -84,7 +84,7 @@ rct_window* window_debug_paint_open()
return window;
}
static void window_debug_paint_mouseup([[maybe_unused]] rct_window* w, rct_widgetindex widgetIndex)
static void WindowDebugPaintMouseup([[maybe_unused]] rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -115,7 +115,7 @@ static void window_debug_paint_mouseup([[maybe_unused]] rct_window* w, rct_widge
}
}
static void window_debug_paint_invalidate(rct_window* w)
static void WindowDebugPaintInvalidate(rct_window* w)
{
const auto& ls = OpenRCT2::GetContext()->GetLocalisationService();
const auto currentLanguage = ls.GetCurrentLanguage();
@ -158,7 +158,7 @@ static void window_debug_paint_invalidate(rct_window* w)
WidgetSetCheckboxValue(w, WIDX_TOGGLE_SHOW_DIRTY_VISUALS, gShowDirtyVisuals);
}
static void window_debug_paint_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowDebugPaintPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
}

28
src/openrct2-ui/windows/DemolishRidePrompt.cpp
View File

@ -46,26 +46,26 @@ static rct_widget window_ride_refurbish_widgets[] = {
WIDGETS_END,
};
static void window_ride_demolish_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_ride_demolish_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_ride_refurbish_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_ride_refurbish_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowRideDemolishMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowRideDemolishPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowRideRefurbishMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowRideRefurbishPaint(rct_window *w, rct_drawpixelinfo *dpi);
//0x0098E2E4
static rct_window_event_list window_ride_demolish_events([](auto& events)
{
events.mouse_up = &window_ride_demolish_mouseup;
events.paint = &window_ride_demolish_paint;
events.mouse_up = &WindowRideDemolishMouseup;
events.paint = &WindowRideDemolishPaint;
});
// clang-format on
static rct_window_event_list window_ride_refurbish_events([](auto& events) {
events.mouse_up = &window_ride_refurbish_mouseup;
events.paint = &window_ride_refurbish_paint;
events.mouse_up = &WindowRideRefurbishMouseup;
events.paint = &WindowRideRefurbishPaint;
});
/** Based off of rct2: 0x006B486A */
rct_window* window_ride_demolish_prompt_open(Ride* ride)
rct_window* WindowRideDemolishPromptOpen(Ride* ride)
{
rct_window* w;
@ -90,7 +90,7 @@ rct_window* window_ride_demolish_prompt_open(Ride* ride)
return w;
}
rct_window* window_ride_refurbish_prompt_open(Ride* ride)
rct_window* WindowRideRefurbishPromptOpen(Ride* ride)
{
rct_window* w;
@ -119,7 +119,7 @@ rct_window* window_ride_refurbish_prompt_open(Ride* ride)
*
* rct2: 0x006B4933
*/
static void window_ride_demolish_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowRideDemolishMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -136,7 +136,7 @@ static void window_ride_demolish_mouseup(rct_window* w, rct_widgetindex widgetIn
}
}
static void window_ride_refurbish_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowRideRefurbishMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -157,7 +157,7 @@ static void window_ride_refurbish_mouseup(rct_window* w, rct_widgetindex widgetI
*
* rct2: 0x006B48E5
*/
static void window_ride_demolish_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowRideDemolishPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
@ -174,7 +174,7 @@ static void window_ride_demolish_paint(rct_window* w, rct_drawpixelinfo* dpi)
}
}
static void window_ride_refurbish_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowRideRefurbishPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);

6
src/openrct2-ui/windows/Dropdown.cpp
View File

@ -89,12 +89,12 @@ void Dropdown::SetDisabled(int32_t index, bool value)
_dropdownItemsDisabled[index] = value;
}
static void window_dropdown_paint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowDropdownPaint(rct_window* w, rct_drawpixelinfo* dpi);
// clang-format off
static rct_window_event_list window_dropdown_events([](auto& events)
{
events.paint = &window_dropdown_paint;
events.paint = &WindowDropdownPaint;
});
// clang-format on
@ -285,7 +285,7 @@ void WindowDropdownClose()
window_close_by_class(WC_DROPDOWN);
}
static void window_dropdown_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowDropdownPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);

94
src/openrct2-ui/windows/EditorBottomToolbar.cpp
View File

@ -43,45 +43,45 @@ static rct_widget window_editor_bottom_toolbar_widgets[] = {
WIDGETS_END,
};
static void window_editor_bottom_toolbar_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_editor_bottom_toolbar_invalidate(rct_window *w);
static void window_editor_bottom_toolbar_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowEditorBottomToolbarMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowEditorBottomToolbarInvalidate(rct_window *w);
static void WindowEditorBottomToolbarPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_editor_bottom_toolbar_jump_back_to_object_selection();
static void window_editor_bottom_toolbar_jump_back_to_landscape_editor();
static void window_editor_bottom_toolbar_jump_back_to_invention_list_set_up();
static void window_editor_bottom_toolbar_jump_back_to_options_selection();
static void WindowEditorBottomToolbarJumpBackToObjectSelection();
static void WindowEditorBottomToolbarJumpBackToLandscapeEditor();
static void WindowEditorBottomToolbarJumpBackToInventionListSetUp();
static void WindowEditorBottomToolbarJumpBackToOptionsSelection();
static void window_editor_bottom_toolbar_jump_forward_from_object_selection();
static void window_editor_bottom_toolbar_jump_forward_to_invention_list_set_up();
static void window_editor_bottom_toolbar_jump_forward_to_options_selection();
static void window_editor_bottom_toolbar_jump_forward_to_objective_selection();
static void window_editor_bottom_toolbar_jump_forward_to_save_scenario();
static void WindowEditorBottomToolbarJumpForwardFromObjectSelection();
static void WindowEditorBottomToolbarJumpForwardToInventionListSetUp();
static void WindowEditorBottomToolbarJumpForwardToOptionsSelection();
static void WindowEditorBottomToolbarJumpForwardToObjectiveSelection();
static void WindowEditorBottomToolbarJumpForwardToSaveScenario();
static rct_window_event_list window_editor_bottom_toolbar_events([](auto& events)
{
events.mouse_up = &window_editor_bottom_toolbar_mouseup;
events.invalidate = &window_editor_bottom_toolbar_invalidate;
events.paint = &window_editor_bottom_toolbar_paint;
events.mouse_up = &WindowEditorBottomToolbarMouseup;
events.invalidate = &WindowEditorBottomToolbarInvalidate;
events.paint = &WindowEditorBottomToolbarPaint;
});
static EMPTY_ARGS_VOID_POINTER *previous_button_mouseup_events[] = {
nullptr,
window_editor_bottom_toolbar_jump_back_to_object_selection,
window_editor_bottom_toolbar_jump_back_to_landscape_editor,
window_editor_bottom_toolbar_jump_back_to_invention_list_set_up,
window_editor_bottom_toolbar_jump_back_to_options_selection,
WindowEditorBottomToolbarJumpBackToObjectSelection,
WindowEditorBottomToolbarJumpBackToLandscapeEditor,
WindowEditorBottomToolbarJumpBackToInventionListSetUp,
WindowEditorBottomToolbarJumpBackToOptionsSelection,
nullptr,
window_editor_bottom_toolbar_jump_back_to_object_selection,
WindowEditorBottomToolbarJumpBackToObjectSelection,
nullptr,
};
static EMPTY_ARGS_VOID_POINTER *next_button_mouseup_events[] = {
window_editor_bottom_toolbar_jump_forward_from_object_selection,
window_editor_bottom_toolbar_jump_forward_to_invention_list_set_up,
window_editor_bottom_toolbar_jump_forward_to_options_selection,
window_editor_bottom_toolbar_jump_forward_to_objective_selection,
window_editor_bottom_toolbar_jump_forward_to_save_scenario,
WindowEditorBottomToolbarJumpForwardFromObjectSelection,
WindowEditorBottomToolbarJumpForwardToInventionListSetUp,
WindowEditorBottomToolbarJumpForwardToOptionsSelection,
WindowEditorBottomToolbarJumpForwardToObjectiveSelection,
WindowEditorBottomToolbarJumpForwardToSaveScenario,
nullptr,
nullptr,
nullptr,
@ -103,7 +103,7 @@ static constexpr const rct_string_id EditorStepNames[] = {
* Creates the main editor top toolbar window.
* rct2: 0x0066F052 (part of 0x0066EF38)
*/
rct_window* window_editor_bottom_toolbar_open()
rct_window* WindowEditorBottomToolbarOpen()
{
rct_window* window = WindowCreate(
ScreenCoordsXY(0, context_get_height() - 32), context_get_width(), 32, &window_editor_bottom_toolbar_events,
@ -123,7 +123,7 @@ rct_window* window_editor_bottom_toolbar_open()
*
* rct2: 0x0066F619
*/
void window_editor_bottom_toolbar_jump_back_to_object_selection()
void WindowEditorBottomToolbarJumpBackToObjectSelection()
{
window_close_all();
gEditorStep = EditorStep::ObjectSelection;
@ -134,7 +134,7 @@ void window_editor_bottom_toolbar_jump_back_to_object_selection()
*
* rct2: 0x0066F62C
*/
void window_editor_bottom_toolbar_jump_back_to_landscape_editor()
void WindowEditorBottomToolbarJumpBackToLandscapeEditor()
{
window_close_all();
set_all_scenery_items_invented();
@ -148,7 +148,7 @@ void window_editor_bottom_toolbar_jump_back_to_landscape_editor()
*
* rct2: 0x0066F64E
*/
static void window_editor_bottom_toolbar_jump_back_to_invention_list_set_up()
static void WindowEditorBottomToolbarJumpBackToInventionListSetUp()
{
window_close_all();
context_open_window(WC_EDITOR_INVENTION_LIST);
@ -160,7 +160,7 @@ static void window_editor_bottom_toolbar_jump_back_to_invention_list_set_up()
*
* rct2: 0x0066F666
*/
void window_editor_bottom_toolbar_jump_back_to_options_selection()
void WindowEditorBottomToolbarJumpBackToOptionsSelection()
{
window_close_all();
context_open_window(WC_EDITOR_SCENARIO_OPTIONS);
@ -172,7 +172,7 @@ void window_editor_bottom_toolbar_jump_back_to_options_selection()
*
* rct2: 0x006AB1CE
*/
static bool window_editor_bottom_toolbar_check_object_selection()
static bool WindowEditorBottomToolbarCheckObjectSelection()
{
rct_window* w;
@ -197,9 +197,9 @@ static bool window_editor_bottom_toolbar_check_object_selection()
*
* rct2: 0x0066F6B0
*/
void window_editor_bottom_toolbar_jump_forward_from_object_selection()
void WindowEditorBottomToolbarJumpForwardFromObjectSelection()
{
if (!window_editor_bottom_toolbar_check_object_selection())
if (!WindowEditorBottomToolbarCheckObjectSelection())
return;
finish_object_selection();
@ -217,7 +217,7 @@ void window_editor_bottom_toolbar_jump_forward_from_object_selection()
*
* rct2: 0x0066F758
*/
void window_editor_bottom_toolbar_jump_forward_to_invention_list_set_up()
void WindowEditorBottomToolbarJumpForwardToInventionListSetUp()
{
auto [checksPassed, errorString] = Editor::CheckPark();
if (checksPassed)
@ -238,7 +238,7 @@ void window_editor_bottom_toolbar_jump_forward_to_invention_list_set_up()
*
* rct2: 0x0066f790
*/
void window_editor_bottom_toolbar_jump_forward_to_options_selection()
void WindowEditorBottomToolbarJumpForwardToOptionsSelection()
{
window_close_all();
context_open_window(WC_EDITOR_SCENARIO_OPTIONS);
@ -250,7 +250,7 @@ void window_editor_bottom_toolbar_jump_forward_to_options_selection()
*
* rct2: 0x0066f7a8
*/
void window_editor_bottom_toolbar_jump_forward_to_objective_selection()
void WindowEditorBottomToolbarJumpForwardToObjectiveSelection()
{
window_close_all();
context_open_window(WC_EDITOR_OBJECTIVE_OPTIONS);
@ -262,7 +262,7 @@ void window_editor_bottom_toolbar_jump_forward_to_objective_selection()
*
* rct2: 0x0066F7C0
*/
void window_editor_bottom_toolbar_jump_forward_to_save_scenario()
void WindowEditorBottomToolbarJumpForwardToSaveScenario()
{
if (!scenario_prepare_for_save())
{
@ -282,7 +282,7 @@ void window_editor_bottom_toolbar_jump_forward_to_save_scenario()
*
* rct2: 0x0066F5AE
*/
static void window_editor_bottom_toolbar_mouseup([[maybe_unused]] rct_window* w, rct_widgetindex widgetIndex)
static void WindowEditorBottomToolbarMouseup([[maybe_unused]] rct_window* w, rct_widgetindex widgetIndex)
{
if (widgetIndex == WIDX_PREVIOUS_STEP_BUTTON)
{
@ -298,13 +298,13 @@ static void window_editor_bottom_toolbar_mouseup([[maybe_unused]] rct_window* w,
}
}
static void hide_previous_step_button()
static void HidePreviousStepButton()
{
window_editor_bottom_toolbar_widgets[WIDX_PREVIOUS_STEP_BUTTON].type = WindowWidgetType::Empty;
window_editor_bottom_toolbar_widgets[WIDX_PREVIOUS_IMAGE].type = WindowWidgetType::Empty;
}
static void hide_next_step_button()
static void HideNextStepButton()
{
window_editor_bottom_toolbar_widgets[WIDX_NEXT_STEP_BUTTON].type = WindowWidgetType::Empty;
window_editor_bottom_toolbar_widgets[WIDX_NEXT_IMAGE].type = WindowWidgetType::Empty;
@ -314,7 +314,7 @@ static void hide_next_step_button()
*
* rct2: 0x0066F1C9
*/
void window_editor_bottom_toolbar_invalidate(rct_window* w)
void WindowEditorBottomToolbarInvalidate(rct_window* w)
{
ColourSchemeUpdateByClass(
w, (gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) ? WC_EDITOR_SCENARIO_BOTTOM_TOOLBAR : WC_EDITOR_TRACK_BOTTOM_TOOLBAR);
@ -332,24 +332,24 @@ void window_editor_bottom_toolbar_invalidate(rct_window* w)
if (gScreenFlags & SCREEN_FLAGS_TRACK_MANAGER)
{
hide_previous_step_button();
hide_next_step_button();
HidePreviousStepButton();
HideNextStepButton();
}
else
{
if (gEditorStep == EditorStep::ObjectSelection)
{
hide_previous_step_button();
HidePreviousStepButton();
}
else if (gEditorStep == EditorStep::RollercoasterDesigner)
{
hide_next_step_button();
HideNextStepButton();
}
else if (!(gScreenFlags & SCREEN_FLAGS_TRACK_DESIGNER))
{
if (GetNumFreeEntities() != MAX_ENTITIES || gParkFlags & PARK_FLAGS_SPRITES_INITIALISED)
{
hide_previous_step_button();
HidePreviousStepButton();
}
}
}
@ -359,7 +359,7 @@ void window_editor_bottom_toolbar_invalidate(rct_window* w)
*
* rct2: 0x0066F25C
*/
void window_editor_bottom_toolbar_paint(rct_window* w, rct_drawpixelinfo* dpi)
void WindowEditorBottomToolbarPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
bool drawPreviousButton = false;
bool drawNextButton = false;

131
src/openrct2-ui/windows/EditorInventionsList.cpp
View File

@ -67,46 +67,46 @@ static rct_widget window_editor_inventions_list_drag_widgets[] = {
#pragma region Events
static void window_editor_inventions_list_close(rct_window *w);
static void window_editor_inventions_list_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_editor_inventions_list_resize(rct_window *w);
static void window_editor_inventions_list_update(rct_window *w);
static void window_editor_inventions_list_scrollgetheight(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void window_editor_inventions_list_scrollmousedown(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void window_editor_inventions_list_scrollmouseover(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void window_editor_inventions_list_cursor(rct_window *w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords, CursorID *cursorId);
static void window_editor_inventions_list_invalidate(rct_window *w);
static void window_editor_inventions_list_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_editor_inventions_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
static void WindowEditorInventionsListClose(rct_window *w);
static void WindowEditorInventionsListMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowEditorInventionsListResize(rct_window *w);
static void WindowEditorInventionsListUpdate(rct_window *w);
static void WindowEditorInventionsListScrollgetheight(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void WindowEditorInventionsListScrollmousedown(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowEditorInventionsListScrollmouseover(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowEditorInventionsListCursor(rct_window *w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords, CursorID *cursorId);
static void WindowEditorInventionsListInvalidate(rct_window *w);
static void WindowEditorInventionsListPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowEditorInventionsListScrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
static void window_editor_inventions_list_drag_cursor(rct_window *w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords, CursorID *cursorId);
static void window_editor_inventions_list_drag_moved(rct_window* w, const ScreenCoordsXY& screenCoords);
static void window_editor_inventions_list_drag_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowEditorInventionsListDragCursor(rct_window *w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords, CursorID *cursorId);
static void WindowEditorInventionsListDragMoved(rct_window* w, const ScreenCoordsXY& screenCoords);
static void WindowEditorInventionsListDragPaint(rct_window *w, rct_drawpixelinfo *dpi);
static std::pair<rct_string_id, Formatter> window_editor_inventions_list_prepare_name(const ResearchItem * researchItem, bool withGap);
static std::pair<rct_string_id, Formatter> WindowEditorInventionsListPrepareName(const ResearchItem * researchItem, bool withGap);
// 0x0098177C
static rct_window_event_list window_editor_inventions_list_events([](auto& events)
{
events.close = &window_editor_inventions_list_close;
events.mouse_up = &window_editor_inventions_list_mouseup;
events.resize = &window_editor_inventions_list_resize;
events.update = &window_editor_inventions_list_update;
events.get_scroll_size = &window_editor_inventions_list_scrollgetheight;
events.scroll_mousedown = &window_editor_inventions_list_scrollmousedown;
events.scroll_mouseover = &window_editor_inventions_list_scrollmouseover;
events.cursor = &window_editor_inventions_list_cursor;
events.invalidate = &window_editor_inventions_list_invalidate;
events.paint = &window_editor_inventions_list_paint;
events.scroll_paint = &window_editor_inventions_list_scrollpaint;
events.close = &WindowEditorInventionsListClose;
events.mouse_up = &WindowEditorInventionsListMouseup;
events.resize = &WindowEditorInventionsListResize;
events.update = &WindowEditorInventionsListUpdate;
events.get_scroll_size = &WindowEditorInventionsListScrollgetheight;
events.scroll_mousedown = &WindowEditorInventionsListScrollmousedown;
events.scroll_mouseover = &WindowEditorInventionsListScrollmouseover;
events.cursor = &WindowEditorInventionsListCursor;
events.invalidate = &WindowEditorInventionsListInvalidate;
events.paint = &WindowEditorInventionsListPaint;
events.scroll_paint = &WindowEditorInventionsListScrollpaint;
});
// 0x009817EC
static rct_window_event_list window_editor_inventions_list_drag_events([](auto& events)
{
events.cursor = &window_editor_inventions_list_drag_cursor;
events.moved = &window_editor_inventions_list_drag_moved;
events.paint = &window_editor_inventions_list_drag_paint;
events.cursor = &WindowEditorInventionsListDragCursor;
events.moved = &WindowEditorInventionsListDragMoved;
events.paint = &WindowEditorInventionsListDragPaint;
});
#pragma endregion
@ -115,15 +115,15 @@ static ResearchItem _editorInventionsListDraggedItem;
// clang-format on
static void window_editor_inventions_list_drag_open(ResearchItem* researchItem);
static void move_research_item(ResearchItem* beforeItem, int32_t scrollIndex);
static void WindowEditorInventionsListDragOpen(ResearchItem* researchItem);
static void MoveResearchItem(ResearchItem* beforeItem, int32_t scrollIndex);
/**
*
* rct2: 0x0068596F
* Sets rides that are in use to be always researched
*/
static void research_rides_setup()
static void ResearchRidesSetup()
{
// Reset all objects to not required
for (ObjectType objectType = ObjectType::Ride; objectType < ObjectType::Count; objectType++)
@ -146,7 +146,7 @@ static void research_rides_setup()
*
* rct2: 0x006855E7
*/
static void move_research_item(ResearchItem* beforeItem, int32_t scrollIndex)
static void MoveResearchItem(ResearchItem* beforeItem, int32_t scrollIndex)
{
auto w = window_find_by_class(WC_EDITOR_INVENTION_LIST);
if (w != nullptr)
@ -178,7 +178,7 @@ static void move_research_item(ResearchItem* beforeItem, int32_t scrollIndex)
*
* rct2: 0x0068558E
*/
static ResearchItem* window_editor_inventions_list_get_item_from_scroll_y(int32_t scrollIndex, int32_t y)
static ResearchItem* WindowEditorInventionsListGetItemFromScrollY(int32_t scrollIndex, int32_t y)
{
auto& researchList = scrollIndex == 0 ? gResearchItemsInvented : gResearchItemsUninvented;
for (auto& researchItem : researchList)
@ -197,7 +197,7 @@ static ResearchItem* window_editor_inventions_list_get_item_from_scroll_y(int32_
*
* rct2: 0x006855BB
*/
static ResearchItem* window_editor_inventions_list_get_item_from_scroll_y_include_seps(int32_t scrollIndex, int32_t y)
static ResearchItem* WindowEditorInventionsListGetItemFromScrollYIncludeSeps(int32_t scrollIndex, int32_t y)
{
auto& researchList = scrollIndex == 0 ? gResearchItemsInvented : gResearchItemsUninvented;
for (auto& researchItem : researchList)
@ -211,7 +211,7 @@ static ResearchItem* window_editor_inventions_list_get_item_from_scroll_y_includ
return nullptr;
}
static ResearchItem* get_research_item_at(const ScreenCoordsXY& screenCoords, int32_t* outScrollId)
static ResearchItem* GetResearchItemAt(const ScreenCoordsXY& screenCoords, int32_t* outScrollId)
{
rct_window* w = window_find_by_class(WC_EDITOR_INVENTION_LIST);
if (w != nullptr && w->windowPos.x <= screenCoords.x && w->windowPos.y < screenCoords.y
@ -230,7 +230,7 @@ static ResearchItem* get_research_item_at(const ScreenCoordsXY& screenCoords, in
*outScrollId = *outScrollId == 0 ? 0 : 1;
int32_t scrollY = outScrollCoords.y + 6;
return window_editor_inventions_list_get_item_from_scroll_y_include_seps(*outScrollId, scrollY);
return WindowEditorInventionsListGetItemFromScrollYIncludeSeps(*outScrollId, scrollY);
}
}
}
@ -243,7 +243,7 @@ static ResearchItem* get_research_item_at(const ScreenCoordsXY& screenCoords, in
*
* rct2: 0x00684E04
*/
rct_window* window_editor_inventions_list_open()
rct_window* WindowEditorInventionsListOpen()
{
rct_window* w;
@ -251,7 +251,7 @@ rct_window* window_editor_inventions_list_open()
if (w != nullptr)
return w;
research_rides_setup();
ResearchRidesSetup();
w = WindowCreateCentred(
WW, WH, &window_editor_inventions_list_events, WC_EDITOR_INVENTION_LIST, WF_NO_SCROLLING | WF_RESIZABLE);
@ -275,7 +275,7 @@ rct_window* window_editor_inventions_list_open()
*
* rct2: 0x006853D2
*/
static void window_editor_inventions_list_close(rct_window* w)
static void WindowEditorInventionsListClose(rct_window* w)
{
research_remove_flags();
@ -292,7 +292,7 @@ static void window_editor_inventions_list_close(rct_window* w)
*
* rct2: 0x0068521B
*/
static void window_editor_inventions_list_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowEditorInventionsListMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -316,7 +316,7 @@ static void window_editor_inventions_list_mouseup(rct_window* w, rct_widgetindex
}
}
static void window_editor_inventions_list_resize(rct_window* w)
static void WindowEditorInventionsListResize(rct_window* w)
{
if (w->width < w->min_width)
{
@ -334,7 +334,7 @@ static void window_editor_inventions_list_resize(rct_window* w)
*
* rct2: 0x00685392
*/
static void window_editor_inventions_list_update(rct_window* w)
static void WindowEditorInventionsListUpdate(rct_window* w)
{
w->frame_no++;
window_event_invalidate_call(w);
@ -354,7 +354,7 @@ static void window_editor_inventions_list_update(rct_window* w)
*
* rct2: 0x00685239
*/
static void window_editor_inventions_list_scrollgetheight(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
static void WindowEditorInventionsListScrollgetheight(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
{
*height = 0;
if (scrollIndex == 0)
@ -371,12 +371,11 @@ static void window_editor_inventions_list_scrollgetheight(rct_window* w, int32_t
*
* rct2: 0x006852D4
*/
static void window_editor_inventions_list_scrollmousedown(
rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
static void WindowEditorInventionsListScrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
{
ResearchItem* researchItem;
researchItem = window_editor_inventions_list_get_item_from_scroll_y(scrollIndex, screenCoords.y);
researchItem = WindowEditorInventionsListGetItemFromScrollY(scrollIndex, screenCoords.y);
if (researchItem == nullptr)
return;
@ -385,19 +384,18 @@ static void window_editor_inventions_list_scrollmousedown(
return;
w->Invalidate();
window_editor_inventions_list_drag_open(researchItem);
WindowEditorInventionsListDragOpen(researchItem);
}
/**
*
* rct2: 0x00685275
*/
static void window_editor_inventions_list_scrollmouseover(
rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
static void WindowEditorInventionsListScrollmouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
{
ResearchItem* researchItem;
researchItem = window_editor_inventions_list_get_item_from_scroll_y(scrollIndex, screenCoords.y);
researchItem = WindowEditorInventionsListGetItemFromScrollY(scrollIndex, screenCoords.y);
if (researchItem != w->research_item)
{
w->research_item = researchItem;
@ -415,7 +413,7 @@ static void window_editor_inventions_list_scrollmouseover(
*
* rct2: 0x00685291
*/
static void window_editor_inventions_list_cursor(
static void WindowEditorInventionsListCursor(
rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords, CursorID* cursorId)
{
ResearchItem* researchItem;
@ -434,7 +432,7 @@ static void window_editor_inventions_list_cursor(
}
// Use the open hand as cursor for items that can be picked up
researchItem = window_editor_inventions_list_get_item_from_scroll_y(scrollIndex, screenCoords.y);
researchItem = WindowEditorInventionsListGetItemFromScrollY(scrollIndex, screenCoords.y);
if (researchItem != nullptr && !researchItem->IsAlwaysResearched())
{
*cursorId = CursorID::HandOpen;
@ -445,7 +443,7 @@ static void window_editor_inventions_list_cursor(
*
* rct2: 0x00685392
*/
static void window_editor_inventions_list_invalidate(rct_window* w)
static void WindowEditorInventionsListInvalidate(rct_window* w)
{
w->pressed_widgets |= 1ULL << WIDX_PREVIEW;
w->pressed_widgets |= 1ULL << WIDX_TAB_1;
@ -493,7 +491,7 @@ static void window_editor_inventions_list_invalidate(rct_window* w)
*
* rct2: 0x00684EE0
*/
static void window_editor_inventions_list_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowEditorInventionsListPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
rct_widget* widget;
ResearchItem* researchItem;
@ -559,7 +557,7 @@ static void window_editor_inventions_list_paint(rct_window* w, rct_drawpixelinfo
screenPos = w->windowPos + ScreenCoordsXY{ widget->midX() + 1, widget->bottom + 3 };
width = w->width - w->widgets[WIDX_RESEARCH_ORDER_SCROLL].right - 6;
auto [drawString, ft] = window_editor_inventions_list_prepare_name(researchItem, false);
auto [drawString, ft] = WindowEditorInventionsListPrepareName(researchItem, false);
DrawTextEllipsised(dpi, screenPos, width, drawString, ft, { TextAlignment::CENTRE });
screenPos.y += 15;
@ -574,7 +572,7 @@ static void window_editor_inventions_list_paint(rct_window* w, rct_drawpixelinfo
*
* rct2: 0x006850BD
*/
static void window_editor_inventions_list_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
static void WindowEditorInventionsListScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
{
// Draw background
uint8_t paletteIndex = ColourMapA[w->colours[1]].mid_light;
@ -665,7 +663,7 @@ static void window_editor_inventions_list_scrollpaint(rct_window* w, rct_drawpix
*
* rct2: 0x006852F4
*/
static void window_editor_inventions_list_drag_open(ResearchItem* researchItem)
static void WindowEditorInventionsListDragOpen(ResearchItem* researchItem)
{
char buffer[256], *ptr;
window_close_by_class(WC_EDITOR_INVENTION_LIST_DRAG);
@ -704,14 +702,14 @@ static void window_editor_inventions_list_drag_open(ResearchItem* researchItem)
*
* rct2: 0x0068549C
*/
static void window_editor_inventions_list_drag_cursor(
static void WindowEditorInventionsListDragCursor(
rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords, CursorID* cursorId)
{
rct_window* inventionListWindow = window_find_by_class(WC_EDITOR_INVENTION_LIST);
if (inventionListWindow != nullptr)
{
int32_t scrollId;
ResearchItem* researchItem = get_research_item_at(screenCoords, &scrollId);
ResearchItem* researchItem = GetResearchItemAt(screenCoords, &scrollId);
if (researchItem != inventionListWindow->research_item)
{
inventionListWindow->Invalidate();
@ -725,7 +723,7 @@ static void window_editor_inventions_list_drag_cursor(
*
* rct2: 0x00685412
*/
static void window_editor_inventions_list_drag_moved(rct_window* w, const ScreenCoordsXY& screenCoords)
static void WindowEditorInventionsListDragMoved(rct_window* w, const ScreenCoordsXY& screenCoords)
{
ResearchItem* researchItem;
@ -734,13 +732,13 @@ static void window_editor_inventions_list_drag_moved(rct_window* w, const Screen
auto newScreenCoords = screenCoords;
do
{
researchItem = get_research_item_at(newScreenCoords, &scrollId);
researchItem = GetResearchItemAt(newScreenCoords, &scrollId);
newScreenCoords.y += LIST_ROW_HEIGHT;
} while (researchItem != nullptr && researchItem->IsAlwaysResearched());
if (scrollId != -1)
{
move_research_item(researchItem, scrollId);
MoveResearchItem(researchItem, scrollId);
}
window_close(w);
@ -752,16 +750,15 @@ static void window_editor_inventions_list_drag_moved(rct_window* w, const Screen
*
* rct2: 0x006853D9
*/
static void window_editor_inventions_list_drag_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowEditorInventionsListDragPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
auto screenCoords = w->windowPos + ScreenCoordsXY{ 0, 2 };
auto [drawString, ft] = window_editor_inventions_list_prepare_name(&_editorInventionsListDraggedItem, true);
auto [drawString, ft] = WindowEditorInventionsListPrepareName(&_editorInventionsListDraggedItem, true);
DrawTextBasic(dpi, screenCoords, drawString, ft, { COLOUR_BLACK | COLOUR_FLAG_OUTLINE });
}
static std::pair<rct_string_id, Formatter> window_editor_inventions_list_prepare_name(
const ResearchItem* researchItem, bool withGap)
static std::pair<rct_string_id, Formatter> WindowEditorInventionsListPrepareName(const ResearchItem* researchItem, bool withGap)
{
rct_string_id drawString;
rct_string_id stringId = researchItem->GetName();

8
src/openrct2-ui/windows/EditorMain.cpp
View File

@ -14,11 +14,11 @@
#include <openrct2/localisation/StringIds.h>
#include <openrct2/world/Footpath.h>
static void window_editor_main_paint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowEditorMainPaint(rct_window* w, rct_drawpixelinfo* dpi);
// clang-format off
static rct_window_event_list window_editor_main_events([](auto& events) {
events.paint = &window_editor_main_paint;
events.paint = &WindowEditorMainPaint;
});
// clang-format on
@ -31,7 +31,7 @@ static rct_widget window_editor_main_widgets[] = {
* Creates the main editor window that holds the main viewport.
* rct2: 0x0066EF38
*/
rct_window* window_editor_main_open()
rct_window* WindowEditorMainOpen()
{
window_editor_main_widgets[0].right = context_get_width();
window_editor_main_widgets[0].bottom = context_get_height();
@ -60,7 +60,7 @@ rct_window* window_editor_main_open()
* rct2: 0x0066FC97
* This function immediately jumps to 0x00685BE1
*/
static void window_editor_main_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowEditorMainPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
viewport_render(dpi, w->viewport, { { dpi->x, dpi->y }, { dpi->x + dpi->width, dpi->y + dpi->height } });
}

256
src/openrct2-ui/windows/EditorObjectSelection.cpp
View File

@ -179,37 +179,37 @@ static std::vector<rct_widget> _window_editor_object_selection_widgets = {
#pragma region Events
static void window_editor_object_selection_close(rct_window *w);
static void window_editor_object_selection_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_editor_object_selection_resize(rct_window *w);
static void window_editor_object_selection_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget);
static void window_editor_object_selection_dropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void window_editor_object_selection_update(rct_window *w);
static void window_editor_object_selection_scrollgetsize(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void window_editor_object_selection_scroll_mousedown(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void window_editor_object_selection_scroll_mouseover(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static OpenRCT2String window_editor_object_selection_tooltip(rct_window* w, const rct_widgetindex widgetIndex, const rct_string_id fallback);
static void window_editor_object_selection_invalidate(rct_window *w);
static void window_editor_object_selection_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_editor_object_selection_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
static void window_editor_object_selection_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void WindowEditorObjectSelectionClose(rct_window *w);
static void WindowEditorObjectSelectionMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowEditorObjectSelectionResize(rct_window *w);
static void WindowEditorObjectSelectionMousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowEditorObjectSelectionDropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowEditorObjectSelectionUpdate(rct_window *w);
static void WindowEditorObjectSelectionScrollgetsize(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void WindowEditorObjectSelectionScrollMousedown(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowEditorObjectSelectionScrollMouseover(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static OpenRCT2String WindowEditorObjectSelectionTooltip(rct_window* w, const rct_widgetindex widgetIndex, const rct_string_id fallback);
static void WindowEditorObjectSelectionInvalidate(rct_window *w);
static void WindowEditorObjectSelectionPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowEditorObjectSelectionScrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
static void WindowEditorObjectSelectionTextinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static rct_window_event_list window_editor_object_selection_events([](auto& events)
{
events.close = &window_editor_object_selection_close;
events.mouse_up = &window_editor_object_selection_mouseup;
events.resize = &window_editor_object_selection_resize;
events.mouse_down = &window_editor_object_selection_mousedown;
events.dropdown = &window_editor_object_selection_dropdown;
events.update = &window_editor_object_selection_update;
events.get_scroll_size = &window_editor_object_selection_scrollgetsize;
events.scroll_mousedown = &window_editor_object_selection_scroll_mousedown;
events.scroll_mouseover = &window_editor_object_selection_scroll_mouseover;
events.text_input = &window_editor_object_selection_textinput;
events.tooltip = &window_editor_object_selection_tooltip;
events.invalidate = &window_editor_object_selection_invalidate;
events.paint = &window_editor_object_selection_paint;
events.scroll_paint = &window_editor_object_selection_scrollpaint;
events.close = &WindowEditorObjectSelectionClose;
events.mouse_up = &WindowEditorObjectSelectionMouseup;
events.resize = &WindowEditorObjectSelectionResize;
events.mouse_down = &WindowEditorObjectSelectionMousedown;
events.dropdown = &WindowEditorObjectSelectionDropdown;
events.update = &WindowEditorObjectSelectionUpdate;
events.get_scroll_size = &WindowEditorObjectSelectionScrollgetsize;
events.scroll_mousedown = &WindowEditorObjectSelectionScrollMousedown;
events.scroll_mouseover = &WindowEditorObjectSelectionScrollMouseover;
events.text_input = &WindowEditorObjectSelectionTextinput;
events.tooltip = &WindowEditorObjectSelectionTooltip;
events.invalidate = &WindowEditorObjectSelectionInvalidate;
events.paint = &WindowEditorObjectSelectionPaint;
events.scroll_paint = &WindowEditorObjectSelectionScrollpaint;
});
// clang-format on
@ -222,19 +222,19 @@ static constexpr const int32_t window_editor_object_selection_animation_divisor[
4, 8, 2, 4, 4, 4, 2,
};
static void window_editor_object_set_page(rct_window* w, int32_t page);
static void window_editor_object_selection_set_pressed_tab(rct_window* w);
static int32_t get_object_from_object_selection(ObjectType object_type, int32_t y);
static void window_editor_object_selection_manage_tracks();
static void editor_load_selected_objects();
static bool filter_selected(uint8_t objectFlags);
static bool filter_string(const ObjectRepositoryItem* item);
static bool filter_source(const ObjectRepositoryItem* item);
static bool filter_chunks(const ObjectRepositoryItem* item);
static void filter_update_counts();
static void WindowEditorObjectSetPage(rct_window* w, int32_t page);
static void WindowEditorObjectSelectionSetPressedTab(rct_window* w);
static int32_t GetObjectFromObjectSelection(ObjectType object_type, int32_t y);
static void WindowEditorObjectSelectionManageTracks();
static void EditorLoadSelectedObjects();
static bool FilterSelected(uint8_t objectFlags);
static bool FilterString(const ObjectRepositoryItem* item);
static bool FilterSource(const ObjectRepositoryItem* item);
static bool FilterChunks(const ObjectRepositoryItem* item);
static void FilterUpdateCounts();
static std::string object_get_description(const Object* object);
static ObjectType get_selected_object_type(rct_window* w);
static std::string ObjectGetDescription(const Object* object);
static ObjectType GetSelectedObjectType(rct_window* w);
enum
{
@ -264,7 +264,7 @@ struct list_item
uint8_t* flags;
};
static rct_string_id get_ride_type_string_id(const ObjectRepositoryItem* item);
static rct_string_id GetRideTypeStringId(const ObjectRepositoryItem* item);
using sortFunc_t = bool (*)(const list_item&, const list_item&);
@ -273,32 +273,32 @@ static int32_t _listSortType = RIDE_SORT_TYPE;
static bool _listSortDescending = false;
static std::unique_ptr<Object> _loadedObject;
static void visible_list_dispose()
static void VisibleListDispose()
{
_listItems.clear();
_listItems.shrink_to_fit();
}
static bool visible_list_sort_ride_name(const list_item& a, const list_item& b)
static bool VisibleListSortRideName(const list_item& a, const list_item& b)
{
auto nameA = a.repositoryItem->Name.c_str();
auto nameB = b.repositoryItem->Name.c_str();
return strcmp(nameA, nameB) < 0;
}
static bool visible_list_sort_ride_type(const list_item& a, const list_item& b)
static bool VisibleListSortRideType(const list_item& a, const list_item& b)
{
auto rideTypeA = language_get_string(get_ride_type_string_id(a.repositoryItem));
auto rideTypeB = language_get_string(get_ride_type_string_id(b.repositoryItem));
auto rideTypeA = language_get_string(GetRideTypeStringId(a.repositoryItem));
auto rideTypeB = language_get_string(GetRideTypeStringId(b.repositoryItem));
int32_t result = String::Compare(rideTypeA, rideTypeB);
return result != 0 ? result < 0 : visible_list_sort_ride_name(a, b);
return result != 0 ? result < 0 : VisibleListSortRideName(a, b);
}
static void visible_list_refresh(rct_window* w)
static void VisibleListRefresh(rct_window* w)
{
int32_t numObjects = static_cast<int32_t>(object_repository_get_items_count());
visible_list_dispose();
VisibleListDispose();
w->selected_list_item = -1;
const ObjectRepositoryItem* items = object_repository_get_items();
@ -306,8 +306,8 @@ static void visible_list_refresh(rct_window* w)
{
uint8_t selectionFlags = _objectSelectionFlags[i];
const ObjectRepositoryItem* item = &items[i];
if (item->Type == get_selected_object_type(w) && !(selectionFlags & OBJECT_SELECTION_FLAG_6) && filter_source(item)
&& filter_string(item) && filter_chunks(item) && filter_selected(selectionFlags))
if (item->Type == GetSelectedObjectType(w) && !(selectionFlags & OBJECT_SELECTION_FLAG_6) && FilterSource(item)
&& FilterString(item) && FilterChunks(item) && FilterSelected(selectionFlags))
{
auto filter = std::make_unique<rct_object_filters>();
filter->ride.category[0] = 0;
@ -324,7 +324,7 @@ static void visible_list_refresh(rct_window* w)
if (_listItems.empty())
{
visible_list_dispose();
VisibleListDispose();
}
else
{
@ -332,10 +332,10 @@ static void visible_list_refresh(rct_window* w)
switch (_listSortType)
{
case RIDE_SORT_TYPE:
sortFunc = visible_list_sort_ride_type;
sortFunc = VisibleListSortRideType;
break;
case RIDE_SORT_RIDE:
sortFunc = visible_list_sort_ride_name;
sortFunc = VisibleListSortRideName;
break;
default:
log_warning("Wrong sort type %d, leaving list as-is.", _listSortType);
@ -353,7 +353,7 @@ static void visible_list_refresh(rct_window* w)
w->Invalidate();
}
static void window_editor_object_selection_init_widgets()
static void WindowEditorObjectSelectionInitWidgets()
{
auto& widgets = _window_editor_object_selection_widgets;
if (!_window_editor_object_selection_widgets_initialised)
@ -371,9 +371,9 @@ static void window_editor_object_selection_init_widgets()
*
* rct2: 0x006AA64E
*/
rct_window* window_editor_object_selection_open()
rct_window* WindowEditorObjectSelectionOpen()
{
window_editor_object_selection_init_widgets();
WindowEditorObjectSelectionInitWidgets();
auto window = window_bring_to_front_by_class(WC_EDITOR_OBJECT_SELECTION);
if (window != nullptr)
@ -407,7 +407,7 @@ rct_window* window_editor_object_selection_open()
window->max_width = 1200;
window->max_height = 1000;
visible_list_refresh(window);
VisibleListRefresh(window);
return window;
}
@ -416,10 +416,10 @@ rct_window* window_editor_object_selection_open()
*
* rct2: 0x006AB199
*/
static void window_editor_object_selection_close(rct_window* w)
static void WindowEditorObjectSelectionClose(rct_window* w)
{
unload_unselected_objects();
editor_load_selected_objects();
EditorLoadSelectedObjects();
editor_object_flags_free();
if (_loadedObject != nullptr)
@ -441,7 +441,7 @@ static void window_editor_object_selection_close(rct_window* w)
auto intent = Intent(INTENT_ACTION_REFRESH_NEW_RIDES);
context_broadcast_intent(&intent);
visible_list_dispose();
VisibleListDispose();
intent = Intent(INTENT_ACTION_REFRESH_SCENERY);
context_broadcast_intent(&intent);
@ -451,7 +451,7 @@ static void window_editor_object_selection_close(rct_window* w)
*
* rct2: 0x006AAFAB
*/
static void window_editor_object_selection_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowEditorObjectSelectionMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -472,8 +472,8 @@ static void window_editor_object_selection_mouseup(rct_window* w, rct_widgetinde
gConfigInterface.object_selection_filter_flags = _filter_flags;
config_save_default();
filter_update_counts();
visible_list_refresh(w);
FilterUpdateCounts();
VisibleListRefresh(w);
w->selected_list_item = -1;
w->scrolls[0].v_top = 0;
@ -490,8 +490,8 @@ static void window_editor_object_selection_mouseup(rct_window* w, rct_widgetinde
gConfigInterface.object_selection_filter_flags = _filter_flags;
config_save_default();
filter_update_counts();
visible_list_refresh(w);
FilterUpdateCounts();
VisibleListRefresh(w);
w->selected_list_item = -1;
w->scrolls[0].v_top = 0;
@ -522,9 +522,9 @@ static void window_editor_object_selection_mouseup(rct_window* w, rct_widgetinde
break;
case WIDX_FILTER_CLEAR_BUTTON:
std::fill_n(_filter_string, sizeof(_filter_string), 0x00);
filter_update_counts();
FilterUpdateCounts();
w->scrolls->v_top = 0;
visible_list_refresh(w);
VisibleListRefresh(w);
w->Invalidate();
break;
case WIDX_LIST_SORT_TYPE:
@ -537,7 +537,7 @@ static void window_editor_object_selection_mouseup(rct_window* w, rct_widgetinde
_listSortType = RIDE_SORT_TYPE;
_listSortDescending = false;
}
visible_list_refresh(w);
VisibleListRefresh(w);
break;
case WIDX_LIST_SORT_RIDE:
if (_listSortType == RIDE_SORT_RIDE)
@ -549,23 +549,23 @@ static void window_editor_object_selection_mouseup(rct_window* w, rct_widgetinde
_listSortType = RIDE_SORT_RIDE;
_listSortDescending = false;
}
visible_list_refresh(w);
VisibleListRefresh(w);
break;
default:
if (widgetIndex >= WIDX_TAB_1 && static_cast<size_t>(widgetIndex) < WIDX_TAB_1 + std::size(ObjectSelectionPages))
{
window_editor_object_set_page(w, widgetIndex - WIDX_TAB_1);
WindowEditorObjectSetPage(w, widgetIndex - WIDX_TAB_1);
}
break;
}
}
static void window_editor_object_selection_resize(rct_window* w)
static void WindowEditorObjectSelectionResize(rct_window* w)
{
window_set_resize(w, WW, WH, 1200, 1000);
}
void window_editor_object_selection_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
void WindowEditorObjectSelectionMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
int32_t numSelectionItems = 0;
@ -624,7 +624,7 @@ void window_editor_object_selection_mousedown(rct_window* w, rct_widgetindex wid
}
}
static void window_editor_object_selection_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowEditorObjectSelectionDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
{
if (dropdownIndex == -1)
return;
@ -649,10 +649,10 @@ static void window_editor_object_selection_dropdown(rct_window* w, rct_widgetind
gConfigInterface.object_selection_filter_flags = _filter_flags;
config_save_default();
filter_update_counts();
FilterUpdateCounts();
w->scrolls->v_top = 0;
visible_list_refresh(w);
VisibleListRefresh(w);
w->Invalidate();
break;
}
@ -662,7 +662,7 @@ static void window_editor_object_selection_dropdown(rct_window* w, rct_widgetind
*
* rct2: 0x006AB031
*/
static void window_editor_object_selection_scrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
static void WindowEditorObjectSelectionScrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
{
*height = static_cast<int32_t>(_listItems.size() * SCROLLABLE_ROW_HEIGHT);
}
@ -671,14 +671,13 @@ static void window_editor_object_selection_scrollgetsize(rct_window* w, int32_t
*
* rct2: 0x006AB0B6
*/
static void window_editor_object_selection_scroll_mousedown(
rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
static void WindowEditorObjectSelectionScrollMousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
{
// Used for in-game object selection cheat to prevent crashing the game
// when windows attempt to draw objects that don't exist any more
window_close_all_except_class(WC_EDITOR_OBJECT_SELECTION);
int32_t selected_object = get_object_from_object_selection(get_selected_object_type(w), screenCoords.y);
int32_t selected_object = GetObjectFromObjectSelection(GetSelectedObjectType(w), screenCoords.y);
if (selected_object == -1)
return;
@ -702,7 +701,7 @@ static void window_editor_object_selection_scroll_mousedown(
// window_close(w);
// This function calls window_track_list_open
window_editor_object_selection_manage_tracks();
WindowEditorObjectSelectionManageTracks();
return;
}
@ -723,8 +722,8 @@ static void window_editor_object_selection_scroll_mousedown(
if (_FILTER_SELECTED || _FILTER_NONSELECTED)
{
filter_update_counts();
visible_list_refresh(w);
FilterUpdateCounts();
VisibleListRefresh(w);
w->Invalidate();
}
@ -739,10 +738,9 @@ static void window_editor_object_selection_scroll_mousedown(
*
* rct2: 0x006AB079
*/
static void window_editor_object_selection_scroll_mouseover(
rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
static void WindowEditorObjectSelectionScrollMouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
{
int32_t selectedObject = get_object_from_object_selection(get_selected_object_type(w), screenCoords.y);
int32_t selectedObject = GetObjectFromObjectSelection(GetSelectedObjectType(w), screenCoords.y);
if (selectedObject != -1)
{
list_item* listItem = &_listItems[selectedObject];
@ -781,7 +779,7 @@ static void window_editor_object_selection_scroll_mouseover(
*
* rct2: 0x006AB058
*/
static OpenRCT2String window_editor_object_selection_tooltip(
static OpenRCT2String WindowEditorObjectSelectionTooltip(
rct_window* w, const rct_widgetindex widgetIndex, const rct_string_id fallback)
{
if (widgetIndex >= WIDX_TAB_1 && static_cast<size_t>(widgetIndex) < WIDX_TAB_1 + std::size(ObjectSelectionPages))
@ -797,7 +795,7 @@ static OpenRCT2String window_editor_object_selection_tooltip(
*
* rct2: 0x006AA9FD
*/
static void window_editor_object_selection_invalidate(rct_window* w)
static void WindowEditorObjectSelectionInvalidate(rct_window* w)
{
// Resize widgets
w->widgets[WIDX_BACKGROUND].right = w->width - 1;
@ -820,7 +818,7 @@ static void window_editor_object_selection_invalidate(rct_window* w)
// Set pressed widgets
w->pressed_widgets |= 1ULL << WIDX_PREVIEW;
window_editor_object_selection_set_pressed_tab(w);
WindowEditorObjectSelectionSetPressedTab(w);
if (w->list_information_type & 1)
w->pressed_widgets |= (1ULL << WIDX_ADVANCED);
else
@ -888,7 +886,7 @@ static void window_editor_object_selection_invalidate(rct_window* w)
w->widgets[WIDX_PREVIEW].right = w->widgets[WIDX_PREVIEW].left + 113;
w->widgets[WIDX_FILTER_RIDE_TAB_FRAME].right = w->widgets[WIDX_LIST].right;
bool ridePage = (get_selected_object_type(w) == ObjectType::Ride);
bool ridePage = (GetSelectedObjectType(w) == ObjectType::Ride);
w->widgets[WIDX_LIST].top = (ridePage ? 118 : 60);
w->widgets[WIDX_FILTER_TEXT_BOX].right = w->widgets[WIDX_LIST].right - 77;
w->widgets[WIDX_FILTER_TEXT_BOX].top = (ridePage ? 79 : 45);
@ -954,13 +952,13 @@ static void window_editor_object_selection_invalidate(rct_window* w)
}
}
static void window_editor_object_selection_paint_descriptions(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowEditorObjectSelectionPaintDescriptions(rct_window* w, rct_drawpixelinfo* dpi)
{
const auto& widget = w->widgets[WIDX_PREVIEW];
auto screenPos = w->windowPos + ScreenCoordsXY{ w->widgets[WIDX_LIST].right + 4, widget.bottom + 23 };
auto width = w->windowPos.x + w->width - screenPos.x - 4;
auto description = object_get_description(_loadedObject.get());
auto description = ObjectGetDescription(_loadedObject.get());
if (!description.empty())
{
auto ft = Formatter();
@ -969,7 +967,7 @@ static void window_editor_object_selection_paint_descriptions(rct_window* w, rct
screenPos.y += DrawTextWrapped(dpi, screenPos, width, STR_WINDOW_COLOUR_2_STRINGID, ft) + LIST_ROW_HEIGHT;
}
if (get_selected_object_type(w) == ObjectType::Ride)
if (GetSelectedObjectType(w) == ObjectType::Ride)
{
auto* rideObject = reinterpret_cast<RideObject*>(_loadedObject.get());
const auto* rideEntry = reinterpret_cast<rct_ride_entry*>(rideObject->GetLegacyData());
@ -991,14 +989,14 @@ static void window_editor_object_selection_paint_descriptions(rct_window* w, rct
screenPos.y += DrawTextWrapped(dpi, screenPos, width, STR_RIDE_OBJECT_SHOP_SELLS, ft) + 2;
}
}
else if (get_selected_object_type(w) == ObjectType::SceneryGroup)
else if (GetSelectedObjectType(w) == ObjectType::SceneryGroup)
{
const auto* sceneryGroupObject = reinterpret_cast<SceneryGroupObject*>(_loadedObject.get());
auto ft = Formatter();
ft.Add<uint16_t>(sceneryGroupObject->GetNumIncludedObjects());
screenPos.y += DrawTextWrapped(dpi, screenPos, width, STR_INCLUDES_X_OBJECTS, ft) + 2;
}
else if (get_selected_object_type(w) == ObjectType::Music)
else if (GetSelectedObjectType(w) == ObjectType::Music)
{
screenPos.y += DrawTextWrapped(dpi, screenPos, width, STR_MUSIC_OBJECT_TRACK_HEADER) + 2;
const auto* musicObject = reinterpret_cast<MusicObject*>(_loadedObject.get());
@ -1018,14 +1016,14 @@ static void window_editor_object_selection_paint_descriptions(rct_window* w, rct
}
}
static void window_editor_object_selection_paint_debug_data(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowEditorObjectSelectionPaintDebugData(rct_window* w, rct_drawpixelinfo* dpi)
{
list_item* listItem = &_listItems[w->selected_list_item];
auto screenPos = w->windowPos + ScreenCoordsXY{ w->width - 5, w->height - (LIST_ROW_HEIGHT * 5) };
// Draw ride type.
if (get_selected_object_type(w) == ObjectType::Ride)
if (GetSelectedObjectType(w) == ObjectType::Ride)
{
auto stringId = get_ride_type_string_id(listItem->repositoryItem);
auto stringId = GetRideTypeStringId(listItem->repositoryItem);
DrawTextBasic(dpi, screenPos, stringId, {}, { COLOUR_WHITE, TextAlignment::RIGHT });
}
@ -1072,7 +1070,7 @@ static void window_editor_object_selection_paint_debug_data(rct_window* w, rct_d
*
* rct2: 0x006AAB56
*/
static void window_editor_object_selection_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowEditorObjectSelectionPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
int32_t width;
@ -1101,7 +1099,7 @@ static void window_editor_object_selection_paint(rct_window* w, rct_drawpixelinf
};
// Draw ride tabs
if (get_selected_object_type(w) == ObjectType::Ride)
if (GetSelectedObjectType(w) == ObjectType::Ride)
{
for (int32_t i = 0; i < 7; i++)
{
@ -1135,8 +1133,8 @@ static void window_editor_object_selection_paint(rct_window* w, rct_drawpixelinf
{
auto screenPos = w->windowPos + ScreenCoordsXY{ 3, w->height - 13 };
int32_t numSelected = _numSelectedObjectsForType[EnumValue(get_selected_object_type(w))];
int32_t totalSelectable = object_entry_group_counts[EnumValue(get_selected_object_type(w))];
int32_t numSelected = _numSelectedObjectsForType[EnumValue(GetSelectedObjectType(w))];
int32_t totalSelectable = object_entry_group_counts[EnumValue(GetSelectedObjectType(w))];
auto ft = Formatter();
ft.Add<uint16_t>(numSelected);
@ -1193,19 +1191,19 @@ static void window_editor_object_selection_paint(rct_window* w, rct_drawpixelinf
DrawTextEllipsised(dpi, screenPos, width, STR_WINDOW_COLOUR_2_STRINGID, ft, { TextAlignment::CENTRE });
}
window_editor_object_selection_paint_descriptions(w, dpi);
window_editor_object_selection_paint_debug_data(w, dpi);
WindowEditorObjectSelectionPaintDescriptions(w, dpi);
WindowEditorObjectSelectionPaintDebugData(w, dpi);
}
/**
*
* rct2: 0x006AADA3
*/
static void window_editor_object_selection_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
static void WindowEditorObjectSelectionScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
{
ScreenCoordsXY screenCoords;
bool ridePage = (get_selected_object_type(w) == ObjectType::Ride);
bool ridePage = (GetSelectedObjectType(w) == ObjectType::Ride);
uint8_t paletteIndex = ColourMapA[w->colours[1]].mid_light;
gfx_clear(dpi, paletteIndex);
@ -1262,7 +1260,7 @@ static void window_editor_object_selection_scrollpaint(rct_window* w, rct_drawpi
{
width_limit /= 2;
// Draw ride type
rct_string_id rideTypeStringId = get_ride_type_string_id(listItem.repositoryItem);
rct_string_id rideTypeStringId = GetRideTypeStringId(listItem.repositoryItem);
safe_strcpy(buffer, language_get_string(rideTypeStringId), 256 - (buffer - bufferWithColour));
auto ft = Formatter();
ft.Add<const char*>(gCommonStringFormatBuffer);
@ -1287,7 +1285,7 @@ static void window_editor_object_selection_scrollpaint(rct_window* w, rct_drawpi
}
}
static void window_editor_object_set_page(rct_window* w, int32_t page)
static void WindowEditorObjectSetPage(rct_window* w, int32_t page)
{
if (w->selected_tab == page)
return;
@ -1308,11 +1306,11 @@ static void window_editor_object_set_page(rct_window* w, int32_t page)
_listSortDescending = false;
}
visible_list_refresh(w);
VisibleListRefresh(w);
w->Invalidate();
}
static void window_editor_object_selection_set_pressed_tab(rct_window* w)
static void WindowEditorObjectSelectionSetPressedTab(rct_window* w)
{
for (size_t i = 0; i < std::size(ObjectSelectionPages); i++)
{
@ -1329,7 +1327,7 @@ static void window_editor_object_selection_set_pressed_tab(rct_window* w)
*
* rct2: 0x006AA703
*/
static int32_t get_object_from_object_selection(ObjectType object_type, int32_t y)
static int32_t GetObjectFromObjectSelection(ObjectType object_type, int32_t y)
{
int32_t listItemIndex = y / SCROLLABLE_ROW_HEIGHT;
if (listItemIndex < 0 || static_cast<size_t>(listItemIndex) >= _listItems.size())
@ -1342,7 +1340,7 @@ static int32_t get_object_from_object_selection(ObjectType object_type, int32_t
*
* rct2: 0x006D33E2
*/
static void window_editor_object_selection_manage_tracks()
static void WindowEditorObjectSelectionManageTracks()
{
set_every_ride_type_invented();
set_every_ride_entry_invented();
@ -1366,7 +1364,7 @@ static void window_editor_object_selection_manage_tracks()
*
* rct2: 0x006ABBBE
*/
static void editor_load_selected_objects()
static void EditorLoadSelectedObjects()
{
auto& objManager = OpenRCT2::GetContext()->GetObjectManager();
int32_t numItems = static_cast<int32_t>(object_repository_get_items_count());
@ -1412,7 +1410,7 @@ static void editor_load_selected_objects()
}
}
static void window_editor_object_selection_update(rct_window* w)
static void WindowEditorObjectSelectionUpdate(rct_window* w)
{
if (gCurrentTextBox.window.classification == w->classification && gCurrentTextBox.window.number == w->number)
{
@ -1434,7 +1432,7 @@ static void window_editor_object_selection_update(rct_window* w)
}
}
static void window_editor_object_selection_textinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
static void WindowEditorObjectSelectionTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
{
if (widgetIndex != WIDX_FILTER_TEXT_BOX || text == nullptr)
return;
@ -1444,15 +1442,15 @@ static void window_editor_object_selection_textinput(rct_window* w, rct_widgetin
safe_strcpy(_filter_string, text, sizeof(_filter_string));
filter_update_counts();
FilterUpdateCounts();
w->scrolls->v_top = 0;
visible_list_refresh(w);
VisibleListRefresh(w);
w->Invalidate();
}
static bool filter_selected(uint8_t objectFlag)
static bool FilterSelected(uint8_t objectFlag)
{
if (_FILTER_SELECTED == _FILTER_NONSELECTED)
{
@ -1470,7 +1468,7 @@ static bool filter_selected(uint8_t objectFlag)
return false;
}
static bool filter_string(const ObjectRepositoryItem* item)
static bool FilterString(const ObjectRepositoryItem* item)
{
// Nothing to search for
if (_filter_string[0] == '\0')
@ -1481,7 +1479,7 @@ static bool filter_string(const ObjectRepositoryItem* item)
return false;
// Get ride type
const char* rideTypeName = language_get_string(get_ride_type_string_id(item));
const char* rideTypeName = language_get_string(GetRideTypeStringId(item));
// Get object name (ride/vehicle for rides) and type name (rides only) in uppercase
const auto nameUpper = String::ToUpper(item->Name);
@ -1497,7 +1495,7 @@ static bool filter_string(const ObjectRepositoryItem* item)
return inName || inRideType || inPath;
}
static bool sources_match(ObjectSourceGame source)
static bool SourcesMatch(ObjectSourceGame source)
{
// clang-format off
return (_FILTER_RCT1 && source == ObjectSourceGame::RCT1) ||
@ -1518,21 +1516,21 @@ static bool sources_match(ObjectSourceGame source)
// clang-format on
}
static bool filter_source(const ObjectRepositoryItem* item)
static bool FilterSource(const ObjectRepositoryItem* item)
{
if (_FILTER_ALL)
return true;
for (auto source : item->Sources)
{
if (sources_match(source))
if (SourcesMatch(source))
return true;
}
return false;
}
static bool filter_chunks(const ObjectRepositoryItem* item)
static bool FilterChunks(const ObjectRepositoryItem* item)
{
if (item->Type == ObjectType::Ride)
{
@ -1550,7 +1548,7 @@ static bool filter_chunks(const ObjectRepositoryItem* item)
return true;
}
static void filter_update_counts()
static void FilterUpdateCounts()
{
if (!_FILTER_ALL || strlen(_filter_string) > 0)
{
@ -1562,7 +1560,7 @@ static void filter_update_counts()
for (size_t i = 0; i < numObjects; i++)
{
const ObjectRepositoryItem* item = &items[i];
if (filter_source(item) && filter_string(item) && filter_chunks(item) && filter_selected(selectionFlags[i]))
if (FilterSource(item) && FilterString(item) && FilterChunks(item) && FilterSelected(selectionFlags[i]))
{
_filter_object_counts[EnumValue(item->Type)]++;
}
@ -1570,7 +1568,7 @@ static void filter_update_counts()
}
}
static rct_string_id get_ride_type_string_id(const ObjectRepositoryItem* item)
static rct_string_id GetRideTypeStringId(const ObjectRepositoryItem* item)
{
rct_string_id result = STR_NONE;
for (int32_t i = 0; i < MAX_RIDE_TYPES_PER_RIDE_ENTRY; i++)
@ -1585,7 +1583,7 @@ static rct_string_id get_ride_type_string_id(const ObjectRepositoryItem* item)
return result;
}
static std::string object_get_description(const Object* object)
static std::string ObjectGetDescription(const Object* object)
{
switch (object->GetObjectType())
{
@ -1599,7 +1597,7 @@ static std::string object_get_description(const Object* object)
}
}
static ObjectType get_selected_object_type(rct_window* w)
static ObjectType GetSelectedObjectType(rct_window* w)
{
auto tab = w->selected_tab;
return static_cast<ObjectType>(tab);

172
src/openrct2-ui/windows/EditorObjectiveOptions.cpp
View File

@ -120,50 +120,50 @@ static rct_widget *window_editor_objective_options_widgets[] = {
#pragma region Events
static void window_editor_objective_options_main_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_editor_objective_options_main_resize(rct_window *w);
static void window_editor_objective_options_main_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget);
static void window_editor_objective_options_main_dropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void window_editor_objective_options_main_update(rct_window *w);
static void window_editor_objective_options_main_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void window_editor_objective_options_main_invalidate(rct_window *w);
static void window_editor_objective_options_main_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowEditorObjectiveOptionsMainMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowEditorObjectiveOptionsMainResize(rct_window *w);
static void WindowEditorObjectiveOptionsMainMousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowEditorObjectiveOptionsMainDropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowEditorObjectiveOptionsMainUpdate(rct_window *w);
static void WindowEditorObjectiveOptionsMainTextinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void WindowEditorObjectiveOptionsMainInvalidate(rct_window *w);
static void WindowEditorObjectiveOptionsMainPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_editor_objective_options_rides_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_editor_objective_options_rides_resize(rct_window *w);
static void window_editor_objective_options_rides_update(rct_window *w);
static void window_editor_objective_options_rides_scrollgetheight(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void window_editor_objective_options_rides_scrollmousedown(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void window_editor_objective_options_rides_scrollmouseover(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void window_editor_objective_options_rides_invalidate(rct_window *w);
static void window_editor_objective_options_rides_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_editor_objective_options_rides_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
static void WindowEditorObjectiveOptionsRidesMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowEditorObjectiveOptionsRidesResize(rct_window *w);
static void WindowEditorObjectiveOptionsRidesUpdate(rct_window *w);
static void WindowEditorObjectiveOptionsRidesScrollgetheight(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void WindowEditorObjectiveOptionsRidesScrollmousedown(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowEditorObjectiveOptionsRidesScrollmouseover(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowEditorObjectiveOptionsRidesInvalidate(rct_window *w);
static void WindowEditorObjectiveOptionsRidesPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowEditorObjectiveOptionsRidesScrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
// 0x009A9DF4
static rct_window_event_list window_objective_options_main_events([](auto& events)
{
events.mouse_up = &window_editor_objective_options_main_mouseup;
events.resize = &window_editor_objective_options_main_resize;
events.mouse_down = &window_editor_objective_options_main_mousedown;
events.dropdown = &window_editor_objective_options_main_dropdown;
events.update = &window_editor_objective_options_main_update;
events.text_input = &window_editor_objective_options_main_textinput;
events.invalidate = &window_editor_objective_options_main_invalidate;
events.paint = &window_editor_objective_options_main_paint;
events.mouse_up = &WindowEditorObjectiveOptionsMainMouseup;
events.resize = &WindowEditorObjectiveOptionsMainResize;
events.mouse_down = &WindowEditorObjectiveOptionsMainMousedown;
events.dropdown = &WindowEditorObjectiveOptionsMainDropdown;
events.update = &WindowEditorObjectiveOptionsMainUpdate;
events.text_input = &WindowEditorObjectiveOptionsMainTextinput;
events.invalidate = &WindowEditorObjectiveOptionsMainInvalidate;
events.paint = &WindowEditorObjectiveOptionsMainPaint;
});
// 0x009A9F58
static rct_window_event_list window_objective_options_rides_events([](auto& events)
{
events.mouse_up = &window_editor_objective_options_rides_mouseup;
events.resize = &window_editor_objective_options_rides_resize;
events.update = &window_editor_objective_options_rides_update;
events.get_scroll_size = &window_editor_objective_options_rides_scrollgetheight;
events.scroll_mousedown = &window_editor_objective_options_rides_scrollmousedown;
events.scroll_mouseover = &window_editor_objective_options_rides_scrollmouseover;
events.invalidate = &window_editor_objective_options_rides_invalidate;
events.paint = &window_editor_objective_options_rides_paint;
events.scroll_paint = &window_editor_objective_options_rides_scrollpaint;
events.mouse_up = &WindowEditorObjectiveOptionsRidesMouseup;
events.resize = &WindowEditorObjectiveOptionsRidesResize;
events.update = &WindowEditorObjectiveOptionsRidesUpdate;
events.get_scroll_size = &WindowEditorObjectiveOptionsRidesScrollgetheight;
events.scroll_mousedown = &WindowEditorObjectiveOptionsRidesScrollmousedown;
events.scroll_mouseover = &WindowEditorObjectiveOptionsRidesScrollmouseover;
events.invalidate = &WindowEditorObjectiveOptionsRidesInvalidate;
events.paint = &WindowEditorObjectiveOptionsRidesPaint;
events.scroll_paint = &WindowEditorObjectiveOptionsRidesScrollpaint;
});
static rct_window_event_list *window_editor_objective_options_page_events[] = {
@ -208,13 +208,13 @@ static uint64_t window_editor_objective_options_page_hold_down_widgets[] = {
#pragma endregion
static void window_editor_objective_options_update_disabled_widgets(rct_window* w);
static void WindowEditorObjectiveOptionsUpdateDisabledWidgets(rct_window* w);
/**
*
* rct2: 0x0067137D
*/
rct_window* window_editor_objective_options_open()
rct_window* WindowEditorObjectiveOptionsOpen()
{
rct_window* w;
@ -231,12 +231,12 @@ rct_window* window_editor_objective_options_open()
w->selected_tab = WINDOW_EDITOR_OBJECTIVE_OPTIONS_PAGE_MAIN;
w->no_list_items = 0;
w->selected_list_item = -1;
window_editor_objective_options_update_disabled_widgets(w);
WindowEditorObjectiveOptionsUpdateDisabledWidgets(w);
return w;
}
static void window_editor_objective_options_set_pressed_tab(rct_window* w)
static void WindowEditorObjectiveOptionsSetPressedTab(rct_window* w)
{
int32_t i;
for (i = 0; i < 2; i++)
@ -244,7 +244,7 @@ static void window_editor_objective_options_set_pressed_tab(rct_window* w)
w->pressed_widgets |= 1LL << (WIDX_TAB_1 + w->page);
}
static void window_editor_objective_options_anchor_border_widgets(rct_window* w)
static void WindowEditorObjectiveOptionsAnchorBorderWidgets(rct_window* w)
{
w->widgets[WIDX_BACKGROUND].right = w->width - 1;
w->widgets[WIDX_BACKGROUND].bottom = w->height - 1;
@ -255,7 +255,7 @@ static void window_editor_objective_options_anchor_border_widgets(rct_window* w)
w->widgets[WIDX_CLOSE].right = w->width - 3;
}
static void window_editor_objective_options_draw_tab_images(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowEditorObjectiveOptionsDrawTabImages(rct_window* w, rct_drawpixelinfo* dpi)
{
rct_widget* widget;
int32_t spriteIndex;
@ -285,7 +285,7 @@ static void window_editor_objective_options_draw_tab_images(rct_window* w, rct_d
*
* rct2: 0x00668496
*/
static void window_editor_objective_options_set_page(rct_window* w, int32_t page)
static void WindowEditorObjectiveOptionsSetPage(rct_window* w, int32_t page)
{
if (w->page == page)
return;
@ -300,7 +300,7 @@ static void window_editor_objective_options_set_page(rct_window* w, int32_t page
w->event_handlers = window_editor_objective_options_page_events[page];
w->widgets = window_editor_objective_options_widgets[page];
w->Invalidate();
window_editor_objective_options_update_disabled_widgets(w);
WindowEditorObjectiveOptionsUpdateDisabledWidgets(w);
window_event_resize_call(w);
window_event_invalidate_call(w);
WindowInitScrollWidgets(w);
@ -311,7 +311,7 @@ static void window_editor_objective_options_set_page(rct_window* w, int32_t page
*
* rct2: 0x0067201D
*/
static void window_editor_objective_options_set_objective(rct_window* w, int32_t objective)
static void WindowEditorObjectiveOptionsSetObjective(rct_window* w, int32_t objective)
{
gScenarioObjective.Type = objective;
w->Invalidate();
@ -357,7 +357,7 @@ static void window_editor_objective_options_set_objective(rct_window* w, int32_t
*
* rct2: 0x006719CA
*/
static void window_editor_objective_options_main_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowEditorObjectiveOptionsMainMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -366,20 +366,20 @@ static void window_editor_objective_options_main_mouseup(rct_window* w, rct_widg
break;
case WIDX_TAB_1:
case WIDX_TAB_2:
window_editor_objective_options_set_page(w, widgetIndex - WIDX_TAB_1);
WindowEditorObjectiveOptionsSetPage(w, widgetIndex - WIDX_TAB_1);
break;
case WIDX_PARK_NAME:
{
auto& park = OpenRCT2::GetContext()->GetGameState()->GetPark();
window_text_input_raw_open(w, WIDX_PARK_NAME, STR_PARK_NAME, STR_ENTER_PARK_NAME, {}, park.Name.c_str(), 32);
WindowTextInputRawOpen(w, WIDX_PARK_NAME, STR_PARK_NAME, STR_ENTER_PARK_NAME, {}, park.Name.c_str(), 32);
break;
}
case WIDX_SCENARIO_NAME:
window_text_input_raw_open(
WindowTextInputRawOpen(
w, WIDX_SCENARIO_NAME, STR_SCENARIO_NAME, STR_ENTER_SCENARIO_NAME, {}, gScenarioName.c_str(), 64);
break;
case WIDX_DETAILS:
window_text_input_raw_open(
WindowTextInputRawOpen(
w, WIDX_DETAILS, STR_PARK_SCENARIO_DETAILS, STR_ENTER_SCENARIO_DESCRIPTION, {}, gScenarioDetails.c_str(), 256);
break;
}
@ -389,12 +389,12 @@ static void window_editor_objective_options_main_mouseup(rct_window* w, rct_widg
*
* rct2: 0x00672254
*/
static void window_editor_objective_options_main_resize(rct_window* w)
static void WindowEditorObjectiveOptionsMainResize(rct_window* w)
{
window_set_resize(w, 450, 229, 450, 229);
}
static void window_editor_objective_options_show_objective_dropdown(rct_window* w)
static void WindowEditorObjectiveOptionsShowObjectiveDropdown(rct_window* w)
{
int32_t numItems = 0, objectiveType;
rct_widget* dropdownWidget;
@ -434,7 +434,7 @@ static void window_editor_objective_options_show_objective_dropdown(rct_window*
}
}
static void window_editor_objective_options_show_category_dropdown(rct_window* w)
static void WindowEditorObjectiveOptionsShowCategoryDropdown(rct_window* w)
{
int32_t i;
rct_widget* dropdownWidget;
@ -452,7 +452,7 @@ static void window_editor_objective_options_show_category_dropdown(rct_window* w
Dropdown::SetChecked(gScenarioCategory, true);
}
static void window_editor_objective_options_arg_1_increase(rct_window* w)
static void WindowEditorObjectiveOptionsArg1Increase(rct_window* w)
{
switch (gScenarioObjective.Type)
{
@ -516,7 +516,7 @@ static void window_editor_objective_options_arg_1_increase(rct_window* w)
}
}
static void window_editor_objective_options_arg_1_decrease(rct_window* w)
static void WindowEditorObjectiveOptionsArg1Decrease(rct_window* w)
{
switch (gScenarioObjective.Type)
{
@ -580,7 +580,7 @@ static void window_editor_objective_options_arg_1_decrease(rct_window* w)
}
}
static void window_editor_objective_options_arg_2_increase(rct_window* w)
static void WindowEditorObjectiveOptionsArg2Increase(rct_window* w)
{
if (gScenarioObjective.Year >= 25)
{
@ -593,7 +593,7 @@ static void window_editor_objective_options_arg_2_increase(rct_window* w)
}
}
static void window_editor_objective_options_arg_2_decrease(rct_window* w)
static void WindowEditorObjectiveOptionsArg2Decrease(rct_window* w)
{
if (gScenarioObjective.Year <= 1)
{
@ -610,27 +610,27 @@ static void window_editor_objective_options_arg_2_decrease(rct_window* w)
*
* rct2: 0x00671A0D
*/
static void window_editor_objective_options_main_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowEditorObjectiveOptionsMainMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
switch (widgetIndex)
{
case WIDX_OBJECTIVE_DROPDOWN:
window_editor_objective_options_show_objective_dropdown(w);
WindowEditorObjectiveOptionsShowObjectiveDropdown(w);
break;
case WIDX_OBJECTIVE_ARG_1_INCREASE:
window_editor_objective_options_arg_1_increase(w);
WindowEditorObjectiveOptionsArg1Increase(w);
break;
case WIDX_OBJECTIVE_ARG_1_DECREASE:
window_editor_objective_options_arg_1_decrease(w);
WindowEditorObjectiveOptionsArg1Decrease(w);
break;
case WIDX_OBJECTIVE_ARG_2_INCREASE:
window_editor_objective_options_arg_2_increase(w);
WindowEditorObjectiveOptionsArg2Increase(w);
break;
case WIDX_OBJECTIVE_ARG_2_DECREASE:
window_editor_objective_options_arg_2_decrease(w);
WindowEditorObjectiveOptionsArg2Decrease(w);
break;
case WIDX_CATEGORY_DROPDOWN:
window_editor_objective_options_show_category_dropdown(w);
WindowEditorObjectiveOptionsShowCategoryDropdown(w);
break;
}
}
@ -639,7 +639,7 @@ static void window_editor_objective_options_main_mousedown(rct_window* w, rct_wi
*
* rct2: 0x00671A54
*/
static void window_editor_objective_options_main_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowEditorObjectiveOptionsMainDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
{
uint8_t newObjectiveType;
@ -652,7 +652,7 @@ static void window_editor_objective_options_main_dropdown(rct_window* w, rct_wid
// TODO: Don't rely on string ID order
newObjectiveType = static_cast<uint8_t>(gDropdownItemsArgs[dropdownIndex] - STR_OBJECTIVE_DROPDOWN_NONE);
if (gScenarioObjective.Type != newObjectiveType)
window_editor_objective_options_set_objective(w, newObjectiveType);
WindowEditorObjectiveOptionsSetObjective(w, newObjectiveType);
break;
case WIDX_CATEGORY_DROPDOWN:
if (gScenarioCategory != static_cast<uint8_t>(dropdownIndex))
@ -668,7 +668,7 @@ static void window_editor_objective_options_main_dropdown(rct_window* w, rct_wid
*
* rct2: 0x006721E7
*/
static void window_editor_objective_options_main_update(rct_window* w)
static void WindowEditorObjectiveOptionsMainUpdate(rct_window* w)
{
uint32_t parkFlags;
uint8_t objectiveType;
@ -689,7 +689,7 @@ static void window_editor_objective_options_main_update(rct_window* w)
if (!objectiveAllowedByMoneyUsage || !objectiveAllowedByPaymentSettings)
{
// Reset objective
window_editor_objective_options_set_objective(w, OBJECTIVE_GUESTS_AND_RATING);
WindowEditorObjectiveOptionsSetObjective(w, OBJECTIVE_GUESTS_AND_RATING);
}
}
@ -697,7 +697,7 @@ static void window_editor_objective_options_main_update(rct_window* w)
*
* rct2: 0x00671A73
*/
static void window_editor_objective_options_main_textinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
static void WindowEditorObjectiveOptionsMainTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
{
if (text == nullptr)
return;
@ -731,7 +731,7 @@ static void window_editor_objective_options_main_textinput(rct_window* w, rct_wi
*
* rct2: 0x0067161C
*/
static void window_editor_objective_options_main_invalidate(rct_window* w)
static void WindowEditorObjectiveOptionsMainInvalidate(rct_window* w)
{
auto widgets = window_editor_objective_options_widgets[w->page];
if (w->widgets != widgets)
@ -740,7 +740,7 @@ static void window_editor_objective_options_main_invalidate(rct_window* w)
WindowInitScrollWidgets(w);
}
window_editor_objective_options_set_pressed_tab(w);
WindowEditorObjectiveOptionsSetPressedTab(w);
switch (gScenarioObjective.Type)
{
@ -780,20 +780,20 @@ static void window_editor_objective_options_main_invalidate(rct_window* w)
? WindowWidgetType::Empty
: WindowWidgetType::CloseBox;
window_editor_objective_options_anchor_border_widgets(w);
WindowEditorObjectiveOptionsAnchorBorderWidgets(w);
}
/**
*
* rct2: 0x0067161C
*/
static void window_editor_objective_options_main_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowEditorObjectiveOptionsMainPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
int32_t width;
rct_string_id stringId;
WindowDrawWidgets(w, dpi);
window_editor_objective_options_draw_tab_images(w, dpi);
WindowEditorObjectiveOptionsDrawTabImages(w, dpi);
// Objective label
auto screenCoords = w->windowPos + ScreenCoordsXY{ 8, w->widgets[WIDX_OBJECTIVE].top };
@ -933,7 +933,7 @@ static void window_editor_objective_options_main_paint(rct_window* w, rct_drawpi
*
* rct2: 0x006724A4
*/
static void window_editor_objective_options_rides_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowEditorObjectiveOptionsRidesMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -942,7 +942,7 @@ static void window_editor_objective_options_rides_mouseup(rct_window* w, rct_wid
break;
case WIDX_TAB_1:
case WIDX_TAB_2:
window_editor_objective_options_set_page(w, widgetIndex - WIDX_TAB_1);
WindowEditorObjectiveOptionsSetPage(w, widgetIndex - WIDX_TAB_1);
break;
}
}
@ -951,7 +951,7 @@ static void window_editor_objective_options_rides_mouseup(rct_window* w, rct_wid
*
* rct2: 0x006725A8
*/
static void window_editor_objective_options_rides_resize(rct_window* w)
static void WindowEditorObjectiveOptionsRidesResize(rct_window* w)
{
window_set_resize(w, 380, 224, 380, 224);
}
@ -960,7 +960,7 @@ static void window_editor_objective_options_rides_resize(rct_window* w)
*
* rct2: 0x00672544
*/
static void window_editor_objective_options_rides_update(rct_window* w)
static void WindowEditorObjectiveOptionsRidesUpdate(rct_window* w)
{
w->frame_no++;
window_event_invalidate_call(w);
@ -988,7 +988,7 @@ static void window_editor_objective_options_rides_update(rct_window* w)
*
* rct2: 0x006724BF
*/
static void window_editor_objective_options_rides_scrollgetheight(
static void WindowEditorObjectiveOptionsRidesScrollgetheight(
rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
{
*height = w->no_list_items * 12;
@ -998,7 +998,7 @@ static void window_editor_objective_options_rides_scrollgetheight(
*
* rct2: 0x006724FC
*/
static void window_editor_objective_options_rides_scrollmousedown(
static void WindowEditorObjectiveOptionsRidesScrollmousedown(
rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
{
auto i = screenCoords.y / 12;
@ -1018,7 +1018,7 @@ static void window_editor_objective_options_rides_scrollmousedown(
*
* rct2: 0x006724CC
*/
static void window_editor_objective_options_rides_scrollmouseover(
static void WindowEditorObjectiveOptionsRidesScrollmouseover(
rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
{
int32_t i;
@ -1038,7 +1038,7 @@ static void window_editor_objective_options_rides_scrollmouseover(
*
* rct2: 0x006722B5
*/
static void window_editor_objective_options_rides_invalidate(rct_window* w)
static void WindowEditorObjectiveOptionsRidesInvalidate(rct_window* w)
{
rct_widget* widgets;
@ -1049,23 +1049,23 @@ static void window_editor_objective_options_rides_invalidate(rct_window* w)
WindowInitScrollWidgets(w);
}
window_editor_objective_options_set_pressed_tab(w);
WindowEditorObjectiveOptionsSetPressedTab(w);
window_editor_objective_options_main_widgets[WIDX_CLOSE].type = (gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR)
? WindowWidgetType::Empty
: WindowWidgetType::CloseBox;
window_editor_objective_options_anchor_border_widgets(w);
WindowEditorObjectiveOptionsAnchorBorderWidgets(w);
}
/**
*
* rct2: 0x00672340
*/
static void window_editor_objective_options_rides_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowEditorObjectiveOptionsRidesPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_editor_objective_options_draw_tab_images(w, dpi);
WindowEditorObjectiveOptionsDrawTabImages(w, dpi);
DrawTextBasic(
dpi, w->windowPos + ScreenCoordsXY{ 6, w->widgets[WIDX_PAGE_BACKGROUND].top + 3 }, STR_WINDOW_PRESERVATION_ORDER);
@ -1075,7 +1075,7 @@ static void window_editor_objective_options_rides_paint(rct_window* w, rct_drawp
*
* rct2: 0x0067236F
*/
static void window_editor_objective_options_rides_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
static void WindowEditorObjectiveOptionsRidesScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
{
int32_t colour = ColourMapA[w->colours[1]].mid_light;
gfx_fill_rect(dpi, { { dpi->x, dpi->y }, { dpi->x + dpi->width - 1, dpi->y + dpi->height - 1 } }, colour);
@ -1125,7 +1125,7 @@ static void window_editor_objective_options_rides_scrollpaint(rct_window* w, rct
*
* rct2: 0x00672609
*/
static void window_editor_objective_options_update_disabled_widgets(rct_window* w)
static void WindowEditorObjectiveOptionsUpdateDisabledWidgets(rct_window* w)
{
// Check if there are any rides (not shops or facilities)
const auto& rideManager = GetRideManager();

152
src/openrct2-ui/windows/EditorScenarioOptions.cpp
View File

@ -178,60 +178,60 @@ static rct_widget *window_editor_scenario_options_widgets[] = {
#pragma region Events
static void window_editor_scenario_options_financial_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_editor_scenario_options_financial_resize(rct_window *w);
static void window_editor_scenario_options_financial_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget);
static void window_editor_scenario_options_financial_update(rct_window *w);
static void window_editor_scenario_options_financial_invalidate(rct_window *w);
static void window_editor_scenario_options_financial_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowEditorScenarioOptionsFinancialMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowEditorScenarioOptionsFinancialResize(rct_window *w);
static void WindowEditorScenarioOptionsFinancialMousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget);
static void WindowEditorScenarioOptionsFinancialUpdate(rct_window *w);
static void WindowEditorScenarioOptionsFinancialInvalidate(rct_window *w);
static void WindowEditorScenarioOptionsFinancialPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_editor_scenario_options_guests_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_editor_scenario_options_guests_resize(rct_window *w);
static void window_editor_scenario_options_guests_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget);
static void window_editor_scenario_options_guests_update(rct_window *w);
static void window_editor_scenario_options_guests_invalidate(rct_window *w);
static void window_editor_scenario_options_guests_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowEditorScenarioOptionsGuestsMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowEditorScenarioOptionsGuestsResize(rct_window *w);
static void WindowEditorScenarioOptionsGuestsMousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget);
static void WindowEditorScenarioOptionsGuestsUpdate(rct_window *w);
static void WindowEditorScenarioOptionsGuestsInvalidate(rct_window *w);
static void WindowEditorScenarioOptionsGuestsPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_editor_scenario_options_park_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_editor_scenario_options_park_resize(rct_window *w);
static void window_editor_scenario_options_park_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget);
static void window_editor_scenario_options_park_dropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void window_editor_scenario_options_park_update(rct_window *w);
static void window_editor_scenario_options_park_invalidate(rct_window *w);
static void window_editor_scenario_options_park_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowEditorScenarioOptionsParkMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowEditorScenarioOptionsParkResize(rct_window *w);
static void WindowEditorScenarioOptionsParkMousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget);
static void WindowEditorScenarioOptionsParkDropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowEditorScenarioOptionsParkUpdate(rct_window *w);
static void WindowEditorScenarioOptionsParkInvalidate(rct_window *w);
static void WindowEditorScenarioOptionsParkPaint(rct_window *w, rct_drawpixelinfo *dpi);
// 0x0097EB60
static rct_window_event_list window_scenario_options_financial_events([](auto& events)
{
events.mouse_up = &window_editor_scenario_options_financial_mouseup;
events.resize = &window_editor_scenario_options_financial_resize;
events.mouse_down = &window_editor_scenario_options_financial_mousedown;
events.update = &window_editor_scenario_options_financial_update;
events.invalidate = &window_editor_scenario_options_financial_invalidate;
events.paint = &window_editor_scenario_options_financial_paint;
events.mouse_up = &WindowEditorScenarioOptionsFinancialMouseup;
events.resize = &WindowEditorScenarioOptionsFinancialResize;
events.mouse_down = &WindowEditorScenarioOptionsFinancialMousedown;
events.update = &WindowEditorScenarioOptionsFinancialUpdate;
events.invalidate = &WindowEditorScenarioOptionsFinancialInvalidate;
events.paint = &WindowEditorScenarioOptionsFinancialPaint;
});
// 0x0097EBD0
static rct_window_event_list window_scenario_options_guests_events([](auto& events)
{
events.mouse_up = &window_editor_scenario_options_guests_mouseup;
events.resize = &window_editor_scenario_options_guests_resize;
events.mouse_down = &window_editor_scenario_options_guests_mousedown;
events.update = &window_editor_scenario_options_guests_update;
events.invalidate = &window_editor_scenario_options_guests_invalidate;
events.paint = &window_editor_scenario_options_guests_paint;
events.mouse_up = &WindowEditorScenarioOptionsGuestsMouseup;
events.resize = &WindowEditorScenarioOptionsGuestsResize;
events.mouse_down = &WindowEditorScenarioOptionsGuestsMousedown;
events.update = &WindowEditorScenarioOptionsGuestsUpdate;
events.invalidate = &WindowEditorScenarioOptionsGuestsInvalidate;
events.paint = &WindowEditorScenarioOptionsGuestsPaint;
});
// 0x0097EC40
static rct_window_event_list window_scenario_options_park_events([](auto& events)
{
events.mouse_up = &window_editor_scenario_options_park_mouseup;
events.resize = &window_editor_scenario_options_park_resize;
events.mouse_down = &window_editor_scenario_options_park_mousedown;
events.dropdown = &window_editor_scenario_options_park_dropdown;
events.update = &window_editor_scenario_options_park_update;
events.invalidate = &window_editor_scenario_options_park_invalidate;
events.paint = &window_editor_scenario_options_park_paint;
events.mouse_up = &WindowEditorScenarioOptionsParkMouseup;
events.resize = &WindowEditorScenarioOptionsParkResize;
events.mouse_down = &WindowEditorScenarioOptionsParkMousedown;
events.dropdown = &WindowEditorScenarioOptionsParkDropdown;
events.update = &WindowEditorScenarioOptionsParkUpdate;
events.invalidate = &WindowEditorScenarioOptionsParkInvalidate;
events.paint = &WindowEditorScenarioOptionsParkPaint;
});
static rct_window_event_list *window_editor_scenario_options_page_events[] = {
@ -323,7 +323,7 @@ static uint32_t window_editor_scenario_options_page_hold_down_widgets[] = {
*
* rct2: 0x00670138
*/
rct_window* window_editor_scenario_options_open()
rct_window* WindowEditorScenarioOptionsOpen()
{
rct_window* w;
@ -342,7 +342,7 @@ rct_window* window_editor_scenario_options_open()
return w;
}
static void window_editor_scenario_options_set_pressed_tab(rct_window* w)
static void WindowEditorScenarioOptionsSetPressedTab(rct_window* w)
{
int32_t i;
for (i = 0; i < WINDOW_EDITOR_SCENARIO_OPTIONS_PAGE_COUNT; i++)
@ -350,7 +350,7 @@ static void window_editor_scenario_options_set_pressed_tab(rct_window* w)
w->pressed_widgets |= 1LL << (WIDX_TAB_1 + w->page);
}
static void window_editor_scenario_options_anchor_border_widgets(rct_window* w)
static void WindowEditorScenarioOptionsAnchorBorderWidgets(rct_window* w)
{
w->widgets[WIDX_BACKGROUND].right = w->width - 1;
w->widgets[WIDX_BACKGROUND].bottom = w->height - 1;
@ -365,7 +365,7 @@ static void window_editor_scenario_options_anchor_border_widgets(rct_window* w)
*
* rct2: 0x006712E8
*/
static void window_editor_scenario_options_draw_tab_images(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowEditorScenarioOptionsDrawTabImages(rct_window* w, rct_drawpixelinfo* dpi)
{
rct_widget* widget;
int32_t spriteIndex;
@ -396,7 +396,7 @@ static void window_editor_scenario_options_draw_tab_images(rct_window* w, rct_dr
*
* rct2: 0x00668496
*/
static void window_editor_scenario_options_set_page(rct_window* w, int32_t page)
static void WindowEditorScenarioOptionsSetPage(rct_window* w, int32_t page)
{
if (w->page == page)
return;
@ -421,7 +421,7 @@ static void window_editor_scenario_options_set_page(rct_window* w, int32_t page)
*
* rct2: 0x0067049D
*/
static void window_editor_scenario_options_financial_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowEditorScenarioOptionsFinancialMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -431,7 +431,7 @@ static void window_editor_scenario_options_financial_mouseup(rct_window* w, rct_
case WIDX_TAB_1:
case WIDX_TAB_2:
case WIDX_TAB_3:
window_editor_scenario_options_set_page(w, widgetIndex - WIDX_TAB_1);
WindowEditorScenarioOptionsSetPage(w, widgetIndex - WIDX_TAB_1);
break;
case WIDX_NO_MONEY:
{
@ -466,12 +466,12 @@ static void window_editor_scenario_options_financial_mouseup(rct_window* w, rct_
*
* rct2: 0x0067077A
*/
static void window_editor_scenario_options_financial_resize(rct_window* w)
static void WindowEditorScenarioOptionsFinancialResize(rct_window* w)
{
window_set_resize(w, 280, 149, 280, 149);
}
static void window_editor_scenario_options_show_climate_dropdown(rct_window* w)
static void WindowEditorScenarioOptionsShowClimateDropdown(rct_window* w)
{
int32_t i;
@ -492,7 +492,7 @@ static void window_editor_scenario_options_show_climate_dropdown(rct_window* w)
*
* rct2: 0x006704C8
*/
static void window_editor_scenario_options_financial_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowEditorScenarioOptionsFinancialMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
switch (widgetIndex)
{
@ -613,7 +613,7 @@ static void window_editor_scenario_options_financial_mousedown(rct_window* w, rc
*
* rct2: 0x00670760
*/
static void window_editor_scenario_options_financial_update(rct_window* w)
static void WindowEditorScenarioOptionsFinancialUpdate(rct_window* w)
{
w->frame_no++;
window_event_invalidate_call(w);
@ -624,7 +624,7 @@ static void window_editor_scenario_options_financial_update(rct_window* w)
*
* rct2: 0x006701CF
*/
static void window_editor_scenario_options_financial_invalidate(rct_window* w)
static void WindowEditorScenarioOptionsFinancialInvalidate(rct_window* w)
{
rct_widget* widgets = window_editor_scenario_options_widgets[w->page];
if (w->widgets != widgets)
@ -633,7 +633,7 @@ static void window_editor_scenario_options_financial_invalidate(rct_window* w)
WindowInitScrollWidgets(w);
}
window_editor_scenario_options_set_pressed_tab(w);
WindowEditorScenarioOptionsSetPressedTab(w);
if (((gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) && (gParkFlags & PARK_FLAGS_NO_MONEY_SCENARIO))
|| (!(gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) && (gParkFlags & PARK_FLAGS_NO_MONEY)))
@ -668,19 +668,19 @@ static void window_editor_scenario_options_financial_invalidate(rct_window* w)
w->widgets[WIDX_CLOSE].type = (gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) ? WindowWidgetType::Empty
: WindowWidgetType::CloseBox;
window_editor_scenario_options_anchor_border_widgets(w);
WindowEditorScenarioOptionsAnchorBorderWidgets(w);
}
/**
*
* rct2: 0x00670338
*/
static void window_editor_scenario_options_financial_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowEditorScenarioOptionsFinancialPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
ScreenCoordsXY screenCoords{};
WindowDrawWidgets(w, dpi);
window_editor_scenario_options_draw_tab_images(w, dpi);
WindowEditorScenarioOptionsDrawTabImages(w, dpi);
const auto& initialCashWidget = w->widgets[WIDX_INITIAL_CASH];
if (initialCashWidget.type != WindowWidgetType::Empty)
@ -740,7 +740,7 @@ static void window_editor_scenario_options_financial_paint(rct_window* w, rct_dr
*
* rct2: 0x00670A62
*/
static void window_editor_scenario_options_guests_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowEditorScenarioOptionsGuestsMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -750,7 +750,7 @@ static void window_editor_scenario_options_guests_mouseup(rct_window* w, rct_wid
case WIDX_TAB_1:
case WIDX_TAB_2:
case WIDX_TAB_3:
window_editor_scenario_options_set_page(w, widgetIndex - WIDX_TAB_1);
WindowEditorScenarioOptionsSetPage(w, widgetIndex - WIDX_TAB_1);
break;
case WIDX_GUEST_PREFER_LESS_INTENSE_RIDES:
{
@ -775,7 +775,7 @@ static void window_editor_scenario_options_guests_mouseup(rct_window* w, rct_wid
*
* rct2: 0x00670C59
*/
static void window_editor_scenario_options_guests_resize(rct_window* w)
static void WindowEditorScenarioOptionsGuestsResize(rct_window* w)
{
window_set_resize(w, 380, 149, 380, 149);
}
@ -784,7 +784,7 @@ static void window_editor_scenario_options_guests_resize(rct_window* w)
*
* rct2: 0x00670A89
*/
static void window_editor_scenario_options_guests_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowEditorScenarioOptionsGuestsMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
switch (widgetIndex)
{
@ -899,7 +899,7 @@ static void window_editor_scenario_options_guests_mousedown(rct_window* w, rct_w
*
* rct2: 0x00670C3F
*/
static void window_editor_scenario_options_guests_update(rct_window* w)
static void WindowEditorScenarioOptionsGuestsUpdate(rct_window* w)
{
w->frame_no++;
window_event_invalidate_call(w);
@ -910,7 +910,7 @@ static void window_editor_scenario_options_guests_update(rct_window* w)
*
* rct2: 0x006707DB
*/
static void window_editor_scenario_options_guests_invalidate(rct_window* w)
static void WindowEditorScenarioOptionsGuestsInvalidate(rct_window* w)
{
rct_widget* widgets;
@ -921,7 +921,7 @@ static void window_editor_scenario_options_guests_invalidate(rct_window* w)
WindowInitScrollWidgets(w);
}
window_editor_scenario_options_set_pressed_tab(w);
WindowEditorScenarioOptionsSetPressedTab(w);
if (((gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) && (gParkFlags & PARK_FLAGS_NO_MONEY_SCENARIO))
|| (!(gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) && (gParkFlags & PARK_FLAGS_NO_MONEY)))
@ -952,19 +952,19 @@ static void window_editor_scenario_options_guests_invalidate(rct_window* w)
w->widgets[WIDX_CLOSE].type = (gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) ? WindowWidgetType::Empty
: WindowWidgetType::CloseBox;
window_editor_scenario_options_anchor_border_widgets(w);
WindowEditorScenarioOptionsAnchorBorderWidgets(w);
}
/**
*
* rct2: 0x006708C4
*/
static void window_editor_scenario_options_guests_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowEditorScenarioOptionsGuestsPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
ScreenCoordsXY screenCoords{};
WindowDrawWidgets(w, dpi);
window_editor_scenario_options_draw_tab_images(w, dpi);
WindowEditorScenarioOptionsDrawTabImages(w, dpi);
const auto& cashPerGuestWidget = w->widgets[WIDX_CASH_PER_GUEST];
if (cashPerGuestWidget.type != WindowWidgetType::Empty)
@ -1022,7 +1022,7 @@ static void window_editor_scenario_options_guests_paint(rct_window* w, rct_drawp
*
* rct2: 0x00670FD8
*/
static void window_editor_scenario_options_park_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowEditorScenarioOptionsParkMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -1032,7 +1032,7 @@ static void window_editor_scenario_options_park_mouseup(rct_window* w, rct_widge
case WIDX_TAB_1:
case WIDX_TAB_2:
case WIDX_TAB_3:
window_editor_scenario_options_set_page(w, widgetIndex - WIDX_TAB_1);
WindowEditorScenarioOptionsSetPage(w, widgetIndex - WIDX_TAB_1);
break;
case WIDX_FORBID_TREE_REMOVAL:
{
@ -1082,7 +1082,7 @@ static void window_editor_scenario_options_park_mouseup(rct_window* w, rct_widge
*
* rct2: 0x00671287
*/
static void window_editor_scenario_options_park_resize(rct_window* w)
static void WindowEditorScenarioOptionsParkResize(rct_window* w)
{
window_set_resize(w, 400, 200, 400, 200);
}
@ -1091,7 +1091,7 @@ static void window_editor_scenario_options_park_resize(rct_window* w)
*
* rct2: 0x00671019
*/
static void window_editor_scenario_options_park_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowEditorScenarioOptionsParkMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
rct_widget* dropdownWidget;
@ -1198,7 +1198,7 @@ static void window_editor_scenario_options_park_mousedown(rct_window* w, rct_wid
break;
case WIDX_CLIMATE_DROPDOWN:
window_editor_scenario_options_show_climate_dropdown(w);
WindowEditorScenarioOptionsShowClimateDropdown(w);
break;
}
}
@ -1207,7 +1207,7 @@ static void window_editor_scenario_options_park_mousedown(rct_window* w, rct_wid
*
* rct2: 0x00671060
*/
static void window_editor_scenario_options_park_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowEditorScenarioOptionsParkDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
{
if (dropdownIndex == -1)
{
@ -1237,7 +1237,7 @@ static void window_editor_scenario_options_park_dropdown(rct_window* w, rct_widg
*
* rct2: 0x0067126D
*/
static void window_editor_scenario_options_park_update(rct_window* w)
static void WindowEditorScenarioOptionsParkUpdate(rct_window* w)
{
w->frame_no++;
window_event_invalidate_call(w);
@ -1248,7 +1248,7 @@ static void window_editor_scenario_options_park_update(rct_window* w)
*
* rct2: 0x00670CBA
*/
static void window_editor_scenario_options_park_invalidate(rct_window* w)
static void WindowEditorScenarioOptionsParkInvalidate(rct_window* w)
{
uint64_t pressedWidgets;
@ -1259,7 +1259,7 @@ static void window_editor_scenario_options_park_invalidate(rct_window* w)
WindowInitScrollWidgets(w);
}
window_editor_scenario_options_set_pressed_tab(w);
WindowEditorScenarioOptionsSetPressedTab(w);
if (((gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) && (gParkFlags & PARK_FLAGS_NO_MONEY_SCENARIO))
|| (!(gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) && (gParkFlags & PARK_FLAGS_NO_MONEY)))
@ -1316,19 +1316,19 @@ static void window_editor_scenario_options_park_invalidate(rct_window* w)
w->widgets[WIDX_CLOSE].type = (gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) ? WindowWidgetType::Empty
: WindowWidgetType::CloseBox;
window_editor_scenario_options_anchor_border_widgets(w);
WindowEditorScenarioOptionsAnchorBorderWidgets(w);
}
/**
*
* rct2: 0x00670E5B
*/
static void window_editor_scenario_options_park_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowEditorScenarioOptionsParkPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
ScreenCoordsXY screenCoords{};
WindowDrawWidgets(w, dpi);
window_editor_scenario_options_draw_tab_images(w, dpi);
WindowEditorScenarioOptionsDrawTabImages(w, dpi);
const auto& landCostWidget = w->widgets[WIDX_LAND_COST];
if (landCostWidget.type != WindowWidgetType::Empty)

18
src/openrct2-ui/windows/Error.cpp
View File

@ -27,13 +27,13 @@ static rct_widget window_error_widgets[] = {
WIDGETS_END,
};
static void window_error_unknown5(rct_window *w);
static void window_error_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowErrorUnknown5(rct_window *w);
static void WindowErrorPaint(rct_window *w, rct_drawpixelinfo *dpi);
static rct_window_event_list window_error_events([](auto& events)
{
events.unknown_05 = &window_error_unknown5;
events.paint = &window_error_paint;
events.unknown_05 = &WindowErrorUnknown5;
events.paint = &WindowErrorPaint;
});
// clang-format on
@ -47,14 +47,14 @@ static uint16_t _window_error_num_lines;
* bx: title
* dx: message
*/
rct_window* window_error_open(rct_string_id title, rct_string_id message, const Formatter& args)
rct_window* WindowErrorOpen(rct_string_id title, rct_string_id message, const Formatter& args)
{
auto titlez = format_string(title, args.Data());
auto messagez = format_string(message, args.Data());
return window_error_open(titlez, messagez);
return WindowErrorOpen(titlez, messagez);
}
rct_window* window_error_open(std::string_view title, std::string_view message)
rct_window* WindowErrorOpen(std::string_view title, std::string_view message)
{
int32_t numLines, width, height, maxY;
rct_window* w;
@ -123,7 +123,7 @@ rct_window* window_error_open(std::string_view title, std::string_view message)
*
* rct2: 0x00667BFE
*/
static void window_error_unknown5(rct_window* w)
static void WindowErrorUnknown5(rct_window* w)
{
w->error.var_480++;
if (w->error.var_480 >= 8)
@ -134,7 +134,7 @@ static void window_error_unknown5(rct_window* w)
*
* rct2: 0x00667AA3
*/
static void window_error_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowErrorPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
ScreenCoordsXY leftTop{ w->windowPos };
ScreenCoordsXY rightBottom{ w->windowPos + ScreenCoordsXY{ w->width - 1, w->height - 1 } };

262
src/openrct2-ui/windows/Finances.cpp
View File

@ -176,99 +176,99 @@ static rct_widget *_windowFinancesPageWidgets[] =
#pragma region Events
static void window_finances_summary_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_finances_summary_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget);
static void window_finances_summary_scrollgetsize(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void window_finances_summary_invertscroll(rct_window *w);
static void window_finances_summary_update(rct_window *w);
static void window_finances_summary_invalidate(rct_window *w);
static void window_finances_summary_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_finances_summary_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
static void WindowFinancesSummaryMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowFinancesSummaryMousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowFinancesSummaryScrollgetsize(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void WindowFinancesSummaryInvertscroll(rct_window *w);
static void WindowFinancesSummaryUpdate(rct_window *w);
static void WindowFinancesSummaryInvalidate(rct_window *w);
static void WindowFinancesSummaryPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowFinancesSummaryScrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
static void window_finances_financial_graph_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_finances_financial_graph_update(rct_window *w);
static void window_finances_financial_graph_invalidate(rct_window *w);
static void window_finances_financial_graph_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowFinancesFinancialGraphMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowFinancesFinancialGraphUpdate(rct_window *w);
static void WindowFinancesFinancialGraphInvalidate(rct_window *w);
static void WindowFinancesFinancialGraphPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_finances_park_value_graph_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_finances_park_value_graph_update(rct_window *w);
static void window_finances_park_value_graph_invalidate(rct_window *w);
static void window_finances_park_value_graph_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowFinancesParkValueGraphMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowFinancesParkValueGraphUpdate(rct_window *w);
static void WindowFinancesParkValueGraphInvalidate(rct_window *w);
static void WindowFinancesParkValueGraphPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_finances_profit_graph_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_finances_profit_graph_update(rct_window *w);
static void window_finances_profit_graph_invalidate(rct_window *w);
static void window_finances_profit_graph_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowFinancesProfitGraphMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowFinancesProfitGraphUpdate(rct_window *w);
static void WindowFinancesProfitGraphInvalidate(rct_window *w);
static void WindowFinancesProfitGraphPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_finances_marketing_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_finances_marketing_update(rct_window *w);
static void window_finances_marketing_invalidate(rct_window *w);
static void window_finances_marketing_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowFinancesMarketingMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowFinancesMarketingUpdate(rct_window *w);
static void WindowFinancesMarketingInvalidate(rct_window *w);
static void WindowFinancesMarketingPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_finances_research_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_finances_research_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget);
static void window_finances_research_dropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void window_finances_research_update(rct_window *w);
static void window_finances_research_invalidate(rct_window *w);
static void window_finances_research_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowFinancesResearchMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowFinancesResearchMousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowFinancesResearchDropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowFinancesResearchUpdate(rct_window *w);
static void WindowFinancesResearchInvalidate(rct_window *w);
static void WindowFinancesResearchPaint(rct_window *w, rct_drawpixelinfo *dpi);
// 0x00988EB8
static rct_window_event_list _windowFinancesSummaryEvents([](auto& events)
{
events.mouse_up = &window_finances_summary_mouseup;
events.mouse_down = &window_finances_summary_mousedown;
events.update = &window_finances_summary_update;
events.get_scroll_size = &window_finances_summary_scrollgetsize;
events.invalidate = &window_finances_summary_invalidate;
events.paint = &window_finances_summary_paint;
events.scroll_paint = &window_finances_summary_scrollpaint;
events.mouse_up = &WindowFinancesSummaryMouseup;
events.mouse_down = &WindowFinancesSummaryMousedown;
events.update = &WindowFinancesSummaryUpdate;
events.get_scroll_size = &WindowFinancesSummaryScrollgetsize;
events.invalidate = &WindowFinancesSummaryInvalidate;
events.paint = &WindowFinancesSummaryPaint;
events.scroll_paint = &WindowFinancesSummaryScrollpaint;
});
// 0x00988F28
static rct_window_event_list _windowFinancesFinancialGraphEvents([](auto& events)
{
events.mouse_up = &window_finances_financial_graph_mouseup;
events.update = &window_finances_financial_graph_update;
events.invalidate = &window_finances_financial_graph_invalidate;
events.paint = &window_finances_financial_graph_paint;
events.mouse_up = &WindowFinancesFinancialGraphMouseup;
events.update = &WindowFinancesFinancialGraphUpdate;
events.invalidate = &WindowFinancesFinancialGraphInvalidate;
events.paint = &WindowFinancesFinancialGraphPaint;
});
// 0x00988F98
static rct_window_event_list _windowFinancesValueGraphEvents([](auto& events)
{
events.mouse_up = &window_finances_park_value_graph_mouseup;
events.update = &window_finances_park_value_graph_update;
events.invalidate = &window_finances_park_value_graph_invalidate;
events.paint = &window_finances_park_value_graph_paint;
events.mouse_up = &WindowFinancesParkValueGraphMouseup;
events.update = &WindowFinancesParkValueGraphUpdate;
events.invalidate = &WindowFinancesParkValueGraphInvalidate;
events.paint = &WindowFinancesParkValueGraphPaint;
});
// 0x00989008
static rct_window_event_list _windowFinancesProfitGraphEvents([](auto& events)
{
events.mouse_up = &window_finances_profit_graph_mouseup;
events.update = &window_finances_profit_graph_update;
events.invalidate = &window_finances_profit_graph_invalidate;
events.paint = &window_finances_profit_graph_paint;
events.mouse_up = &WindowFinancesProfitGraphMouseup;
events.update = &WindowFinancesProfitGraphUpdate;
events.invalidate = &WindowFinancesProfitGraphInvalidate;
events.paint = &WindowFinancesProfitGraphPaint;
});
// 0x00989078
static rct_window_event_list _windowFinancesMarketingEvents([](auto& events)
{
events.mouse_up = &window_finances_marketing_mouseup;
events.update = &window_finances_marketing_update;
events.invalidate = &window_finances_marketing_invalidate;
events.paint = &window_finances_marketing_paint;
events.mouse_up = &WindowFinancesMarketingMouseup;
events.update = &WindowFinancesMarketingUpdate;
events.invalidate = &WindowFinancesMarketingInvalidate;
events.paint = &WindowFinancesMarketingPaint;
});
// 0x009890E8
static rct_window_event_list _windowFinancesResearchEvents([](auto& events)
{
events.mouse_up = &window_finances_research_mouseup;
events.mouse_down = &window_finances_research_mousedown;
events.dropdown = &window_finances_research_dropdown;
events.update = &window_finances_research_update;
events.invalidate = &window_finances_research_invalidate;
events.paint = &window_finances_research_paint;
events.mouse_up = &WindowFinancesResearchMouseup;
events.mouse_down = &WindowFinancesResearchMousedown;
events.dropdown = &WindowFinancesResearchDropdown;
events.update = &WindowFinancesResearchUpdate;
events.invalidate = &WindowFinancesResearchInvalidate;
events.paint = &WindowFinancesResearchPaint;
});
static rct_window_event_list *const _windowFinancesPageEvents[] =
@ -368,15 +368,15 @@ static constexpr const rct_string_id window_finances_summary_row_labels[static_c
};
// clang-format on
static void window_finances_set_page(rct_window* w, int32_t page);
static void window_finances_set_pressed_tab(rct_window* w);
static void window_finances_draw_tab_images(rct_drawpixelinfo* dpi, rct_window* w);
static void WindowFinancesSetPage(rct_window* w, int32_t page);
static void WindowFinancesSetPressedTab(rct_window* w);
static void WindowFinancesDrawTabImages(rct_drawpixelinfo* dpi, rct_window* w);
/**
*
* rct2: 0x0069DDF1
*/
rct_window* window_finances_open()
rct_window* WindowFinancesOpen()
{
rct_window* w;
@ -406,7 +406,7 @@ rct_window* window_finances_open()
WindowInitScrollWidgets(w);
// Scroll summary all the way to the right, initially.
window_finances_summary_invertscroll(w);
WindowFinancesSummaryInvertscroll(w);
return w;
}
@ -415,14 +415,14 @@ rct_window* window_finances_open()
*
* rct2: 0x0069DDE1
*/
rct_window* window_finances_research_open()
rct_window* WindowFinancesResearchOpen()
{
rct_window* w;
window_finances_open();
WindowFinancesOpen();
w = window_find_by_class(WC_FINANCES);
if (w != nullptr)
window_finances_set_page(w, WINDOW_FINANCES_PAGE_RESEARCH);
WindowFinancesSetPage(w, WINDOW_FINANCES_PAGE_RESEARCH);
return w;
}
@ -433,19 +433,19 @@ rct_window* window_finances_research_open()
*
* rct2: 0x0069CA99
*/
static void window_finances_summary_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowFinancesSummaryMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
if (widgetIndex == WIDX_CLOSE)
window_close(w);
else if (widgetIndex >= WIDX_TAB_1 && widgetIndex <= WIDX_TAB_6)
window_finances_set_page(w, widgetIndex - WIDX_TAB_1);
WindowFinancesSetPage(w, widgetIndex - WIDX_TAB_1);
}
/**
*
* rct2: 0x0069CAB0
*/
static void window_finances_summary_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowFinancesSummaryMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
switch (widgetIndex)
{
@ -467,17 +467,17 @@ static void window_finances_summary_mousedown(rct_window* w, rct_widgetindex wid
}
}
static uint16_t summary_max_available_month()
static uint16_t SummaryMaxAvailableMonth()
{
return std::min<uint16_t>(gDateMonthsElapsed, EXPENDITURE_TABLE_MONTH_COUNT - 1);
}
static void window_finances_summary_scrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
static void WindowFinancesSummaryScrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
{
*width = EXPENDITURE_COLUMN_WIDTH * (summary_max_available_month() + 1);
*width = EXPENDITURE_COLUMN_WIDTH * (SummaryMaxAvailableMonth() + 1);
}
static void window_finances_summary_invertscroll(rct_window* w)
static void WindowFinancesSummaryInvertscroll(rct_window* w)
{
rct_widget summary = w->widgets[WIDX_SUMMARY_SCROLL];
w->scrolls[0].h_left = std::max(0, w->scrolls[0].h_right - (summary.width() - 2));
@ -488,7 +488,7 @@ static void window_finances_summary_invertscroll(rct_window* w)
*
* rct2: 0x0069CBA6
*/
static void window_finances_summary_update(rct_window* w)
static void WindowFinancesSummaryUpdate(rct_window* w)
{
// Tab animation
if (++w->frame_no >= WindowFinancesTabAnimationLoops[w->page])
@ -500,7 +500,7 @@ static void window_finances_summary_update(rct_window* w)
*
* rct2: 0x0069C732
*/
static void window_finances_summary_invalidate(rct_window* w)
static void WindowFinancesSummaryInvalidate(rct_window* w)
{
if (w->widgets != _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_SUMMARY])
{
@ -510,9 +510,9 @@ static void window_finances_summary_invalidate(rct_window* w)
// Keep up with new months being added in the first two years.
if (gDateMonthsElapsed != _lastPaintedMonth)
window_finances_summary_invertscroll(w);
WindowFinancesSummaryInvertscroll(w);
window_finances_set_pressed_tab(w);
WindowFinancesSetPressedTab(w);
auto ft = Formatter::Common();
ft.Increment(6);
ft.Add<money64>(gBankLoan);
@ -522,10 +522,10 @@ static void window_finances_summary_invalidate(rct_window* w)
*
* rct2: 0x0069C771
*/
static void window_finances_summary_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowFinancesSummaryPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_finances_draw_tab_images(dpi, w);
WindowFinancesDrawTabImages(dpi, w);
auto screenCoords = w->windowPos + ScreenCoordsXY{ 8, 51 };
@ -586,7 +586,7 @@ static void window_finances_summary_paint(rct_window* w, rct_drawpixelinfo* dpi)
}
}
static void window_finances_summary_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
static void WindowFinancesSummaryScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
{
auto screenCoords = ScreenCoordsXY{ 0, TABLE_CELL_HEIGHT + 2 };
@ -608,7 +608,7 @@ static void window_finances_summary_scrollpaint(rct_window* w, rct_drawpixelinfo
// Expenditure / Income values for each month
int16_t currentMonthYear = static_cast<int16_t>(gDateMonthsElapsed);
for (int32_t i = summary_max_available_month(); i >= 0; i--)
for (int32_t i = SummaryMaxAvailableMonth(); i >= 0; i--)
{
screenCoords.y = 0;
@ -669,19 +669,19 @@ static void window_finances_summary_scrollpaint(rct_window* w, rct_drawpixelinfo
*
* rct2: 0x0069CF70
*/
static void window_finances_financial_graph_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowFinancesFinancialGraphMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
if (widgetIndex == WIDX_CLOSE)
window_close(w);
else if (widgetIndex >= WIDX_TAB_1 && widgetIndex <= WIDX_TAB_6)
window_finances_set_page(w, widgetIndex - WIDX_TAB_1);
WindowFinancesSetPage(w, widgetIndex - WIDX_TAB_1);
}
/**
*
* rct2: 0x0069CF8B
*/
static void window_finances_financial_graph_update(rct_window* w)
static void WindowFinancesFinancialGraphUpdate(rct_window* w)
{
// Tab animation
if (++w->frame_no >= WindowFinancesTabAnimationLoops[w->page])
@ -694,7 +694,7 @@ static void window_finances_financial_graph_update(rct_window* w)
*
* rct2: 0x0069CBDB
*/
static void window_finances_financial_graph_invalidate(rct_window* w)
static void WindowFinancesFinancialGraphInvalidate(rct_window* w)
{
if (w->widgets != _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_FINANCIAL_GRAPH])
{
@ -702,17 +702,17 @@ static void window_finances_financial_graph_invalidate(rct_window* w)
WindowInitScrollWidgets(w);
}
window_finances_set_pressed_tab(w);
WindowFinancesSetPressedTab(w);
}
/**
*
* rct2: 0x0069CC10
*/
static void window_finances_financial_graph_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowFinancesFinancialGraphPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_finances_draw_tab_images(dpi, w);
WindowFinancesDrawTabImages(dpi, w);
rct_widget* pageWidget = &_windowFinancesCashWidgets[WIDX_PAGE_BACKGROUND];
auto graphTopLeft = w->windowPos + ScreenCoordsXY{ pageWidget->left + 4, pageWidget->top + 15 };
@ -779,19 +779,19 @@ static void window_finances_financial_graph_paint(rct_window* w, rct_drawpixelin
*
* rct2: 0x0069D338
*/
static void window_finances_park_value_graph_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowFinancesParkValueGraphMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
if (widgetIndex == WIDX_CLOSE)
window_close(w);
else if (widgetIndex >= WIDX_TAB_1 && widgetIndex <= WIDX_TAB_6)
window_finances_set_page(w, widgetIndex - WIDX_TAB_1);
WindowFinancesSetPage(w, widgetIndex - WIDX_TAB_1);
}
/**
*
* rct2: 0x0069D353
*/
static void window_finances_park_value_graph_update(rct_window* w)
static void WindowFinancesParkValueGraphUpdate(rct_window* w)
{
// Tab animation
if (++w->frame_no >= WindowFinancesTabAnimationLoops[w->page])
@ -804,7 +804,7 @@ static void window_finances_park_value_graph_update(rct_window* w)
*
* rct2: 0x0069CFC0
*/
static void window_finances_park_value_graph_invalidate(rct_window* w)
static void WindowFinancesParkValueGraphInvalidate(rct_window* w)
{
if (w->widgets != _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_VALUE_GRAPH])
{
@ -812,17 +812,17 @@ static void window_finances_park_value_graph_invalidate(rct_window* w)
WindowInitScrollWidgets(w);
}
window_finances_set_pressed_tab(w);
WindowFinancesSetPressedTab(w);
}
/**
*
* rct2: 0x0069CFF5
*/
static void window_finances_park_value_graph_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowFinancesParkValueGraphPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_finances_draw_tab_images(dpi, w);
WindowFinancesDrawTabImages(dpi, w);
rct_widget* pageWidget = &_windowFinancesCashWidgets[WIDX_PAGE_BACKGROUND];
auto graphTopLeft = w->windowPos + ScreenCoordsXY{ pageWidget->left + 4, pageWidget->top + 15 };
@ -883,19 +883,19 @@ static void window_finances_park_value_graph_paint(rct_window* w, rct_drawpixeli
*
* rct2: 0x0069D715
*/
static void window_finances_profit_graph_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowFinancesProfitGraphMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
if (widgetIndex == WIDX_CLOSE)
window_close(w);
else if (widgetIndex >= WIDX_TAB_1 && widgetIndex <= WIDX_TAB_6)
window_finances_set_page(w, widgetIndex - WIDX_TAB_1);
WindowFinancesSetPage(w, widgetIndex - WIDX_TAB_1);
}
/**
*
* rct2: 0x0069D730
*/
static void window_finances_profit_graph_update(rct_window* w)
static void WindowFinancesProfitGraphUpdate(rct_window* w)
{
// Tab animation
if (++w->frame_no >= WindowFinancesTabAnimationLoops[w->page])
@ -907,7 +907,7 @@ static void window_finances_profit_graph_update(rct_window* w)
*
* rct2: 0x0069D388
*/
static void window_finances_profit_graph_invalidate(rct_window* w)
static void WindowFinancesProfitGraphInvalidate(rct_window* w)
{
if (w->widgets != _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_PROFIT_GRAPH])
{
@ -915,17 +915,17 @@ static void window_finances_profit_graph_invalidate(rct_window* w)
WindowInitScrollWidgets(w);
}
window_finances_set_pressed_tab(w);
WindowFinancesSetPressedTab(w);
}
/**
*
* rct2: 0x0069D3BD
*/
static void window_finances_profit_graph_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowFinancesProfitGraphPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_finances_draw_tab_images(dpi, w);
WindowFinancesDrawTabImages(dpi, w);
rct_widget* pageWidget = &_windowFinancesCashWidgets[WIDX_PAGE_BACKGROUND];
auto graphTopLeft = w->windowPos + ScreenCoordsXY{ pageWidget->left + 4, pageWidget->top + 15 };
@ -988,12 +988,12 @@ static void window_finances_profit_graph_paint(rct_window* w, rct_drawpixelinfo*
*
* rct2: 0x0069D9F9
*/
static void window_finances_marketing_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowFinancesMarketingMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
if (widgetIndex == WIDX_CLOSE)
window_close(w);
else if (widgetIndex >= WIDX_TAB_1 && widgetIndex <= WIDX_TAB_6)
window_finances_set_page(w, widgetIndex - WIDX_TAB_1);
WindowFinancesSetPage(w, widgetIndex - WIDX_TAB_1);
else if (widgetIndex >= WIDX_CAMPAIGN_1 && widgetIndex <= WIDX_CAMPAIGN_6)
context_open_detail_window(WD_NEW_CAMPAIGN, widgetIndex - WIDX_CAMPAIGN_1);
}
@ -1002,7 +1002,7 @@ static void window_finances_marketing_mouseup(rct_window* w, rct_widgetindex wid
*
* rct2: 0x0069DA2F
*/
static void window_finances_marketing_update(rct_window* w)
static void WindowFinancesMarketingUpdate(rct_window* w)
{
// Tab animation
if (++w->frame_no >= WindowFinancesTabAnimationLoops[w->page])
@ -1014,7 +1014,7 @@ static void window_finances_marketing_update(rct_window* w)
*
* rct2: 0x0069D765
*/
static void window_finances_marketing_invalidate(rct_window* w)
static void WindowFinancesMarketingInvalidate(rct_window* w)
{
if (w->widgets != _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_MARKETING])
{
@ -1022,7 +1022,7 @@ static void window_finances_marketing_invalidate(rct_window* w)
WindowInitScrollWidgets(w);
}
window_finances_set_pressed_tab(w);
WindowFinancesSetPressedTab(w);
// Count number of active campaigns
int32_t numActiveCampaigns = static_cast<int32_t>(gMarketingCampaigns.size());
@ -1056,10 +1056,10 @@ static void window_finances_marketing_invalidate(rct_window* w)
*
* rct2: 0x0069D834
*/
static void window_finances_marketing_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowFinancesMarketingPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_finances_draw_tab_images(dpi, w);
WindowFinancesDrawTabImages(dpi, w);
auto screenCoords = w->windowPos + ScreenCoordsXY{ 8, 62 };
int32_t noCampaignsActive = 1;
@ -1147,7 +1147,7 @@ static void window_finances_marketing_paint(rct_window* w, rct_drawpixelinfo* dp
*
* rct2: 0x0069DB3F
*/
static void window_finances_research_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowFinancesResearchMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -1160,7 +1160,7 @@ static void window_finances_research_mouseup(rct_window* w, rct_widgetindex widg
case WIDX_TAB_4:
case WIDX_TAB_5:
case WIDX_TAB_6:
window_finances_set_page(w, widgetIndex - WIDX_TAB_1);
WindowFinancesSetPage(w, widgetIndex - WIDX_TAB_1);
break;
case WIDX_TRANSPORT_RIDES:
case WIDX_GENTLE_RIDES:
@ -1184,7 +1184,7 @@ static void window_finances_research_mouseup(rct_window* w, rct_widgetindex widg
*
* rct2: 0x0069DB66
*/
static void window_finances_research_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowFinancesResearchMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
rct_widget* dropdownWidget;
int32_t i;
@ -1211,7 +1211,7 @@ static void window_finances_research_mousedown(rct_window* w, rct_widgetindex wi
*
* rct2: 0x0069DB6D
*/
static void window_finances_research_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowFinancesResearchDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
{
if (widgetIndex != WIDX_RESEARCH_FUNDING_DROPDOWN_BUTTON || dropdownIndex == -1)
return;
@ -1224,7 +1224,7 @@ static void window_finances_research_dropdown(rct_window* w, rct_widgetindex wid
*
* rct2: 0x0069DC23
*/
static void window_finances_research_update(rct_window* w)
static void WindowFinancesResearchUpdate(rct_window* w)
{
// Tab animation
if (++w->frame_no >= WindowFinancesTabAnimationLoops[w->page])
@ -1236,7 +1236,7 @@ static void window_finances_research_update(rct_window* w)
*
* rct2: 0x0069DA64
*/
static void window_finances_research_invalidate(rct_window* w)
static void WindowFinancesResearchInvalidate(rct_window* w)
{
if (w->widgets != _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_RESEARCH])
{
@ -1244,7 +1244,7 @@ static void window_finances_research_invalidate(rct_window* w)
WindowInitScrollWidgets(w);
}
window_finances_set_pressed_tab(w);
WindowFinancesSetPressedTab(w);
if (gResearchProgressStage == RESEARCH_STAGE_FINISHED_ALL)
{
_windowFinancesResearchWidgets[WIDX_RESEARCH_FUNDING].type = WindowWidgetType::Empty;
@ -1291,12 +1291,12 @@ static void window_finances_research_invalidate(rct_window* w)
*
* rct2: 0x0069DAF0
*/
static void window_finances_research_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowFinancesResearchPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_finances_draw_tab_images(dpi, w);
WindowFinancesDrawTabImages(dpi, w);
window_research_funding_page_paint(w, dpi, WIDX_RESEARCH_FUNDING);
WindowResearchFundingPagePaint(w, dpi, WIDX_RESEARCH_FUNDING);
}
#pragma endregion
@ -1307,7 +1307,7 @@ static void window_finances_research_paint(rct_window* w, rct_drawpixelinfo* dpi
*
* rct2: 0x0069CAC5
*/
static void window_finances_set_page(rct_window* w, int32_t page)
static void WindowFinancesSetPage(rct_window* w, int32_t page)
{
w->page = page;
w->frame_no = 0;
@ -1344,10 +1344,10 @@ static void window_finances_set_page(rct_window* w, int32_t page)
// Scroll summary all the way to the right, initially.
if (w->page == WINDOW_FINANCES_PAGE_SUMMARY)
window_finances_summary_invertscroll(w);
WindowFinancesSummaryInvertscroll(w);
}
static void window_finances_set_pressed_tab(rct_window* w)
static void WindowFinancesSetPressedTab(rct_window* w)
{
int32_t i;
for (i = 0; i < WINDOW_FINANCES_PAGE_COUNT; i++)
@ -1355,7 +1355,7 @@ static void window_finances_set_pressed_tab(rct_window* w)
w->pressed_widgets |= 1LL << (WIDX_TAB_1 + w->page);
}
static void window_finances_draw_tab_image(rct_drawpixelinfo* dpi, rct_window* w, int32_t page, int32_t spriteIndex)
static void WindowFinancesDrawTabImage(rct_drawpixelinfo* dpi, rct_window* w, int32_t page, int32_t spriteIndex)
{
rct_widgetindex widgetIndex = WIDX_TAB_1 + page;
@ -1375,14 +1375,14 @@ static void window_finances_draw_tab_image(rct_drawpixelinfo* dpi, rct_window* w
}
}
static void window_finances_draw_tab_images(rct_drawpixelinfo* dpi, rct_window* w)
static void WindowFinancesDrawTabImages(rct_drawpixelinfo* dpi, rct_window* w)
{
window_finances_draw_tab_image(dpi, w, WINDOW_FINANCES_PAGE_SUMMARY, SPR_TAB_FINANCES_SUMMARY_0);
window_finances_draw_tab_image(dpi, w, WINDOW_FINANCES_PAGE_FINANCIAL_GRAPH, SPR_TAB_FINANCES_FINANCIAL_GRAPH_0);
window_finances_draw_tab_image(dpi, w, WINDOW_FINANCES_PAGE_VALUE_GRAPH, SPR_TAB_FINANCES_VALUE_GRAPH_0);
window_finances_draw_tab_image(dpi, w, WINDOW_FINANCES_PAGE_PROFIT_GRAPH, SPR_TAB_FINANCES_PROFIT_GRAPH_0);
window_finances_draw_tab_image(dpi, w, WINDOW_FINANCES_PAGE_MARKETING, SPR_TAB_FINANCES_MARKETING_0);
window_finances_draw_tab_image(dpi, w, WINDOW_FINANCES_PAGE_RESEARCH, SPR_TAB_FINANCES_RESEARCH_0);
WindowFinancesDrawTabImage(dpi, w, WINDOW_FINANCES_PAGE_SUMMARY, SPR_TAB_FINANCES_SUMMARY_0);
WindowFinancesDrawTabImage(dpi, w, WINDOW_FINANCES_PAGE_FINANCIAL_GRAPH, SPR_TAB_FINANCES_FINANCIAL_GRAPH_0);
WindowFinancesDrawTabImage(dpi, w, WINDOW_FINANCES_PAGE_VALUE_GRAPH, SPR_TAB_FINANCES_VALUE_GRAPH_0);
WindowFinancesDrawTabImage(dpi, w, WINDOW_FINANCES_PAGE_PROFIT_GRAPH, SPR_TAB_FINANCES_PROFIT_GRAPH_0);
WindowFinancesDrawTabImage(dpi, w, WINDOW_FINANCES_PAGE_MARKETING, SPR_TAB_FINANCES_MARKETING_0);
WindowFinancesDrawTabImage(dpi, w, WINDOW_FINANCES_PAGE_RESEARCH, SPR_TAB_FINANCES_RESEARCH_0);
}
#pragma endregion

186
src/openrct2-ui/windows/Footpath.cpp
View File

@ -111,31 +111,31 @@ static rct_widget window_footpath_widgets[] = {
WIDGETS_END,
};
static void window_footpath_close(rct_window * w);
static void window_footpath_mouseup(rct_window * w, rct_widgetindex widgetIndex);
static void window_footpath_mousedown(rct_window * w, rct_widgetindex widgetIndex, rct_widget * widget);
static void window_footpath_dropdown(rct_window * w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void window_footpath_update(rct_window * w);
static void window_footpath_toolupdate(rct_window * w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void window_footpath_tooldown(rct_window * w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void window_footpath_tooldrag(rct_window * w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void window_footpath_toolup(rct_window * w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void window_footpath_invalidate(rct_window * w);
static void window_footpath_paint(rct_window * w, rct_drawpixelinfo * dpi);
static void WindowFootpathClose(rct_window * w);
static void WindowFootpathMouseup(rct_window * w, rct_widgetindex widgetIndex);
static void WindowFootpathMousedown(rct_window * w, rct_widgetindex widgetIndex, rct_widget * widget);
static void WindowFootpathDropdown(rct_window * w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowFootpathUpdate(rct_window * w);
static void WindowFootpathToolupdate(rct_window * w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowFootpathTooldown(rct_window * w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowFootpathTooldrag(rct_window * w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowFootpathToolup(rct_window * w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowFootpathInvalidate(rct_window * w);
static void WindowFootpathPaint(rct_window * w, rct_drawpixelinfo * dpi);
static rct_window_event_list window_footpath_events([](auto& events)
{
events.close = &window_footpath_close;
events.mouse_up = &window_footpath_mouseup;
events.mouse_down = &window_footpath_mousedown;
events.dropdown = &window_footpath_dropdown;
events.update = &window_footpath_update;
events.tool_update = &window_footpath_toolupdate;
events.tool_down = &window_footpath_tooldown;
events.tool_drag = &window_footpath_tooldrag;
events.tool_up = &window_footpath_toolup;
events.invalidate = &window_footpath_invalidate;
events.paint = &window_footpath_paint;
events.close = &WindowFootpathClose;
events.mouse_up = &WindowFootpathMouseup;
events.mouse_down = &WindowFootpathMousedown;
events.dropdown = &WindowFootpathDropdown;
events.update = &WindowFootpathUpdate;
events.tool_update = &WindowFootpathToolupdate;
events.tool_down = &WindowFootpathTooldown;
events.tool_drag = &WindowFootpathTooldrag;
events.tool_up = &WindowFootpathToolup;
events.invalidate = &WindowFootpathInvalidate;
events.paint = &WindowFootpathPaint;
});
// clang-format on
@ -171,25 +171,25 @@ static constexpr const uint8_t ConstructionPreviewImages[][4] = {
{ 18, 19, 16, 17 }, // Downwards
};
static void window_footpath_mousedown_direction(int32_t direction);
static void window_footpath_mousedown_slope(int32_t slope);
static void window_footpath_show_footpath_types_dialog(rct_window* w, rct_widget* widget, bool showQueues);
static void WindowFootpathMousedownDirection(int32_t direction);
static void WindowFootpathMousedownSlope(int32_t slope);
static void WindowFootpathShowFootpathTypesDialog(rct_window* w, rct_widget* widget, bool showQueues);
static void WindowFootpathShowRailingsTypesDialog(rct_window* w, rct_widget* widget);
static void window_footpath_set_provisional_path_at_point(const ScreenCoordsXY& screenCoords);
static void window_footpath_set_selection_start_bridge_at_point(const ScreenCoordsXY& screenCoords);
static void window_footpath_place_path_at_point(const ScreenCoordsXY& screenCoords);
static void window_footpath_start_bridge_at_point(const ScreenCoordsXY& screenCoords);
static void window_footpath_construct();
static void window_footpath_remove();
static void window_footpath_set_enabled_and_pressed_widgets();
static void footpath_get_next_path_info(ObjectEntryIndex* type, CoordsXYZ& footpathLoc, int32_t* slope);
static void WindowFootpathSetProvisionalPathAtPoint(const ScreenCoordsXY& screenCoords);
static void WindowFootpathSetSelectionStartBridgeAtPoint(const ScreenCoordsXY& screenCoords);
static void WindowFootpathPlacePathAtPoint(const ScreenCoordsXY& screenCoords);
static void WindowFootpathStartBridgeAtPoint(const ScreenCoordsXY& screenCoords);
static void WindowFootpathConstruct();
static void WindowFootpathRemove();
static void WindowFootpathSetEnabledAndPressedWidgets();
static void FootpathGetNextPathInfo(ObjectEntryIndex* type, CoordsXYZ& footpathLoc, int32_t* slope);
static bool FootpathSelectDefault();
/**
*
* rct2: 0x006A7C43
*/
rct_window* window_footpath_open()
rct_window* WindowFootpathOpen()
{
if (!FootpathSelectDefault())
{
@ -221,7 +221,7 @@ rct_window* window_footpath_open()
tool_set(window, WIDX_CONSTRUCT_ON_LAND, Tool::PathDown);
input_set_flag(INPUT_FLAG_6, true);
_footpathErrorOccured = false;
window_footpath_set_enabled_and_pressed_widgets();
WindowFootpathSetEnabledAndPressedWidgets();
return window;
}
@ -230,7 +230,7 @@ rct_window* window_footpath_open()
*
* rct2: 0x006A852F
*/
static void window_footpath_close(rct_window* w)
static void WindowFootpathClose(rct_window* w)
{
footpath_provisional_update();
viewport_set_visibility(0);
@ -244,7 +244,7 @@ static void window_footpath_close(rct_window* w)
*
* rct2: 0x006A7E92
*/
static void window_footpath_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowFootpathMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -252,10 +252,10 @@ static void window_footpath_mouseup(rct_window* w, rct_widgetindex widgetIndex)
window_close(w);
break;
case WIDX_CONSTRUCT:
window_footpath_construct();
WindowFootpathConstruct();
break;
case WIDX_REMOVE:
window_footpath_remove();
WindowFootpathRemove();
break;
case WIDX_CONSTRUCT_ON_LAND:
if (_footpathConstructionMode == PATH_CONSTRUCTION_MODE_LAND)
@ -272,7 +272,7 @@ static void window_footpath_mouseup(rct_window* w, rct_widgetindex widgetIndex)
tool_set(w, WIDX_CONSTRUCT_ON_LAND, Tool::PathDown);
input_set_flag(INPUT_FLAG_6, true);
_footpathErrorOccured = false;
window_footpath_set_enabled_and_pressed_widgets();
WindowFootpathSetEnabledAndPressedWidgets();
break;
case WIDX_CONSTRUCT_BRIDGE_OR_TUNNEL:
if (_footpathConstructionMode == PATH_CONSTRUCTION_MODE_BRIDGE_OR_TUNNEL_TOOL)
@ -289,7 +289,7 @@ static void window_footpath_mouseup(rct_window* w, rct_widgetindex widgetIndex)
tool_set(w, WIDX_CONSTRUCT_BRIDGE_OR_TUNNEL, Tool::Crosshair);
input_set_flag(INPUT_FLAG_6, true);
_footpathErrorOccured = false;
window_footpath_set_enabled_and_pressed_widgets();
WindowFootpathSetEnabledAndPressedWidgets();
break;
}
}
@ -298,39 +298,39 @@ static void window_footpath_mouseup(rct_window* w, rct_widgetindex widgetIndex)
*
* rct2: 0x006A7EC5
*/
static void window_footpath_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowFootpathMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
switch (widgetIndex)
{
case WIDX_FOOTPATH_TYPE:
window_footpath_show_footpath_types_dialog(w, widget, false);
WindowFootpathShowFootpathTypesDialog(w, widget, false);
break;
case WIDX_QUEUELINE_TYPE:
window_footpath_show_footpath_types_dialog(w, widget, true);
WindowFootpathShowFootpathTypesDialog(w, widget, true);
break;
case WIDX_RAILINGS_TYPE:
WindowFootpathShowRailingsTypesDialog(w, widget);
break;
case WIDX_DIRECTION_NW:
window_footpath_mousedown_direction(0);
WindowFootpathMousedownDirection(0);
break;
case WIDX_DIRECTION_NE:
window_footpath_mousedown_direction(1);
WindowFootpathMousedownDirection(1);
break;
case WIDX_DIRECTION_SW:
window_footpath_mousedown_direction(2);
WindowFootpathMousedownDirection(2);
break;
case WIDX_DIRECTION_SE:
window_footpath_mousedown_direction(3);
WindowFootpathMousedownDirection(3);
break;
case WIDX_SLOPEDOWN:
window_footpath_mousedown_slope(6);
WindowFootpathMousedownSlope(6);
break;
case WIDX_LEVEL:
window_footpath_mousedown_slope(0);
WindowFootpathMousedownSlope(0);
break;
case WIDX_SLOPEUP:
window_footpath_mousedown_slope(2);
WindowFootpathMousedownSlope(2);
break;
}
}
@ -339,7 +339,7 @@ static void window_footpath_mousedown(rct_window* w, rct_widgetindex widgetIndex
*
* rct2: 0x006A7F18
*/
static void window_footpath_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowFootpathDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
{
if (dropdownIndex < 0 || static_cast<size_t>(dropdownIndex) >= _dropdownEntries.size())
return;
@ -389,15 +389,15 @@ static void window_footpath_dropdown(rct_window* w, rct_widgetindex widgetIndex,
*
* rct2: 0x006A8032
*/
static void window_footpath_toolupdate(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowFootpathToolupdate(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
{
if (widgetIndex == WIDX_CONSTRUCT_ON_LAND)
{
window_footpath_set_provisional_path_at_point(screenCoords);
WindowFootpathSetProvisionalPathAtPoint(screenCoords);
}
else if (widgetIndex == WIDX_CONSTRUCT_BRIDGE_OR_TUNNEL)
{
window_footpath_set_selection_start_bridge_at_point(screenCoords);
WindowFootpathSetSelectionStartBridgeAtPoint(screenCoords);
}
}
@ -405,15 +405,15 @@ static void window_footpath_toolupdate(rct_window* w, rct_widgetindex widgetInde
*
* rct2: 0x006A8047
*/
static void window_footpath_tooldown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowFootpathTooldown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
{
if (widgetIndex == WIDX_CONSTRUCT_ON_LAND)
{
window_footpath_place_path_at_point(screenCoords);
WindowFootpathPlacePathAtPoint(screenCoords);
}
else if (widgetIndex == WIDX_CONSTRUCT_BRIDGE_OR_TUNNEL)
{
window_footpath_start_bridge_at_point(screenCoords);
WindowFootpathStartBridgeAtPoint(screenCoords);
}
}
@ -421,11 +421,11 @@ static void window_footpath_tooldown(rct_window* w, rct_widgetindex widgetIndex,
*
* rct2: 0x006A8067
*/
static void window_footpath_tooldrag(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowFootpathTooldrag(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
{
if (widgetIndex == WIDX_CONSTRUCT_ON_LAND)
{
window_footpath_place_path_at_point(screenCoords);
WindowFootpathPlacePathAtPoint(screenCoords);
}
}
@ -433,7 +433,7 @@ static void window_footpath_tooldrag(rct_window* w, rct_widgetindex widgetIndex,
*
* rct2: 0x006A8066
*/
static void window_footpath_toolup(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowFootpathToolup(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
{
if (widgetIndex == WIDX_CONSTRUCT_ON_LAND)
{
@ -445,7 +445,7 @@ static void window_footpath_toolup(rct_window* w, rct_widgetindex widgetIndex, c
*
* rct2: 0x006A7760
*/
static void window_footpath_update_provisional_path_for_bridge_mode(rct_window* w)
static void WindowFootpathUpdateProvisionalPathForBridgeMode(rct_window* w)
{
if (_footpathConstructionMode != PATH_CONSTRUCTION_MODE_BRIDGE_OR_TUNNEL)
{
@ -467,7 +467,7 @@ static void window_footpath_update_provisional_path_for_bridge_mode(rct_window*
CoordsXYZ footpathLoc;
int32_t slope;
footpath_get_next_path_info(&type, footpathLoc, &slope);
FootpathGetNextPathInfo(&type, footpathLoc, &slope);
auto pathConstructFlags = FootpathCreateConstructFlags(type);
_window_footpath_cost = footpath_provisional_set(type, railings, footpathLoc, slope, pathConstructFlags);
@ -484,7 +484,7 @@ static void window_footpath_update_provisional_path_for_bridge_mode(rct_window*
gProvisionalFootpath.Flags ^= PROVISIONAL_PATH_FLAG_SHOW_ARROW;
CoordsXYZ footpathLoc;
int32_t slope;
footpath_get_next_path_info(nullptr, footpathLoc, &slope);
FootpathGetNextPathInfo(nullptr, footpathLoc, &slope);
gMapSelectArrowPosition = footpathLoc;
gMapSelectArrowDirection = _footpathConstructDirection;
if (gProvisionalFootpath.Flags & PROVISIONAL_PATH_FLAG_SHOW_ARROW)
@ -503,17 +503,17 @@ static void window_footpath_update_provisional_path_for_bridge_mode(rct_window*
*
* rct2: 0x006A84BB
*/
static void window_footpath_update(rct_window* w)
static void WindowFootpathUpdate(rct_window* w)
{
widget_invalidate(w, WIDX_CONSTRUCT);
window_footpath_update_provisional_path_for_bridge_mode(w);
WindowFootpathUpdateProvisionalPathForBridgeMode(w);
// #2502: The camera might have changed rotation, so we need to update which directional buttons are pressed
uint8_t currentRotation = get_current_rotation();
if (_lastUpdatedCameraRotation != currentRotation)
{
_lastUpdatedCameraRotation = currentRotation;
window_footpath_set_enabled_and_pressed_widgets();
WindowFootpathSetEnabledAndPressedWidgets();
}
// Check tool
@ -553,7 +553,7 @@ static void window_footpath_update(rct_window* w)
*
* rct2: 0x006A7D1C
*/
static void window_footpath_invalidate(rct_window* w)
static void WindowFootpathInvalidate(rct_window* w)
{
// Press / unpress footpath and queue type buttons
w->pressed_widgets &= ~(1ULL << WIDX_FOOTPATH_TYPE);
@ -623,7 +623,7 @@ static void window_footpath_invalidate(rct_window* w)
*
* rct2: 0x006A7D8B
*/
static void window_footpath_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowFootpathPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
ScreenCoordsXY screenCoords;
WindowDrawWidgets(w, dpi);
@ -703,7 +703,7 @@ static void window_footpath_paint(rct_window* w, rct_drawpixelinfo* dpi)
*
* rct2: 0x006A7F88
*/
static void window_footpath_show_footpath_types_dialog(rct_window* w, rct_widget* widget, bool showQueues)
static void WindowFootpathShowFootpathTypesDialog(rct_window* w, rct_widget* widget, bool showQueues)
{
auto& objManager = OpenRCT2::GetContext()->GetObjectManager();
@ -810,31 +810,31 @@ static void WindowFootpathShowRailingsTypesDialog(rct_window* w, rct_widget* wid
*
* rct2: 0x006A8111 0x006A8135 0x006A815C 0x006A8183
*/
static void window_footpath_mousedown_direction(int32_t direction)
static void WindowFootpathMousedownDirection(int32_t direction)
{
footpath_provisional_update();
_footpathConstructDirection = (direction - get_current_rotation()) & 3;
_window_footpath_cost = MONEY32_UNDEFINED;
window_footpath_set_enabled_and_pressed_widgets();
WindowFootpathSetEnabledAndPressedWidgets();
}
/**
*
* rct2: 0x006A81AA 0x006A81C5 0x006A81E0
*/
static void window_footpath_mousedown_slope(int32_t slope)
static void WindowFootpathMousedownSlope(int32_t slope)
{
footpath_provisional_update();
gFootpathConstructSlope = slope;
_window_footpath_cost = MONEY32_UNDEFINED;
window_footpath_set_enabled_and_pressed_widgets();
WindowFootpathSetEnabledAndPressedWidgets();
}
/**
*
* rct2: 0x006A81FB
*/
static void window_footpath_set_provisional_path_at_point(const ScreenCoordsXY& screenCoords)
static void WindowFootpathSetProvisionalPathAtPoint(const ScreenCoordsXY& screenCoords)
{
map_invalidate_selection_rect();
gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_ARROW;
@ -912,7 +912,7 @@ static void window_footpath_set_provisional_path_at_point(const ScreenCoordsXY&
*
* rct2: 0x006A8388
*/
static void window_footpath_set_selection_start_bridge_at_point(const ScreenCoordsXY& screenCoords)
static void WindowFootpathSetSelectionStartBridgeAtPoint(const ScreenCoordsXY& screenCoords)
{
int32_t direction;
TileElement* tileElement;
@ -956,7 +956,7 @@ static void window_footpath_set_selection_start_bridge_at_point(const ScreenCoor
*
* rct2: 0x006A82C5
*/
static void window_footpath_place_path_at_point(const ScreenCoordsXY& screenCoords)
static void WindowFootpathPlacePathAtPoint(const ScreenCoordsXY& screenCoords)
{
if (_footpathErrorOccured)
{
@ -1025,7 +1025,7 @@ static void window_footpath_place_path_at_point(const ScreenCoordsXY& screenCoor
*
* rct2: 0x006A840F
*/
static void window_footpath_start_bridge_at_point(const ScreenCoordsXY& screenCoords)
static void WindowFootpathStartBridgeAtPoint(const ScreenCoordsXY& screenCoords)
{
int32_t z, direction;
TileElement* tileElement;
@ -1075,14 +1075,14 @@ static void window_footpath_start_bridge_at_point(const ScreenCoordsXY& screenCo
gFootpathConstructSlope = 0;
_footpathConstructionMode = PATH_CONSTRUCTION_MODE_BRIDGE_OR_TUNNEL;
_footpathConstructValidDirections = INVALID_DIRECTION;
window_footpath_set_enabled_and_pressed_widgets();
WindowFootpathSetEnabledAndPressedWidgets();
}
/**
* Construct a piece of footpath while in bridge building mode.
* rct2: 0x006A79B7
*/
static void window_footpath_construct()
static void WindowFootpathConstruct()
{
_window_footpath_cost = MONEY32_UNDEFINED;
footpath_provisional_update();
@ -1090,7 +1090,7 @@ static void window_footpath_construct()
ObjectEntryIndex type;
int32_t slope;
CoordsXYZ footpathLoc;
footpath_get_next_path_info(&type, footpathLoc, &slope);
FootpathGetNextPathInfo(&type, footpathLoc, &slope);
gGameCommandErrorTitle = STR_CANT_BUILD_FOOTPATH_HERE;
PathConstructFlags constructFlags = FootpathCreateConstructFlags(type);
@ -1125,7 +1125,7 @@ static void window_footpath_construct()
gFootpathConstructFromPosition.z += PATH_HEIGHT_STEP;
}
}
window_footpath_set_enabled_and_pressed_widgets();
WindowFootpathSetEnabledAndPressedWidgets();
});
GameActions::Execute(&footpathPlaceAction);
}
@ -1134,7 +1134,7 @@ static void window_footpath_construct()
*
* rct2: 0x006A78EF
*/
static void footpath_remove_tile_element(TileElement* tileElement)
static void FootpathRemoveTileElement(TileElement* tileElement)
{
auto z = tileElement->GetBaseZ();
if (tileElement->AsPath()->IsSloped())
@ -1183,7 +1183,7 @@ static void footpath_remove_tile_element(TileElement* tileElement)
*
* rct2: 0x006A7873
*/
static TileElement* footpath_get_tile_element_to_remove()
static TileElement* FootpathGetTileElementToRemove()
{
TileElement* tileElement;
int32_t z, zLow;
@ -1237,27 +1237,27 @@ static TileElement* footpath_get_tile_element_to_remove()
*
* rct2: 0x006A7863
*/
static void window_footpath_remove()
static void WindowFootpathRemove()
{
TileElement* tileElement;
_window_footpath_cost = MONEY32_UNDEFINED;
footpath_provisional_update();
tileElement = footpath_get_tile_element_to_remove();
tileElement = FootpathGetTileElementToRemove();
if (tileElement != nullptr)
{
footpath_remove_tile_element(tileElement);
FootpathRemoveTileElement(tileElement);
}
window_footpath_set_enabled_and_pressed_widgets();
WindowFootpathSetEnabledAndPressedWidgets();
}
/**
*
* rct2: 0x006A855C
*/
static void window_footpath_set_enabled_and_pressed_widgets()
static void WindowFootpathSetEnabledAndPressedWidgets()
{
rct_window* w = window_find_by_class(WC_FOOTPATH);
if (w == nullptr)
@ -1332,7 +1332,7 @@ static void window_footpath_set_enabled_and_pressed_widgets()
*
* rct2: 0x006A7B20
*/
static void footpath_get_next_path_info(ObjectEntryIndex* type, CoordsXYZ& footpathLoc, int32_t* slope)
static void FootpathGetNextPathInfo(ObjectEntryIndex* type, CoordsXYZ& footpathLoc, int32_t* slope)
{
auto direction = _footpathConstructDirection;
footpathLoc.x = gFootpathConstructFromPosition.x + CoordsDirectionDelta[direction].x;
@ -1512,7 +1512,7 @@ void window_footpath_keyboard_shortcut_turn_left()
}
int32_t currentRotation = get_current_rotation();
int32_t turnedRotation = _footpathConstructDirection - currentRotation + (currentRotation % 2 == 1 ? 1 : -1);
window_footpath_mousedown_direction(turnedRotation);
WindowFootpathMousedownDirection(turnedRotation);
}
void window_footpath_keyboard_shortcut_turn_right()
@ -1525,7 +1525,7 @@ void window_footpath_keyboard_shortcut_turn_right()
}
int32_t currentRotation = get_current_rotation();
int32_t turnedRotation = _footpathConstructDirection - currentRotation + (currentRotation % 2 == 1 ? -1 : 1);
window_footpath_mousedown_direction(turnedRotation);
WindowFootpathMousedownDirection(turnedRotation);
}
void window_footpath_keyboard_shortcut_slope_down()
@ -1583,7 +1583,7 @@ void window_footpath_keyboard_shortcut_demolish_current()
return;
}
window_footpath_remove();
WindowFootpathRemove();
}
void window_footpath_keyboard_shortcut_build_current()

84
src/openrct2-ui/windows/GameBottomToolbar.cpp
View File

@ -68,19 +68,19 @@ static rct_widget window_game_bottom_toolbar_widgets[] =
uint8_t gToolbarDirtyFlags;
static void window_game_bottom_toolbar_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static OpenRCT2String window_game_bottom_toolbar_tooltip(rct_window* w, const rct_widgetindex widgetIndex, const rct_string_id fallback);
static void window_game_bottom_toolbar_invalidate(rct_window *w);
static void window_game_bottom_toolbar_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_game_bottom_toolbar_update(rct_window* w);
static void window_game_bottom_toolbar_cursor(rct_window *w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords, CursorID *cursorId);
static void window_game_bottom_toolbar_unknown05(rct_window *w);
static void WindowGameBottomToolbarMouseup(rct_window *w, rct_widgetindex widgetIndex);
static OpenRCT2String WindowGameBottomToolbarTooltip(rct_window* w, const rct_widgetindex widgetIndex, const rct_string_id fallback);
static void WindowGameBottomToolbarInvalidate(rct_window *w);
static void WindowGameBottomToolbarPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowGameBottomToolbarUpdate(rct_window* w);
static void WindowGameBottomToolbarCursor(rct_window *w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords, CursorID *cursorId);
static void WindowGameBottomToolbarUnknown05(rct_window *w);
static void window_game_bottom_toolbar_draw_left_panel(rct_drawpixelinfo *dpi, rct_window *w);
static void window_game_bottom_toolbar_draw_park_rating(rct_drawpixelinfo *dpi, rct_window *w, int32_t colour, const ScreenCoordsXY& coords, uint8_t factor);
static void window_game_bottom_toolbar_draw_right_panel(rct_drawpixelinfo *dpi, rct_window *w);
static void window_game_bottom_toolbar_draw_news_item(rct_drawpixelinfo *dpi, rct_window *w);
static void window_game_bottom_toolbar_draw_middle_panel(rct_drawpixelinfo *dpi, rct_window *w);
static void WindowGameBottomToolbarDrawLeftPanel(rct_drawpixelinfo *dpi, rct_window *w);
static void WindowGameBottomToolbarDrawParkRating(rct_drawpixelinfo *dpi, rct_window *w, int32_t colour, const ScreenCoordsXY& coords, uint8_t factor);
static void WindowGameBottomToolbarDrawRightPanel(rct_drawpixelinfo *dpi, rct_window *w);
static void WindowGameBottomToolbarDrawNewsItem(rct_drawpixelinfo *dpi, rct_window *w);
static void WindowGameBottomToolbarDrawMiddlePanel(rct_drawpixelinfo *dpi, rct_window *w);
/**
*
@ -88,23 +88,23 @@ static void window_game_bottom_toolbar_draw_middle_panel(rct_drawpixelinfo *dpi,
*/
static rct_window_event_list window_game_bottom_toolbar_events([](auto& events)
{
events.mouse_up = &window_game_bottom_toolbar_mouseup;
events.unknown_05 = &window_game_bottom_toolbar_unknown05;
events.update = &window_game_bottom_toolbar_update;
events.tooltip = &window_game_bottom_toolbar_tooltip;
events.cursor = &window_game_bottom_toolbar_cursor;
events.invalidate = &window_game_bottom_toolbar_invalidate;
events.paint = &window_game_bottom_toolbar_paint;
events.mouse_up = &WindowGameBottomToolbarMouseup;
events.unknown_05 = &WindowGameBottomToolbarUnknown05;
events.update = &WindowGameBottomToolbarUpdate;
events.tooltip = &WindowGameBottomToolbarTooltip;
events.cursor = &WindowGameBottomToolbarCursor;
events.invalidate = &WindowGameBottomToolbarInvalidate;
events.paint = &WindowGameBottomToolbarPaint;
});
// clang-format on
static void window_game_bottom_toolbar_invalidate_dirty_widgets(rct_window* w);
static void WindowGameBottomToolbarInvalidateDirtyWidgets(rct_window* w);
/**
* Creates the main game bottom toolbar window.
* rct2: 0x0066B52F (part of 0x0066B3E8)
*/
rct_window* window_game_bottom_toolbar_open()
rct_window* WindowGameBottomToolbarOpen()
{
int32_t screenWidth = context_get_width();
int32_t screenHeight = context_get_height();
@ -135,7 +135,7 @@ rct_window* window_game_bottom_toolbar_open()
*
* rct2: 0x0066C588
*/
static void window_game_bottom_toolbar_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowGameBottomToolbarMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
News::Item* newsItem;
@ -190,7 +190,7 @@ static void window_game_bottom_toolbar_mouseup(rct_window* w, rct_widgetindex wi
}
}
static OpenRCT2String window_game_bottom_toolbar_tooltip(
static OpenRCT2String WindowGameBottomToolbarTooltip(
rct_window* w, const rct_widgetindex widgetIndex, const rct_string_id fallback)
{
int32_t month, day;
@ -220,7 +220,7 @@ static OpenRCT2String window_game_bottom_toolbar_tooltip(
*
* rct2: 0x0066BBA0
*/
static void window_game_bottom_toolbar_invalidate(rct_window* w)
static void WindowGameBottomToolbarInvalidate(rct_window* w)
{
// Figure out how much line height we have to work with.
uint32_t line_height = font_get_line_height(FontSpriteBase::MEDIUM);
@ -337,7 +337,7 @@ static void window_game_bottom_toolbar_invalidate(rct_window* w)
*
* rct2: 0x0066BB79
*/
void window_game_bottom_toolbar_invalidate_news_item()
void WindowGameBottomToolbarInvalidateNewsItem()
{
if (gScreenFlags == SCREEN_FLAGS_PLAYING)
{
@ -349,7 +349,7 @@ void window_game_bottom_toolbar_invalidate_news_item()
*
* rct2: 0x0066BC87
*/
static void window_game_bottom_toolbar_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowGameBottomToolbarPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
auto leftWidget = window_game_bottom_toolbar_widgets[WIDX_LEFT_OUTSET];
auto rightWidget = window_game_bottom_toolbar_widgets[WIDX_RIGHT_OUTSET];
@ -374,20 +374,20 @@ static void window_game_bottom_toolbar_paint(rct_window* w, rct_drawpixelinfo* d
WindowDrawWidgets(w, dpi);
window_game_bottom_toolbar_draw_left_panel(dpi, w);
window_game_bottom_toolbar_draw_right_panel(dpi, w);
WindowGameBottomToolbarDrawLeftPanel(dpi, w);
WindowGameBottomToolbarDrawRightPanel(dpi, w);
if (!News::IsQueueEmpty())
{
window_game_bottom_toolbar_draw_news_item(dpi, w);
WindowGameBottomToolbarDrawNewsItem(dpi, w);
}
else if (ThemeGetFlags() & UITHEME_FLAG_USE_FULL_BOTTOM_TOOLBAR)
{
window_game_bottom_toolbar_draw_middle_panel(dpi, w);
WindowGameBottomToolbarDrawMiddlePanel(dpi, w);
}
}
static void window_game_bottom_toolbar_draw_left_panel(rct_drawpixelinfo* dpi, rct_window* w)
static void WindowGameBottomToolbarDrawLeftPanel(rct_drawpixelinfo* dpi, rct_window* w)
{
const auto topLeft = w->windowPos
+ ScreenCoordsXY{ window_game_bottom_toolbar_widgets[WIDX_LEFT_OUTSET].left + 1,
@ -451,7 +451,7 @@ static void window_game_bottom_toolbar_draw_left_panel(rct_drawpixelinfo* dpi, r
rct_widget widget = window_game_bottom_toolbar_widgets[WIDX_PARK_RATING];
auto screenCoords = w->windowPos + ScreenCoordsXY{ widget.left + 11, widget.midY() - 5 };
window_game_bottom_toolbar_draw_park_rating(
WindowGameBottomToolbarDrawParkRating(
dpi, w, w->colours[3], screenCoords, std::max(10, ((gParkRating / 4) * 263) / 256));
}
}
@ -460,7 +460,7 @@ static void window_game_bottom_toolbar_draw_left_panel(rct_drawpixelinfo* dpi, r
*
* rct2: 0x0066C76C
*/
static void window_game_bottom_toolbar_draw_park_rating(
static void WindowGameBottomToolbarDrawParkRating(
rct_drawpixelinfo* dpi, rct_window* w, int32_t colour, const ScreenCoordsXY& coords, uint8_t factor)
{
int16_t bar_width;
@ -482,7 +482,7 @@ static void window_game_bottom_toolbar_draw_park_rating(
gfx_draw_sprite(dpi, ImageId(SPR_RATING_HIGH), coords + ScreenCoordsXY{ 114, 0 });
}
static void window_game_bottom_toolbar_draw_right_panel(rct_drawpixelinfo* dpi, rct_window* w)
static void WindowGameBottomToolbarDrawRightPanel(rct_drawpixelinfo* dpi, rct_window* w)
{
const auto topLeft = w->windowPos
+ ScreenCoordsXY{ window_game_bottom_toolbar_widgets[WIDX_RIGHT_OUTSET].left + 1,
@ -554,7 +554,7 @@ static void window_game_bottom_toolbar_draw_right_panel(rct_drawpixelinfo* dpi,
*
* rct2: 0x0066BFA5
*/
static void window_game_bottom_toolbar_draw_news_item(rct_drawpixelinfo* dpi, rct_window* w)
static void WindowGameBottomToolbarDrawNewsItem(rct_drawpixelinfo* dpi, rct_window* w)
{
int32_t width;
News::Item* newsItem;
@ -654,7 +654,7 @@ static void window_game_bottom_toolbar_draw_news_item(rct_drawpixelinfo* dpi, rc
}
}
static void window_game_bottom_toolbar_draw_middle_panel(rct_drawpixelinfo* dpi, rct_window* w)
static void WindowGameBottomToolbarDrawMiddlePanel(rct_drawpixelinfo* dpi, rct_window* w)
{
rct_widget* middleOutsetWidget = &window_game_bottom_toolbar_widgets[WIDX_MIDDLE_OUTSET];
@ -691,20 +691,20 @@ static void window_game_bottom_toolbar_draw_middle_panel(rct_drawpixelinfo* dpi,
*
* rct2: 0x0066C6D8
*/
static void window_game_bottom_toolbar_update(rct_window* w)
static void WindowGameBottomToolbarUpdate(rct_window* w)
{
w->frame_no++;
if (w->frame_no >= 24)
w->frame_no = 0;
window_game_bottom_toolbar_invalidate_dirty_widgets(w);
WindowGameBottomToolbarInvalidateDirtyWidgets(w);
}
/**
*
* rct2: 0x0066C644
*/
static void window_game_bottom_toolbar_cursor(
static void WindowGameBottomToolbarCursor(
rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords, CursorID* cursorId)
{
switch (widgetIndex)
@ -722,16 +722,16 @@ static void window_game_bottom_toolbar_cursor(
*
* rct2: 0x0066C6F2
*/
static void window_game_bottom_toolbar_unknown05(rct_window* w)
static void WindowGameBottomToolbarUnknown05(rct_window* w)
{
window_game_bottom_toolbar_invalidate_dirty_widgets(w);
WindowGameBottomToolbarInvalidateDirtyWidgets(w);
}
/**
*
* rct2: 0x0066C6F2
*/
static void window_game_bottom_toolbar_invalidate_dirty_widgets(rct_window* w)
static void WindowGameBottomToolbarInvalidateDirtyWidgets(rct_window* w)
{
if (gToolbarDirtyFlags & BTM_TB_DIRTY_FLAG_MONEY)
{

413
src/openrct2-ui/windows/Guest.cpp
View File

@ -145,119 +145,119 @@ static rct_widget* window_guest_page_widgets[] = {
};
// clang-format on
static void window_guest_set_page(rct_window* w, int32_t page);
static void window_guest_disable_widgets(rct_window* w);
static void window_guest_viewport_init(rct_window* w);
static void window_guest_common_resize(rct_window* w);
static void window_guest_common_invalidate(rct_window* w);
static void WindowGuestSetPage(rct_window* w, int32_t page);
static void WindowGuestDisableWidgets(rct_window* w);
static void WindowGuestViewportInit(rct_window* w);
static void WindowGuestCommonResize(rct_window* w);
static void WindowGuestCommonInvalidate(rct_window* w);
static void window_guest_overview_close(rct_window* w);
static void window_guest_overview_resize(rct_window* w);
static void window_guest_overview_mouse_up(rct_window* w, rct_widgetindex widgetIndex);
static void window_guest_overview_mouse_down(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void window_guest_overview_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void window_guest_overview_paint(rct_window* w, rct_drawpixelinfo* dpi);
static void window_guest_overview_invalidate(rct_window* w);
static void window_guest_overview_viewport_rotate(rct_window* w);
static void window_guest_overview_update(rct_window* w);
static void window_guest_overview_text_input(rct_window* w, rct_widgetindex widgetIndex, char* text);
static void window_guest_overview_tool_update(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void window_guest_overview_tool_down(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void window_guest_overview_tool_abort(rct_window* w, rct_widgetindex widgetIndex);
static void window_guest_follow(rct_window* w);
static void window_guest_show_locate_dropdown(rct_window* w, rct_widget* widget);
static void WindowGuestOverviewClose(rct_window* w);
static void WindowGuestOverviewResize(rct_window* w);
static void WindowGuestOverviewMouseUp(rct_window* w, rct_widgetindex widgetIndex);
static void WindowGuestOverviewMouseDown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowGuestOverviewDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowGuestOverviewPaint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowGuestOverviewInvalidate(rct_window* w);
static void WindowGuestOverviewViewportRotate(rct_window* w);
static void WindowGuestOverviewUpdate(rct_window* w);
static void WindowGuestOverviewTextInput(rct_window* w, rct_widgetindex widgetIndex, char* text);
static void WindowGuestOverviewToolUpdate(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowGuestOverviewToolDown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowGuestOverviewToolAbort(rct_window* w, rct_widgetindex widgetIndex);
static void WindowGuestFollow(rct_window* w);
static void WindowGuestShowLocateDropdown(rct_window* w, rct_widget* widget);
static void window_guest_mouse_up(rct_window* w, rct_widgetindex widgetIndex);
static void WindowGuestMouseUp(rct_window* w, rct_widgetindex widgetIndex);
static void window_guest_stats_update(rct_window* w);
static void window_guest_stats_paint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowGuestStatsUpdate(rct_window* w);
static void WindowGuestStatsPaint(rct_window* w, rct_drawpixelinfo* dpi);
static void window_guest_rides_update(rct_window* w);
static void window_guest_rides_scroll_get_size(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height);
static void window_guest_rides_scroll_mouse_down(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void window_guest_rides_scroll_mouse_over(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void window_guest_rides_invalidate(rct_window* w);
static void window_guest_rides_paint(rct_window* w, rct_drawpixelinfo* dpi);
static void window_guest_rides_scroll_paint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex);
static void WindowGuestRidesUpdate(rct_window* w);
static void WindowGuestRidesScrollGetSize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height);
static void WindowGuestRidesScrollMouseDown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowGuestRidesScrollMouseOver(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowGuestRidesInvalidate(rct_window* w);
static void WindowGuestRidesPaint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowGuestRidesScrollPaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex);
static void window_guest_finance_update(rct_window* w);
static void window_guest_finance_paint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowGuestFinanceUpdate(rct_window* w);
static void WindowGuestFinancePaint(rct_window* w, rct_drawpixelinfo* dpi);
static void window_guest_thoughts_update(rct_window* w);
static void window_guest_thoughts_paint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowGuestThoughtsUpdate(rct_window* w);
static void WindowGuestThoughtsPaint(rct_window* w, rct_drawpixelinfo* dpi);
static void window_guest_inventory_update(rct_window* w);
static void window_guest_inventory_paint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowGuestInventoryUpdate(rct_window* w);
static void WindowGuestInventoryPaint(rct_window* w, rct_drawpixelinfo* dpi);
static void window_guest_debug_update(rct_window* w);
static void window_guest_debug_paint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowGuestDebugUpdate(rct_window* w);
static void WindowGuestDebugPaint(rct_window* w, rct_drawpixelinfo* dpi);
static rct_window_event_list window_guest_overview_events([](auto& events) {
events.close = &window_guest_overview_close;
events.mouse_up = &window_guest_overview_mouse_up;
events.mouse_down = &window_guest_overview_mouse_down;
events.dropdown = &window_guest_overview_dropdown;
events.resize = &window_guest_overview_resize;
events.update = &window_guest_overview_update;
events.tool_update = &window_guest_overview_tool_update;
events.tool_down = &window_guest_overview_tool_down;
events.tool_abort = &window_guest_overview_tool_abort;
events.text_input = &window_guest_overview_text_input;
events.viewport_rotate = &window_guest_overview_viewport_rotate;
events.invalidate = &window_guest_overview_invalidate;
events.paint = &window_guest_overview_paint;
events.close = &WindowGuestOverviewClose;
events.mouse_up = &WindowGuestOverviewMouseUp;
events.mouse_down = &WindowGuestOverviewMouseDown;
events.dropdown = &WindowGuestOverviewDropdown;
events.resize = &WindowGuestOverviewResize;
events.update = &WindowGuestOverviewUpdate;
events.tool_update = &WindowGuestOverviewToolUpdate;
events.tool_down = &WindowGuestOverviewToolDown;
events.tool_abort = &WindowGuestOverviewToolAbort;
events.text_input = &WindowGuestOverviewTextInput;
events.viewport_rotate = &WindowGuestOverviewViewportRotate;
events.invalidate = &WindowGuestOverviewInvalidate;
events.paint = &WindowGuestOverviewPaint;
});
static rct_window_event_list window_guest_stats_events([](auto& events) {
events.mouse_up = &window_guest_mouse_up;
events.resize = &window_guest_common_resize;
events.update = &window_guest_stats_update;
events.invalidate = &window_guest_common_invalidate;
events.paint = &window_guest_stats_paint;
events.mouse_up = &WindowGuestMouseUp;
events.resize = &WindowGuestCommonResize;
events.update = &WindowGuestStatsUpdate;
events.invalidate = &WindowGuestCommonInvalidate;
events.paint = &WindowGuestStatsPaint;
});
static rct_window_event_list window_guest_rides_events([](auto& events) {
events.mouse_up = &window_guest_mouse_up;
events.resize = &window_guest_common_resize;
events.update = &window_guest_rides_update;
events.get_scroll_size = &window_guest_rides_scroll_get_size;
events.scroll_mousedown = &window_guest_rides_scroll_mouse_down;
events.scroll_mouseover = &window_guest_rides_scroll_mouse_over;
events.invalidate = &window_guest_rides_invalidate;
events.paint = &window_guest_rides_paint;
events.scroll_paint = &window_guest_rides_scroll_paint;
events.mouse_up = &WindowGuestMouseUp;
events.resize = &WindowGuestCommonResize;
events.update = &WindowGuestRidesUpdate;
events.get_scroll_size = &WindowGuestRidesScrollGetSize;
events.scroll_mousedown = &WindowGuestRidesScrollMouseDown;
events.scroll_mouseover = &WindowGuestRidesScrollMouseOver;
events.invalidate = &WindowGuestRidesInvalidate;
events.paint = &WindowGuestRidesPaint;
events.scroll_paint = &WindowGuestRidesScrollPaint;
});
static rct_window_event_list window_guest_finance_events([](auto& events) {
events.mouse_up = &window_guest_mouse_up;
events.resize = &window_guest_common_resize;
events.update = &window_guest_finance_update;
events.invalidate = &window_guest_common_invalidate;
events.paint = &window_guest_finance_paint;
events.mouse_up = &WindowGuestMouseUp;
events.resize = &WindowGuestCommonResize;
events.update = &WindowGuestFinanceUpdate;
events.invalidate = &WindowGuestCommonInvalidate;
events.paint = &WindowGuestFinancePaint;
});
static rct_window_event_list window_guest_thoughts_events([](auto& events) {
events.mouse_up = &window_guest_mouse_up;
events.resize = &window_guest_common_resize;
events.update = &window_guest_thoughts_update;
events.invalidate = &window_guest_common_invalidate;
events.paint = &window_guest_thoughts_paint;
events.mouse_up = &WindowGuestMouseUp;
events.resize = &WindowGuestCommonResize;
events.update = &WindowGuestThoughtsUpdate;
events.invalidate = &WindowGuestCommonInvalidate;
events.paint = &WindowGuestThoughtsPaint;
});
static rct_window_event_list window_guest_inventory_events([](auto& events) {
events.mouse_up = &window_guest_mouse_up;
events.resize = &window_guest_common_resize;
events.update = &window_guest_inventory_update;
events.invalidate = &window_guest_common_invalidate;
events.paint = &window_guest_inventory_paint;
events.mouse_up = &WindowGuestMouseUp;
events.resize = &WindowGuestCommonResize;
events.update = &WindowGuestInventoryUpdate;
events.invalidate = &WindowGuestCommonInvalidate;
events.paint = &WindowGuestInventoryPaint;
});
static rct_window_event_list window_guest_debug_events([](auto& events) {
events.mouse_up = &window_guest_mouse_up;
events.resize = &window_guest_common_resize;
events.update = &window_guest_debug_update;
events.invalidate = &window_guest_common_invalidate;
events.paint = &window_guest_debug_paint;
events.mouse_up = &WindowGuestMouseUp;
events.resize = &WindowGuestCommonResize;
events.update = &WindowGuestDebugUpdate;
events.invalidate = &WindowGuestCommonInvalidate;
events.paint = &WindowGuestDebugPaint;
});
// 0x981D24
@ -272,7 +272,7 @@ static rct_window_event_list* window_guest_page_events[] = {
&window_guest_debug_events,
};
void window_guest_set_colours();
void WindowGuestSetColours();
// 0x981D3C
static constexpr const uint32_t window_guest_page_enabled_widgets[] = {
@ -372,7 +372,7 @@ static Guest* GetGuest(rct_window* w)
* rct2: 0x006989E9
*
*/
rct_window* window_guest_open(Peep* peep)
rct_window* WindowGuestOpen(Peep* peep)
{
if (peep == nullptr)
{
@ -380,7 +380,7 @@ rct_window* window_guest_open(Peep* peep)
}
if (peep->Is<Staff>())
{
return window_staff_open(peep);
return WindowStaffOpen(peep);
}
rct_window* window;
@ -401,7 +401,7 @@ rct_window* window_guest_open(Peep* peep)
window->list_information_type = 0;
window->picked_peep_frame = 0;
window->highlighted_item = 0;
window_guest_disable_widgets(window);
WindowGuestDisableWidgets(window);
window->min_width = windowWidth;
window->min_height = 157;
window->max_width = 500;
@ -419,14 +419,14 @@ rct_window* window_guest_open(Peep* peep)
window->event_handlers = window_guest_page_events[WINDOW_GUEST_OVERVIEW];
window->pressed_widgets = 0;
window_guest_disable_widgets(window);
WindowGuestDisableWidgets(window);
WindowInitScrollWidgets(window);
window_guest_viewport_init(window);
WindowGuestViewportInit(window);
return window;
}
static void window_guest_common_resize(rct_window* w)
static void WindowGuestCommonResize(rct_window* w)
{
// Get page specific min and max size
int32_t minWidth = window_guest_page_sizes[w->page][0].width;
@ -447,7 +447,7 @@ static void window_guest_common_resize(rct_window* w)
window_set_resize(w, minWidth, minHeight, maxWidth, maxHeight);
}
static void window_guest_common_invalidate(rct_window* w)
static void WindowGuestCommonInvalidate(rct_window* w)
{
if (window_guest_page_widgets[w->page] != w->widgets)
{
@ -481,7 +481,7 @@ static void window_guest_common_invalidate(rct_window* w)
* Disables peep pickup when in certain no pickup states.
* rct2: 0x006987A6
*/
void window_guest_disable_widgets(rct_window* w)
void WindowGuestDisableWidgets(rct_window* w)
{
const auto peep = GetGuest(w);
if (peep == nullptr)
@ -516,7 +516,7 @@ void window_guest_disable_widgets(rct_window* w)
*
* rct2: 0x00696A75
*/
void window_guest_overview_close(rct_window* w)
void WindowGuestOverviewClose(rct_window* w)
{
if (input_test_flag(INPUT_FLAG_TOOL_ACTIVE))
{
@ -529,14 +529,14 @@ void window_guest_overview_close(rct_window* w)
*
* rct2: 0x00696FBE
*/
void window_guest_overview_resize(rct_window* w)
void WindowGuestOverviewResize(rct_window* w)
{
window_guest_disable_widgets(w);
WindowGuestDisableWidgets(w);
window_event_invalidate_call(w);
widget_invalidate(w, WIDX_MARQUEE);
window_guest_common_resize(w);
WindowGuestCommonResize(w);
auto viewport = w->viewport;
if (viewport != nullptr)
@ -551,14 +551,14 @@ void window_guest_overview_resize(rct_window* w)
viewport->view_height = viewport->height / viewport->zoom;
}
}
window_guest_viewport_init(w);
WindowGuestViewportInit(w);
}
/**
*
* rct2: 0x00696A06
*/
void window_guest_overview_mouse_up(rct_window* w, rct_widgetindex widgetIndex)
void WindowGuestOverviewMouseUp(rct_window* w, rct_widgetindex widgetIndex)
{
const auto peep = GetGuest(w);
if (peep == nullptr)
@ -578,7 +578,7 @@ void window_guest_overview_mouse_up(rct_window* w, rct_widgetindex widgetIndex)
case WIDX_TAB_5:
case WIDX_TAB_6:
case WIDX_TAB_7:
window_guest_set_page(w, widgetIndex - WIDX_TAB_1);
WindowGuestSetPage(w, widgetIndex - WIDX_TAB_1);
break;
case WIDX_PICKUP:
{
@ -605,8 +605,7 @@ void window_guest_overview_mouse_up(rct_window* w, rct_widgetindex widgetIndex)
case WIDX_RENAME:
{
auto peepName = peep->GetName();
window_text_input_raw_open(
w, widgetIndex, STR_GUEST_RENAME_TITLE, STR_GUEST_RENAME_PROMPT, {}, peepName.c_str(), 32);
WindowTextInputRawOpen(w, widgetIndex, STR_GUEST_RENAME_TITLE, STR_GUEST_RENAME_PROMPT, {}, peepName.c_str(), 32);
break;
}
case WIDX_TRACK:
@ -620,17 +619,17 @@ void window_guest_overview_mouse_up(rct_window* w, rct_widgetindex widgetIndex)
}
}
static void window_guest_overview_mouse_down(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowGuestOverviewMouseDown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
switch (widgetIndex)
{
case WIDX_LOCATE:
window_guest_show_locate_dropdown(w, widget);
WindowGuestShowLocateDropdown(w, widget);
break;
}
}
static void window_guest_overview_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowGuestOverviewDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
{
switch (widgetIndex)
{
@ -642,14 +641,14 @@ static void window_guest_overview_dropdown(rct_window* w, rct_widgetindex widget
}
else if (dropdownIndex == 1)
{
window_guest_follow(w);
WindowGuestFollow(w);
}
break;
}
}
}
static void window_guest_show_locate_dropdown(rct_window* w, rct_widget* widget)
static void WindowGuestShowLocateDropdown(rct_window* w, rct_widget* widget)
{
gDropdownItemsFormat[0] = STR_LOCATE_SUBJECT_TIP;
gDropdownItemsFormat[1] = STR_FOLLOW_SUBJECT_TIP;
@ -659,7 +658,7 @@ static void window_guest_show_locate_dropdown(rct_window* w, rct_widget* widget)
gDropdownDefaultIndex = 0;
}
static void window_guest_follow(rct_window* w)
static void WindowGuestFollow(rct_window* w)
{
rct_window* w_main = window_get_main();
window_follow_sprite(w_main, w->number);
@ -669,7 +668,7 @@ static void window_guest_follow(rct_window* w)
*
* rct2: 0x696AA0
*/
void window_guest_set_page(rct_window* w, int32_t page)
void WindowGuestSetPage(rct_window* w, int32_t page)
{
if (input_test_flag(INPUT_FLAG_TOOL_ACTIVE))
{
@ -695,7 +694,7 @@ void window_guest_set_page(rct_window* w, int32_t page)
w->event_handlers = window_guest_page_events[page];
w->pressed_widgets = 0;
w->widgets = window_guest_page_widgets[page];
window_guest_disable_widgets(w);
WindowGuestDisableWidgets(w);
w->Invalidate();
window_event_resize_call(w);
window_event_invalidate_call(w);
@ -706,16 +705,16 @@ void window_guest_set_page(rct_window* w, int32_t page)
w->viewport->flags |= VIEWPORT_FLAG_SOUND_ON;
}
void window_guest_overview_viewport_rotate(rct_window* w)
void WindowGuestOverviewViewportRotate(rct_window* w)
{
window_guest_viewport_init(w);
WindowGuestViewportInit(w);
}
/**
*
* rct2: 0x0069883C
*/
void window_guest_viewport_init(rct_window* w)
void WindowGuestViewportInit(rct_window* w)
{
if (w->page != WINDOW_GUEST_OVERVIEW)
return;
@ -765,7 +764,7 @@ void window_guest_viewport_init(rct_window* w)
* rct2: 0x6983dd
* used by window_staff as well
*/
static void window_guest_overview_tab_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowGuestOverviewTabPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
if (w->disabled_widgets & (1ULL << WIDX_TAB_1))
return;
@ -837,7 +836,7 @@ static void window_guest_overview_tab_paint(rct_window* w, rct_drawpixelinfo* dp
*
* rct2: 0x69869b
*/
static void window_guest_stats_tab_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowGuestStatsTabPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
if (w->disabled_widgets & (1ULL << WIDX_TAB_2))
return;
@ -875,7 +874,7 @@ static void window_guest_stats_tab_paint(rct_window* w, rct_drawpixelinfo* dpi)
*
* rct2: 0x69861F
*/
static void window_guest_rides_tab_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowGuestRidesTabPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
if (w->disabled_widgets & (1ULL << WIDX_TAB_3))
return;
@ -897,7 +896,7 @@ static void window_guest_rides_tab_paint(rct_window* w, rct_drawpixelinfo* dpi)
*
* rct2: 0x698597
*/
static void window_guest_finance_tab_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowGuestFinanceTabPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
if (w->disabled_widgets & (1ULL << WIDX_TAB_4))
return;
@ -919,7 +918,7 @@ static void window_guest_finance_tab_paint(rct_window* w, rct_drawpixelinfo* dpi
*
* rct2: 0x6985D8
*/
static void window_guest_thoughts_tab_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowGuestThoughtsTabPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
if (w->disabled_widgets & (1ULL << WIDX_TAB_5))
return;
@ -941,7 +940,7 @@ static void window_guest_thoughts_tab_paint(rct_window* w, rct_drawpixelinfo* dp
*
* rct2: 0x698661
*/
static void window_guest_inventory_tab_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowGuestInventoryTabPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
if (w->disabled_widgets & (1ULL << WIDX_TAB_6))
return;
@ -952,7 +951,7 @@ static void window_guest_inventory_tab_paint(rct_window* w, rct_drawpixelinfo* d
gfx_draw_sprite(dpi, ImageId(SPR_TAB_GUEST_INVENTORY), screenCoords);
}
static void window_guest_debug_tab_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowGuestDebugTabPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
if (w->disabled_widgets & (1ULL << WIDX_TAB_7))
return;
@ -973,16 +972,16 @@ static void window_guest_debug_tab_paint(rct_window* w, rct_drawpixelinfo* dpi)
*
* rct2: 0x696887
*/
void window_guest_overview_paint(rct_window* w, rct_drawpixelinfo* dpi)
void WindowGuestOverviewPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_guest_overview_tab_paint(w, dpi);
window_guest_stats_tab_paint(w, dpi);
window_guest_rides_tab_paint(w, dpi);
window_guest_finance_tab_paint(w, dpi);
window_guest_thoughts_tab_paint(w, dpi);
window_guest_inventory_tab_paint(w, dpi);
window_guest_debug_tab_paint(w, dpi);
WindowGuestOverviewTabPaint(w, dpi);
WindowGuestStatsTabPaint(w, dpi);
WindowGuestRidesTabPaint(w, dpi);
WindowGuestFinanceTabPaint(w, dpi);
WindowGuestThoughtsTabPaint(w, dpi);
WindowGuestInventoryTabPaint(w, dpi);
WindowGuestDebugTabPaint(w, dpi);
// Draw the viewport no sound sprite
if (w->viewport != nullptr)
@ -1055,9 +1054,9 @@ void window_guest_overview_paint(rct_window* w, rct_drawpixelinfo* dpi)
*
* rct2: 0x696749
*/
void window_guest_overview_invalidate(rct_window* w)
void WindowGuestOverviewInvalidate(rct_window* w)
{
window_guest_common_invalidate(w);
WindowGuestCommonInvalidate(w);
const auto peep = GetGuest(w);
if (peep == nullptr)
@ -1094,7 +1093,7 @@ void window_guest_overview_invalidate(rct_window* w)
*
* rct2: 0x696F45
*/
void window_guest_overview_update(rct_window* w)
void WindowGuestOverviewUpdate(rct_window* w)
{
int32_t newAnimationFrame = w->var_496;
newAnimationFrame++;
@ -1141,7 +1140,7 @@ void window_guest_overview_update(rct_window* w)
}
/* rct2: 0x696A6A */
void window_guest_overview_text_input(rct_window* w, rct_widgetindex widgetIndex, char* text)
void WindowGuestOverviewTextInput(rct_window* w, rct_widgetindex widgetIndex, char* text)
{
if (widgetIndex != WIDX_RENAME)
return;
@ -1155,7 +1154,7 @@ void window_guest_overview_text_input(rct_window* w, rct_widgetindex widgetIndex
*
* rct2: 0x696A5F
*/
void window_guest_overview_tool_update(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
void WindowGuestOverviewToolUpdate(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
{
if (widgetIndex != WIDX_PICKUP)
return;
@ -1205,7 +1204,7 @@ void window_guest_overview_tool_update(rct_window* w, rct_widgetindex widgetInde
*
* rct2: 0x696A54
*/
void window_guest_overview_tool_down(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
void WindowGuestOverviewToolDown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
{
if (widgetIndex != WIDX_PICKUP)
return;
@ -1232,7 +1231,7 @@ void window_guest_overview_tool_down(rct_window* w, rct_widgetindex widgetIndex,
*
* rct2: 0x696A49
*/
void window_guest_overview_tool_abort(rct_window* w, rct_widgetindex widgetIndex)
void WindowGuestOverviewToolAbort(rct_window* w, rct_widgetindex widgetIndex)
{
if (widgetIndex != WIDX_PICKUP)
return;
@ -1247,7 +1246,7 @@ void window_guest_overview_tool_abort(rct_window* w, rct_widgetindex widgetIndex
* This is a combination of 5 functions that were identical
* rct2: 0x69744F, 0x697795, 0x697BDD, 0x697E18, 0x698279
*/
void window_guest_mouse_up(rct_window* w, rct_widgetindex widgetIndex)
void WindowGuestMouseUp(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -1261,7 +1260,7 @@ void window_guest_mouse_up(rct_window* w, rct_widgetindex widgetIndex)
case WIDX_TAB_5:
case WIDX_TAB_6:
case WIDX_TAB_7:
window_guest_set_page(w, widgetIndex - WIDX_TAB_1);
WindowGuestSetPage(w, widgetIndex - WIDX_TAB_1);
break;
}
}
@ -1270,7 +1269,7 @@ void window_guest_mouse_up(rct_window* w, rct_widgetindex widgetIndex)
*
* rct2: 0x69746A
*/
void window_guest_stats_update(rct_window* w)
void WindowGuestStatsUpdate(rct_window* w)
{
w->frame_no++;
auto peep = GetGuest(w);
@ -1288,7 +1287,7 @@ void window_guest_stats_update(rct_window* w)
* rct2: 0x0066ECC1
*
*/
static void window_guest_stats_bars_paint(
static void WindowGuestStatsBarsPaint(
int32_t value, const ScreenCoordsXY& origCoords, rct_window* w, rct_drawpixelinfo* dpi, int32_t colour, bool blinkFlag)
{
auto coords = origCoords;
@ -1326,16 +1325,16 @@ static int32_t NormalizeGuestStatValue(int32_t value, int32_t currMax, int32_t n
*
* rct2: 0x0069711D
*/
void window_guest_stats_paint(rct_window* w, rct_drawpixelinfo* dpi)
void WindowGuestStatsPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_guest_overview_tab_paint(w, dpi);
window_guest_stats_tab_paint(w, dpi);
window_guest_rides_tab_paint(w, dpi);
window_guest_finance_tab_paint(w, dpi);
window_guest_thoughts_tab_paint(w, dpi);
window_guest_inventory_tab_paint(w, dpi);
window_guest_debug_tab_paint(w, dpi);
WindowGuestOverviewTabPaint(w, dpi);
WindowGuestStatsTabPaint(w, dpi);
WindowGuestRidesTabPaint(w, dpi);
WindowGuestFinanceTabPaint(w, dpi);
WindowGuestThoughtsTabPaint(w, dpi);
WindowGuestInventoryTabPaint(w, dpi);
WindowGuestDebugTabPaint(w, dpi);
// ebx
const auto peep = GetGuest(w);
@ -1356,7 +1355,7 @@ void window_guest_stats_paint(rct_window* w, rct_drawpixelinfo* dpi)
int32_t happiness = NormalizeGuestStatValue(peep->Happiness, PEEP_MAX_HAPPINESS, 10);
int32_t barColour = COLOUR_BRIGHT_GREEN;
bool barBlink = happiness < 50;
window_guest_stats_bars_paint(happiness, screenCoords, w, dpi, barColour, barBlink);
WindowGuestStatsBarsPaint(happiness, screenCoords, w, dpi, barColour, barBlink);
// Energy
screenCoords.y += LIST_ROW_HEIGHT;
@ -1365,7 +1364,7 @@ void window_guest_stats_paint(rct_window* w, rct_drawpixelinfo* dpi)
int32_t energy = NormalizeGuestStatValue(peep->Energy - PEEP_MIN_ENERGY, PEEP_MAX_ENERGY - PEEP_MIN_ENERGY, 10);
barColour = COLOUR_BRIGHT_GREEN;
barBlink = energy < 50;
window_guest_stats_bars_paint(energy, screenCoords, w, dpi, barColour, barBlink);
WindowGuestStatsBarsPaint(energy, screenCoords, w, dpi, barColour, barBlink);
// Hunger
screenCoords.y += LIST_ROW_HEIGHT;
@ -1375,7 +1374,7 @@ void window_guest_stats_paint(rct_window* w, rct_drawpixelinfo* dpi)
hunger = 255 - hunger; // the bar should be longer when peep->Hunger is low
barColour = COLOUR_BRIGHT_RED;
barBlink = hunger > 170;
window_guest_stats_bars_paint(hunger, screenCoords, w, dpi, barColour, barBlink);
WindowGuestStatsBarsPaint(hunger, screenCoords, w, dpi, barColour, barBlink);
// Thirst
screenCoords.y += LIST_ROW_HEIGHT;
@ -1385,7 +1384,7 @@ void window_guest_stats_paint(rct_window* w, rct_drawpixelinfo* dpi)
thirst = 255 - thirst; // the bar should be longer when peep->Thirst is low
barColour = COLOUR_BRIGHT_RED;
barBlink = thirst > 170;
window_guest_stats_bars_paint(thirst, screenCoords, w, dpi, barColour, barBlink);
WindowGuestStatsBarsPaint(thirst, screenCoords, w, dpi, barColour, barBlink);
// Nausea
screenCoords.y += LIST_ROW_HEIGHT;
@ -1394,7 +1393,7 @@ void window_guest_stats_paint(rct_window* w, rct_drawpixelinfo* dpi)
int32_t nausea = NormalizeGuestStatValue(peep->Nausea - 32, 223, 0);
barColour = COLOUR_BRIGHT_RED;
barBlink = nausea > 120;
window_guest_stats_bars_paint(nausea, screenCoords, w, dpi, barColour, barBlink);
WindowGuestStatsBarsPaint(nausea, screenCoords, w, dpi, barColour, barBlink);
// Toilet
screenCoords.y += LIST_ROW_HEIGHT;
@ -1403,7 +1402,7 @@ void window_guest_stats_paint(rct_window* w, rct_drawpixelinfo* dpi)
int32_t toilet = NormalizeGuestStatValue(peep->Toilet - 64, 178, 0);
barColour = COLOUR_BRIGHT_RED;
barBlink = toilet > 160;
window_guest_stats_bars_paint(toilet, screenCoords, w, dpi, barColour, barBlink);
WindowGuestStatsBarsPaint(toilet, screenCoords, w, dpi, barColour, barBlink);
// Time in park
screenCoords.y += LIST_ROW_HEIGHT + 1;
@ -1466,7 +1465,7 @@ void window_guest_stats_paint(rct_window* w, rct_drawpixelinfo* dpi)
*
* rct2: 0x6977B0
*/
void window_guest_rides_update(rct_window* w)
void WindowGuestRidesUpdate(rct_window* w)
{
w->frame_no++;
@ -1506,7 +1505,7 @@ void window_guest_rides_update(rct_window* w)
*
* rct2: 0x69784E
*/
void window_guest_rides_scroll_get_size(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
void WindowGuestRidesScrollGetSize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
{
*height = w->no_list_items * 10;
@ -1533,7 +1532,7 @@ void window_guest_rides_scroll_get_size(rct_window* w, int32_t scrollIndex, int3
*
* rct2: 0x006978CC
*/
void window_guest_rides_scroll_mouse_down(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
void WindowGuestRidesScrollMouseDown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
{
int32_t index;
@ -1550,7 +1549,7 @@ void window_guest_rides_scroll_mouse_down(rct_window* w, int32_t scrollIndex, co
*
* rct2: 0x0069789C
*/
void window_guest_rides_scroll_mouse_over(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
void WindowGuestRidesScrollMouseOver(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
{
int32_t index;
@ -1569,9 +1568,9 @@ void window_guest_rides_scroll_mouse_over(rct_window* w, int32_t scrollIndex, co
*
* rct2: 0x0069757A
*/
void window_guest_rides_invalidate(rct_window* w)
void WindowGuestRidesInvalidate(rct_window* w)
{
window_guest_common_invalidate(w);
WindowGuestCommonInvalidate(w);
window_guest_rides_widgets[WIDX_RIDE_SCROLL].right = w->width - 4;
window_guest_rides_widgets[WIDX_RIDE_SCROLL].bottom = w->height - 15;
@ -1581,16 +1580,16 @@ void window_guest_rides_invalidate(rct_window* w)
*
* rct2: 0x00697637
*/
void window_guest_rides_paint(rct_window* w, rct_drawpixelinfo* dpi)
void WindowGuestRidesPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_guest_overview_tab_paint(w, dpi);
window_guest_stats_tab_paint(w, dpi);
window_guest_rides_tab_paint(w, dpi);
window_guest_finance_tab_paint(w, dpi);
window_guest_thoughts_tab_paint(w, dpi);
window_guest_inventory_tab_paint(w, dpi);
window_guest_debug_tab_paint(w, dpi);
WindowGuestOverviewTabPaint(w, dpi);
WindowGuestStatsTabPaint(w, dpi);
WindowGuestRidesTabPaint(w, dpi);
WindowGuestFinanceTabPaint(w, dpi);
WindowGuestThoughtsTabPaint(w, dpi);
WindowGuestInventoryTabPaint(w, dpi);
WindowGuestDebugTabPaint(w, dpi);
const auto peep = GetGuest(w);
if (peep == nullptr)
@ -1625,7 +1624,7 @@ void window_guest_rides_paint(rct_window* w, rct_drawpixelinfo* dpi)
*
* rct2: 0x006976FC
*/
void window_guest_rides_scroll_paint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
void WindowGuestRidesScrollPaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
{
auto colour = ColourMapA[w->colours[1]].mid_light;
gfx_fill_rect(dpi, { { dpi->x, dpi->y }, { dpi->x + dpi->width - 1, dpi->y + dpi->height - 1 } }, colour);
@ -1655,7 +1654,7 @@ void window_guest_rides_scroll_paint(rct_window* w, rct_drawpixelinfo* dpi, int3
*
* rct2: 0x00697BF8
*/
void window_guest_finance_update(rct_window* w)
void WindowGuestFinanceUpdate(rct_window* w)
{
w->frame_no++;
@ -1667,16 +1666,16 @@ void window_guest_finance_update(rct_window* w)
*
* rct2: 0x00697A08
*/
void window_guest_finance_paint(rct_window* w, rct_drawpixelinfo* dpi)
void WindowGuestFinancePaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_guest_overview_tab_paint(w, dpi);
window_guest_stats_tab_paint(w, dpi);
window_guest_rides_tab_paint(w, dpi);
window_guest_finance_tab_paint(w, dpi);
window_guest_thoughts_tab_paint(w, dpi);
window_guest_inventory_tab_paint(w, dpi);
window_guest_debug_tab_paint(w, dpi);
WindowGuestOverviewTabPaint(w, dpi);
WindowGuestStatsTabPaint(w, dpi);
WindowGuestRidesTabPaint(w, dpi);
WindowGuestFinanceTabPaint(w, dpi);
WindowGuestThoughtsTabPaint(w, dpi);
WindowGuestInventoryTabPaint(w, dpi);
WindowGuestDebugTabPaint(w, dpi);
const auto peep = GetGuest(w);
if (peep == nullptr)
@ -1782,7 +1781,7 @@ void window_guest_finance_paint(rct_window* w, rct_drawpixelinfo* dpi)
*
* rct2: 0x00697EB4
*/
void window_guest_thoughts_update(rct_window* w)
void WindowGuestThoughtsUpdate(rct_window* w)
{
w->frame_no++;
@ -1805,16 +1804,16 @@ void window_guest_thoughts_update(rct_window* w)
*
* rct2: 0x00697D2A
*/
void window_guest_thoughts_paint(rct_window* w, rct_drawpixelinfo* dpi)
void WindowGuestThoughtsPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_guest_overview_tab_paint(w, dpi);
window_guest_stats_tab_paint(w, dpi);
window_guest_rides_tab_paint(w, dpi);
window_guest_finance_tab_paint(w, dpi);
window_guest_thoughts_tab_paint(w, dpi);
window_guest_inventory_tab_paint(w, dpi);
window_guest_debug_tab_paint(w, dpi);
WindowGuestOverviewTabPaint(w, dpi);
WindowGuestStatsTabPaint(w, dpi);
WindowGuestRidesTabPaint(w, dpi);
WindowGuestFinanceTabPaint(w, dpi);
WindowGuestThoughtsTabPaint(w, dpi);
WindowGuestInventoryTabPaint(w, dpi);
WindowGuestDebugTabPaint(w, dpi);
const auto peep = GetGuest(w);
if (peep == nullptr)
@ -1854,7 +1853,7 @@ void window_guest_thoughts_paint(rct_window* w, rct_drawpixelinfo* dpi)
*
* rct2: 0x00698315
*/
void window_guest_inventory_update(rct_window* w)
void WindowGuestInventoryUpdate(rct_window* w)
{
w->frame_no++;
@ -1873,7 +1872,7 @@ void window_guest_inventory_update(rct_window* w)
}
}
static std::pair<rct_string_id, Formatter> window_guest_inventory_format_item(Guest* guest, ShopItem item)
static std::pair<rct_string_id, Formatter> WindowGuestInventoryFormatItem(Guest* guest, ShopItem item)
{
auto& park = OpenRCT2::GetContext()->GetGameState()->GetPark();
auto parkName = park.Name.c_str();
@ -1989,16 +1988,16 @@ static std::pair<rct_string_id, Formatter> window_guest_inventory_format_item(Gu
*
* rct2: 0x00697F81
*/
void window_guest_inventory_paint(rct_window* w, rct_drawpixelinfo* dpi)
void WindowGuestInventoryPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_guest_overview_tab_paint(w, dpi);
window_guest_stats_tab_paint(w, dpi);
window_guest_rides_tab_paint(w, dpi);
window_guest_finance_tab_paint(w, dpi);
window_guest_thoughts_tab_paint(w, dpi);
window_guest_inventory_tab_paint(w, dpi);
window_guest_debug_tab_paint(w, dpi);
WindowGuestOverviewTabPaint(w, dpi);
WindowGuestStatsTabPaint(w, dpi);
WindowGuestRidesTabPaint(w, dpi);
WindowGuestFinanceTabPaint(w, dpi);
WindowGuestThoughtsTabPaint(w, dpi);
WindowGuestInventoryTabPaint(w, dpi);
WindowGuestDebugTabPaint(w, dpi);
const auto guest = GetGuest(w);
if (guest == nullptr)
@ -2023,7 +2022,7 @@ void window_guest_inventory_paint(rct_window* w, rct_drawpixelinfo* dpi)
if (!guest->HasItem(item))
continue;
auto [stringId, ft] = window_guest_inventory_format_item(guest, item);
auto [stringId, ft] = WindowGuestInventoryFormatItem(guest, item);
screenCoords.y += DrawTextWrapped(dpi, screenCoords, itemNameWidth, stringId, ft);
numItems++;
}
@ -2038,25 +2037,25 @@ void window_guest_inventory_paint(rct_window* w, rct_drawpixelinfo* dpi)
*
* rct2: 0x00698315
*/
void window_guest_debug_update(rct_window* w)
void WindowGuestDebugUpdate(rct_window* w)
{
w->frame_no++;
w->Invalidate();
}
void window_guest_debug_paint(rct_window* w, rct_drawpixelinfo* dpi)
void WindowGuestDebugPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
char buffer[512]{};
char buffer2[512]{};
WindowDrawWidgets(w, dpi);
window_guest_overview_tab_paint(w, dpi);
window_guest_stats_tab_paint(w, dpi);
window_guest_rides_tab_paint(w, dpi);
window_guest_finance_tab_paint(w, dpi);
window_guest_thoughts_tab_paint(w, dpi);
window_guest_inventory_tab_paint(w, dpi);
window_guest_debug_tab_paint(w, dpi);
WindowGuestOverviewTabPaint(w, dpi);
WindowGuestStatsTabPaint(w, dpi);
WindowGuestRidesTabPaint(w, dpi);
WindowGuestFinanceTabPaint(w, dpi);
WindowGuestThoughtsTabPaint(w, dpi);
WindowGuestInventoryTabPaint(w, dpi);
WindowGuestDebugTabPaint(w, dpi);
const auto peep = GetGuest(w);
if (peep == nullptr)

12
src/openrct2-ui/windows/GuestList.cpp
View File

@ -302,7 +302,7 @@ public:
}
else
{
window_text_input_raw_open(
WindowTextInputRawOpen(
this, WIDX_FILTER_BY_NAME, STR_GUESTS_FILTER_BY_NAME, STR_GUESTS_ENTER_NAME_TO_SEARCH, {},
_filterName.c_str(), 32);
}
@ -564,7 +564,7 @@ public:
auto guest = GetEntity<Guest>(guestItem.Id);
if (guest != nullptr)
{
window_guest_open(guest);
WindowGuestOpen(guest);
}
break;
}
@ -962,7 +962,7 @@ private:
}
};
rct_window* window_guest_list_open()
rct_window* WindowGuestListOpen()
{
auto* window = window_bring_to_front_by_class(WC_GUEST_LIST);
if (window == nullptr)
@ -975,9 +975,9 @@ rct_window* window_guest_list_open()
/**
* @param index The number of the ride or index of the thought
*/
rct_window* window_guest_list_open_with_filter(GuestListFilterType type, int32_t index)
rct_window* WindowGuestListOpenWithFilter(GuestListFilterType type, int32_t index)
{
auto* w = static_cast<GuestListWindow*>(window_guest_list_open());
auto* w = static_cast<GuestListWindow*>(WindowGuestListOpen());
if (w != nullptr)
{
w->SetFilter(type, index);
@ -985,7 +985,7 @@ rct_window* window_guest_list_open_with_filter(GuestListFilterType type, int32_t
return w;
}
void window_guest_list_refresh_list()
void WindowGuestListRefreshList()
{
auto* w = window_find_by_class(WC_GUEST_LIST);
if (w != nullptr)

48
src/openrct2-ui/windows/InstallTrack.cpp
View File

@ -51,19 +51,19 @@ static rct_widget window_install_track_widgets[] = {
WIDGETS_END,
};
static void window_install_track_close(rct_window *w);
static void window_install_track_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_install_track_invalidate(rct_window *w);
static void window_install_track_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_install_track_text_input(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void WindowInstallTrackClose(rct_window *w);
static void WindowInstallTrackMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowInstallTrackInvalidate(rct_window *w);
static void WindowInstallTrackPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowInstallTrackTextInput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static rct_window_event_list window_install_track_events([](auto& events)
{
events.close = &window_install_track_close;
events.mouse_up = &window_install_track_mouseup;
events.text_input = &window_install_track_text_input;
events.invalidate = &window_install_track_invalidate;
events.paint = &window_install_track_paint;
events.close = &WindowInstallTrackClose;
events.mouse_up = &WindowInstallTrackMouseup;
events.text_input = &WindowInstallTrackTextInput;
events.invalidate = &WindowInstallTrackInvalidate;
events.paint = &WindowInstallTrackPaint;
});
// clang-format on
@ -72,14 +72,14 @@ static std::string _trackPath;
static std::string _trackName;
static std::vector<uint8_t> _trackDesignPreviewPixels;
static void window_install_track_update_preview();
static void window_install_track_design(rct_window* w);
static void WindowInstallTrackUpdatePreview();
static void WindowInstallTrackDesign(rct_window* w);
/**
*
* rct2: 0x006D386D
*/
rct_window* window_install_track_open(const utf8* path)
rct_window* WindowInstallTrackOpen(const utf8* path)
{
_trackDesign = TrackDesignImport(path);
if (_trackDesign == nullptr)
@ -123,7 +123,7 @@ rct_window* window_install_track_open(const utf8* path)
_trackName = GetNameFromTrackPath(path);
_trackDesignPreviewPixels.resize(4 * TRACK_PREVIEW_IMAGE_SIZE);
window_install_track_update_preview();
WindowInstallTrackUpdatePreview();
w->Invalidate();
return w;
@ -133,7 +133,7 @@ rct_window* window_install_track_open(const utf8* path)
*
* rct2: 0x006D41DC
*/
static void window_install_track_close(rct_window* w)
static void WindowInstallTrackClose(rct_window* w)
{
_trackPath.clear();
_trackName.clear();
@ -146,7 +146,7 @@ static void window_install_track_close(rct_window* w)
*
* rct2: 0x006D407A
*/
static void window_install_track_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowInstallTrackMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -161,11 +161,11 @@ static void window_install_track_mouseup(rct_window* w, rct_widgetindex widgetIn
break;
case WIDX_TOGGLE_SCENERY:
gTrackDesignSceneryToggle = !gTrackDesignSceneryToggle;
window_install_track_update_preview();
WindowInstallTrackUpdatePreview();
w->Invalidate();
break;
case WIDX_INSTALL:
window_install_track_design(w);
WindowInstallTrackDesign(w);
break;
}
}
@ -174,7 +174,7 @@ static void window_install_track_mouseup(rct_window* w, rct_widgetindex widgetIn
*
* rct2: 0x006D3B06
*/
static void window_install_track_invalidate(rct_window* w)
static void WindowInstallTrackInvalidate(rct_window* w)
{
w->pressed_widgets |= 1ULL << WIDX_TRACK_PREVIEW;
if (!gTrackDesignSceneryToggle)
@ -191,7 +191,7 @@ static void window_install_track_invalidate(rct_window* w)
*
* rct2: 0x006D3B1F
*/
static void window_install_track_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowInstallTrackPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
@ -408,7 +408,7 @@ static void window_install_track_paint(rct_window* w, rct_drawpixelinfo* dpi)
*
* rct2: 0x006D40A7
*/
static void window_install_track_text_input(rct_window* w, rct_widgetindex widgetIndex, char* text)
static void WindowInstallTrackTextInput(rct_window* w, rct_widgetindex widgetIndex, char* text)
{
if (widgetIndex != WIDX_INSTALL || str_is_null_or_empty(text))
{
@ -420,12 +420,12 @@ static void window_install_track_text_input(rct_window* w, rct_widgetindex widge
window_event_mouse_up_call(w, WIDX_INSTALL);
}
static void window_install_track_update_preview()
static void WindowInstallTrackUpdatePreview()
{
TrackDesignDrawPreview(_trackDesign.get(), _trackDesignPreviewPixels.data());
}
static void window_install_track_design(rct_window* w)
static void WindowInstallTrackDesign(rct_window* w)
{
utf8 destPath[MAX_PATH];
@ -444,7 +444,7 @@ static void window_install_track_design(rct_window* w)
{
log_info("%s already exists, prompting user for a different track design name", destPath);
context_show_error(STR_UNABLE_TO_INSTALL_THIS_TRACK_DESIGN, STR_NONE, {});
window_text_input_raw_open(
WindowTextInputRawOpen(
w, WIDX_INSTALL, STR_SELECT_NEW_NAME_FOR_TRACK_DESIGN, STR_AN_EXISTING_TRACK_DESIGN_ALREADY_HAS_THIS_NAME, {},
_trackName.c_str(), 255);
}

8
src/openrct2-ui/windows/Land.cpp
View File

@ -62,7 +62,7 @@ private:
Formatter ft;
ft.Add<int16_t>(MINIMUM_TOOL_SIZE);
ft.Add<int16_t>(MAXIMUM_TOOL_SIZE);
window_text_input_open(this, WIDX_PREVIEW, STR_SELECTION_SIZE, STR_ENTER_SELECTION_SIZE, ft, STR_NONE, STR_NONE, 3);
WindowTextInputOpen(this, WIDX_PREVIEW, STR_SELECTION_SIZE, STR_ENTER_SELECTION_SIZE, ft, STR_NONE, STR_NONE, 3);
}
public:
@ -89,7 +89,7 @@ public:
void OnClose() override
{
// If the tool wasn't changed, turn tool off
if (land_tool_is_active())
if (LandToolIsActive())
tool_cancel();
}
@ -209,7 +209,7 @@ public:
void OnUpdate() override
{
if (!land_tool_is_active())
if (!LandToolIsActive())
Close();
}
@ -328,7 +328,7 @@ public:
}
};
rct_window* window_land_open()
rct_window* WindowLandOpen()
{
return WindowFocusOrCreate<LandWindow>(WC_LAND, ScreenCoordsXY(context_get_width() - WW, 29), WW, WH, 0);
}

88
src/openrct2-ui/windows/LandRights.cpp
View File

@ -46,34 +46,34 @@ static rct_widget window_land_rights_widgets[] = {
WIDGETS_END,
};
static void window_land_rights_close(rct_window *w);
static void window_land_rights_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_land_rights_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget);
static void window_land_rights_update(rct_window *w);
static void window_land_rights_invalidate(rct_window *w);
static void window_land_rights_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_land_rights_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void window_land_rights_inputsize(rct_window *w);
static void window_land_rights_toolupdate(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void window_land_rights_tooldown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void window_land_rights_tooldrag(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void window_land_rights_toolabort(rct_window *w, rct_widgetindex widgetIndex);
static bool land_rights_tool_is_active();
static void WindowLandRightsClose(rct_window *w);
static void WindowLandRightsMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowLandRightsMousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget);
static void WindowLandRightsUpdate(rct_window *w);
static void WindowLandRightsInvalidate(rct_window *w);
static void WindowLandRightsPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowLandRightsTextinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void WindowLandRightsInputsize(rct_window *w);
static void WindowLandRightsToolupdate(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowLandRightsTooldown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowLandRightsTooldrag(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowLandRightsToolabort(rct_window *w, rct_widgetindex widgetIndex);
static bool LandRightsToolIsActive();
static rct_window_event_list window_land_rights_events([](auto& events)
{
events.close = &window_land_rights_close;
events.mouse_up = &window_land_rights_mouseup;
events.mouse_down = &window_land_rights_mousedown;
events.update = &window_land_rights_update;
events.tool_update = &window_land_rights_toolupdate;
events.tool_down = &window_land_rights_tooldown;
events.tool_drag = &window_land_rights_tooldrag;
events.tool_abort = &window_land_rights_toolabort;
events.text_input = &window_land_rights_textinput;
events.invalidate = &window_land_rights_invalidate;
events.paint = &window_land_rights_paint;
events.close = &WindowLandRightsClose;
events.mouse_up = &WindowLandRightsMouseup;
events.mouse_down = &WindowLandRightsMousedown;
events.update = &WindowLandRightsUpdate;
events.tool_update = &WindowLandRightsToolupdate;
events.tool_down = &WindowLandRightsTooldown;
events.tool_drag = &WindowLandRightsTooldrag;
events.tool_abort = &WindowLandRightsToolabort;
events.text_input = &WindowLandRightsTextinput;
events.invalidate = &WindowLandRightsInvalidate;
events.paint = &WindowLandRightsPaint;
});
// clang-format on
@ -83,7 +83,7 @@ constexpr uint8_t LAND_RIGHTS_MODE_BUY_LAND = 1;
static uint8_t _landRightsMode;
static money32 _landRightsCost;
rct_window* window_land_rights_open()
rct_window* WindowLandRightsOpen()
{
rct_window* window;
@ -119,7 +119,7 @@ rct_window* window_land_rights_open()
return window;
}
static void window_land_rights_close(rct_window* w)
static void WindowLandRightsClose(rct_window* w)
{
if (gLandRemainingConstructionSales == 0)
{
@ -127,11 +127,11 @@ static void window_land_rights_close(rct_window* w)
}
// If the tool wasn't changed, turn tool off
if (land_rights_tool_is_active())
if (LandRightsToolIsActive())
tool_cancel();
}
static void window_land_rights_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowLandRightsMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -139,7 +139,7 @@ static void window_land_rights_mouseup(rct_window* w, rct_widgetindex widgetInde
window_close(w);
break;
case WIDX_PREVIEW:
window_land_rights_inputsize(w);
WindowLandRightsInputsize(w);
break;
case WIDX_BUY_LAND_RIGHTS:
if (_landRightsMode != LAND_RIGHTS_MODE_BUY_LAND)
@ -162,7 +162,7 @@ static void window_land_rights_mouseup(rct_window* w, rct_widgetindex widgetInde
}
}
static void window_land_rights_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowLandRightsMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
switch (widgetIndex)
{
@ -183,7 +183,7 @@ static void window_land_rights_mousedown(rct_window* w, rct_widgetindex widgetIn
}
}
static void window_land_rights_textinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
static void WindowLandRightsTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
{
int32_t size;
char* end;
@ -201,23 +201,23 @@ static void window_land_rights_textinput(rct_window* w, rct_widgetindex widgetIn
}
}
static void window_land_rights_inputsize(rct_window* w)
static void WindowLandRightsInputsize(rct_window* w)
{
Formatter ft;
ft.Add<int16_t>(MINIMUM_TOOL_SIZE);
ft.Add<int16_t>(MAXIMUM_TOOL_SIZE);
window_text_input_open(w, WIDX_PREVIEW, STR_SELECTION_SIZE, STR_ENTER_SELECTION_SIZE, ft, STR_NONE, STR_NONE, 3);
WindowTextInputOpen(w, WIDX_PREVIEW, STR_SELECTION_SIZE, STR_ENTER_SELECTION_SIZE, ft, STR_NONE, STR_NONE, 3);
}
static void window_land_rights_update(rct_window* w)
static void WindowLandRightsUpdate(rct_window* w)
{
w->frame_no++;
// Close window if another tool is open
if (!land_rights_tool_is_active())
if (!LandRightsToolIsActive())
window_close(w);
}
static void window_land_rights_invalidate(rct_window* w)
static void WindowLandRightsInvalidate(rct_window* w)
{
// Set the preview image button to be pressed down
w->pressed_widgets |= (1ULL << WIDX_PREVIEW)
@ -254,7 +254,7 @@ static void window_land_rights_invalidate(rct_window* w)
}
}
static void window_land_rights_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowLandRightsPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
auto screenCoords = ScreenCoordsXY{ w->windowPos.x + window_land_rights_widgets[WIDX_PREVIEW].midX(),
w->windowPos.y + window_land_rights_widgets[WIDX_PREVIEW].midY() };
@ -279,7 +279,7 @@ static void window_land_rights_paint(rct_window* w, rct_drawpixelinfo* dpi)
}
}
static void window_land_rights_tool_update_land_rights(const ScreenCoordsXY& screenCoords)
static void WindowLandRightsToolUpdateLandRights(const ScreenCoordsXY& screenCoords)
{
map_invalidate_selection_rect();
gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE;
@ -365,7 +365,7 @@ static void window_land_rights_tool_update_land_rights(const ScreenCoordsXY& scr
*
* rct2: 0x0066822A
*/
static void window_land_rights_toolabort(rct_window* w, rct_widgetindex widgetIndex)
static void WindowLandRightsToolabort(rct_window* w, rct_widgetindex widgetIndex)
{
hide_gridlines();
if (_landRightsMode == LAND_RIGHTS_MODE_BUY_LAND)
@ -382,16 +382,16 @@ static void window_land_rights_toolabort(rct_window* w, rct_widgetindex widgetIn
*
* rct2: 0x006681D1
*/
static void window_land_rights_toolupdate(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowLandRightsToolupdate(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
{
window_land_rights_tool_update_land_rights(screenCoords);
WindowLandRightsToolUpdateLandRights(screenCoords);
}
/**
*
* rct2: 0x006681E6
*/
static void window_land_rights_tooldown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowLandRightsTooldown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
{
if (_landRightsMode == LAND_RIGHTS_MODE_BUY_LAND)
{
@ -419,7 +419,7 @@ static void window_land_rights_tooldown(rct_window* w, rct_widgetindex widgetInd
*
* rct2: 0x006681FB
*/
static void window_land_rights_tooldrag(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowLandRightsTooldrag(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
{
if (_landRightsMode == LAND_RIGHTS_MODE_BUY_LAND)
{
@ -443,7 +443,7 @@ static void window_land_rights_tooldrag(rct_window* w, rct_widgetindex widgetInd
}
}
static bool land_rights_tool_is_active()
static bool LandRightsToolIsActive()
{
if (!(input_test_flag(INPUT_FLAG_TOOL_ACTIVE)))
return false;

222
src/openrct2-ui/windows/LoadSave.cpp
View File

@ -80,30 +80,30 @@ static rct_widget window_loadsave_widgets[] =
#pragma region Events
static void window_loadsave_close(rct_window *w);
static void window_loadsave_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_loadsave_resize(rct_window *w);
static void window_loadsave_scrollgetsize(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void window_loadsave_scrollmousedown(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void window_loadsave_scrollmouseover(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void window_loadsave_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void window_loadsave_compute_max_date_width();
static void window_loadsave_invalidate(rct_window *w);
static void window_loadsave_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_loadsave_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
static void WindowLoadsaveClose(rct_window *w);
static void WindowLoadsaveMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowLoadsaveResize(rct_window *w);
static void WindowLoadsaveScrollgetsize(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void WindowLoadsaveScrollmousedown(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowLoadsaveScrollmouseover(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowLoadsaveTextinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void WindowLoadsaveComputeMaxDateWidth();
static void WindowLoadsaveInvalidate(rct_window *w);
static void WindowLoadsavePaint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowLoadsaveScrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
static rct_window_event_list window_loadsave_events([](auto& events)
{
events.close = &window_loadsave_close;
events.mouse_up = &window_loadsave_mouseup;
events.resize = &window_loadsave_resize;
events.get_scroll_size = &window_loadsave_scrollgetsize;
events.scroll_mousedown = &window_loadsave_scrollmousedown;
events.scroll_mouseover = &window_loadsave_scrollmouseover;
events.text_input = &window_loadsave_textinput;
events.invalidate = &window_loadsave_invalidate;
events.paint = &window_loadsave_paint;
events.scroll_paint = &window_loadsave_scrollpaint;
events.close = &WindowLoadsaveClose;
events.mouse_up = &WindowLoadsaveMouseup;
events.resize = &WindowLoadsaveResize;
events.get_scroll_size = &WindowLoadsaveScrollgetsize;
events.scroll_mousedown = &WindowLoadsaveScrollmousedown;
events.scroll_mouseover = &WindowLoadsaveScrollmouseover;
events.text_input = &WindowLoadsaveTextinput;
events.invalidate = &WindowLoadsaveInvalidate;
events.paint = &WindowLoadsavePaint;
events.scroll_paint = &WindowLoadsaveScrollpaint;
});
// clang-format on
@ -140,13 +140,13 @@ static int32_t _type;
static int32_t maxDateWidth = 0;
static int32_t maxTimeWidth = 0;
static void window_loadsave_populate_list(rct_window* w, int32_t includeNewItem, const char* directory, const char* extension);
static void window_loadsave_select(rct_window* w, const char* path);
static void window_loadsave_sort_list();
static void WindowLoadsavePopulateList(rct_window* w, int32_t includeNewItem, const char* directory, const char* extension);
static void WindowLoadsaveSelect(rct_window* w, const char* path);
static void WindowLoadsaveSortList();
static rct_window* window_overwrite_prompt_open(const char* name, const char* path);
static rct_window* WindowOverwritePromptOpen(const char* name, const char* path);
static utf8* getLastDirectoryByType(int32_t type)
static utf8* GetLastDirectoryByType(int32_t type)
{
switch (type & 0x0E)
{
@ -167,7 +167,7 @@ static utf8* getLastDirectoryByType(int32_t type)
}
}
static void getInitialDirectoryByType(const int32_t type, char* path, size_t pathSize)
static void GetInitialDirectoryByType(const int32_t type, char* path, size_t pathSize)
{
const char* subdir = nullptr;
switch (type & 0x0E)
@ -196,7 +196,7 @@ static void getInitialDirectoryByType(const int32_t type, char* path, size_t pat
platform_get_user_directory(path, subdir, pathSize);
}
static const char* getFilterPatternByType(const int32_t type, const bool isSave)
static const char* GetFilterPatternByType(const int32_t type, const bool isSave)
{
switch (type & 0x0E)
{
@ -222,19 +222,19 @@ static const char* getFilterPatternByType(const int32_t type, const bool isSave)
return "";
}
static int32_t window_loadsave_get_dir(const int32_t type, char* path, size_t pathSize)
static int32_t WindowLoadsaveGetDir(const int32_t type, char* path, size_t pathSize)
{
const char* last_save = getLastDirectoryByType(type);
const char* last_save = GetLastDirectoryByType(type);
if (last_save != nullptr && platform_directory_exists(last_save))
safe_strcpy(path, last_save, pathSize);
else
getInitialDirectoryByType(type, path, pathSize);
GetInitialDirectoryByType(type, path, pathSize);
return 1;
}
static bool browse(bool isSave, char* path, size_t pathSize);
static bool Browse(bool isSave, char* path, size_t pathSize);
rct_window* window_loadsave_open(
rct_window* WindowLoadsaveOpen(
int32_t type, std::string_view defaultPath, std::function<void(int32_t result, std::string_view)> callback,
TrackDesign* trackDesign)
{
@ -245,7 +245,7 @@ rct_window* window_loadsave_open(
bool isSave = (type & 0x01) == LOADSAVETYPE_SAVE;
char path[MAX_PATH];
bool success = window_loadsave_get_dir(type, path, sizeof(path));
bool success = WindowLoadsaveGetDir(type, path, sizeof(path));
if (!success)
return nullptr;
@ -253,9 +253,9 @@ rct_window* window_loadsave_open(
auto hasFilePicker = OpenRCT2::GetContext()->GetUiContext()->HasFilePicker();
if (gConfigGeneral.use_native_browse_dialog && hasFilePicker)
{
if (browse(isSave, path, sizeof(path)))
if (Browse(isSave, path, sizeof(path)))
{
window_loadsave_select(nullptr, path);
WindowLoadsaveSelect(nullptr, path);
}
return nullptr;
}
@ -281,8 +281,8 @@ rct_window* window_loadsave_open(
}
}
const char* pattern = getFilterPatternByType(type, isSave);
window_loadsave_populate_list(w, isSave, path, pattern);
const char* pattern = GetFilterPatternByType(type, isSave);
WindowLoadsavePopulateList(w, isSave, path, pattern);
w->no_list_items = static_cast<uint16_t>(_listItems.size());
w->selected_list_item = -1;
@ -315,18 +315,18 @@ rct_window* window_loadsave_open(
}
WindowInitScrollWidgets(w);
window_loadsave_compute_max_date_width();
WindowLoadsaveComputeMaxDateWidth();
return w;
}
static void window_loadsave_close(rct_window* w)
static void WindowLoadsaveClose(rct_window* w)
{
_listItems.clear();
window_close_by_class(WC_LOADSAVE_OVERWRITE_PROMPT);
}
static void window_loadsave_resize(rct_window* w)
static void WindowLoadsaveResize(rct_window* w)
{
if (w->width < w->min_width)
{
@ -340,7 +340,7 @@ static void window_loadsave_resize(rct_window* w)
}
}
static bool browse(bool isSave, char* path, size_t pathSize)
static bool Browse(bool isSave, char* path, size_t pathSize)
{
file_dialog_desc desc = {};
const utf8* extension = "";
@ -353,7 +353,7 @@ static bool browse(bool isSave, char* path, size_t pathSize)
fileType = FILE_EXTENSION_SV6;
title = isSave ? STR_FILE_DIALOG_TITLE_SAVE_GAME : STR_FILE_DIALOG_TITLE_LOAD_GAME;
desc.filters[0].name = language_get_string(STR_OPENRCT2_SAVED_GAME);
desc.filters[0].pattern = getFilterPatternByType(_type, isSave);
desc.filters[0].pattern = GetFilterPatternByType(_type, isSave);
break;
case LOADSAVETYPE_LANDSCAPE:
@ -361,7 +361,7 @@ static bool browse(bool isSave, char* path, size_t pathSize)
fileType = FILE_EXTENSION_SC6;
title = isSave ? STR_FILE_DIALOG_TITLE_SAVE_LANDSCAPE : STR_FILE_DIALOG_TITLE_LOAD_LANDSCAPE;
desc.filters[0].name = language_get_string(STR_OPENRCT2_LANDSCAPE_FILE);
desc.filters[0].pattern = getFilterPatternByType(_type, isSave);
desc.filters[0].pattern = GetFilterPatternByType(_type, isSave);
break;
case LOADSAVETYPE_SCENARIO:
@ -369,7 +369,7 @@ static bool browse(bool isSave, char* path, size_t pathSize)
fileType = FILE_EXTENSION_SC6;
title = STR_FILE_DIALOG_TITLE_SAVE_SCENARIO;
desc.filters[0].name = language_get_string(STR_OPENRCT2_SCENARIO_FILE);
desc.filters[0].pattern = getFilterPatternByType(_type, isSave);
desc.filters[0].pattern = GetFilterPatternByType(_type, isSave);
break;
case LOADSAVETYPE_TRACK:
@ -377,13 +377,13 @@ static bool browse(bool isSave, char* path, size_t pathSize)
fileType = FILE_EXTENSION_TD6;
title = isSave ? STR_FILE_DIALOG_TITLE_SAVE_TRACK : STR_FILE_DIALOG_TITLE_INSTALL_NEW_TRACK_DESIGN;
desc.filters[0].name = language_get_string(STR_OPENRCT2_TRACK_DESIGN_FILE);
desc.filters[0].pattern = getFilterPatternByType(_type, isSave);
desc.filters[0].pattern = GetFilterPatternByType(_type, isSave);
break;
case LOADSAVETYPE_HEIGHTMAP:
title = STR_FILE_DIALOG_TITLE_LOAD_HEIGHTMAP;
desc.filters[0].name = language_get_string(STR_OPENRCT2_HEIGHTMAP_FILE);
desc.filters[0].pattern = getFilterPatternByType(_type, isSave);
desc.filters[0].pattern = GetFilterPatternByType(_type, isSave);
break;
}
@ -430,7 +430,7 @@ static bool browse(bool isSave, char* path, size_t pathSize)
return false;
}
static void window_loadsave_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowLoadsaveMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
char path[MAX_PATH];
@ -443,31 +443,31 @@ static void window_loadsave_mouseup(rct_window* w, rct_widgetindex widgetIndex)
case WIDX_UP:
safe_strcpy(path, _parentDirectory, sizeof(path));
window_loadsave_populate_list(w, isSave, path, _extension);
WindowLoadsavePopulateList(w, isSave, path, _extension);
WindowInitScrollWidgets(w);
w->no_list_items = static_cast<uint16_t>(_listItems.size());
break;
case WIDX_NEW_FILE:
window_text_input_open(
WindowTextInputOpen(
w, WIDX_NEW_FILE, STR_NONE, STR_FILEBROWSER_FILE_NAME_PROMPT, {}, STR_STRING,
reinterpret_cast<uintptr_t>(_defaultPath.c_str()), 64);
break;
case WIDX_NEW_FOLDER:
window_text_input_raw_open(w, WIDX_NEW_FOLDER, STR_NONE, STR_FILEBROWSER_FOLDER_NAME_PROMPT, {}, "", 64);
WindowTextInputRawOpen(w, WIDX_NEW_FOLDER, STR_NONE, STR_FILEBROWSER_FOLDER_NAME_PROMPT, {}, "", 64);
break;
case WIDX_BROWSE:
if (browse(isSave, path, sizeof(path)))
if (Browse(isSave, path, sizeof(path)))
{
window_loadsave_select(w, path);
WindowLoadsaveSelect(w, path);
}
else
{
// If user cancels file dialog, refresh list
safe_strcpy(path, _directory, sizeof(path));
window_loadsave_populate_list(w, isSave, path, _extension);
WindowLoadsavePopulateList(w, isSave, path, _extension);
WindowInitScrollWidgets(w);
w->no_list_items = static_cast<uint16_t>(_listItems.size());
}
@ -483,7 +483,7 @@ static void window_loadsave_mouseup(rct_window* w, rct_widgetindex widgetIndex)
gConfigGeneral.load_save_sort = Sort::NameAscending;
}
config_save_default();
window_loadsave_sort_list();
WindowLoadsaveSortList();
w->Invalidate();
break;
@ -497,25 +497,25 @@ static void window_loadsave_mouseup(rct_window* w, rct_widgetindex widgetIndex)
gConfigGeneral.load_save_sort = Sort::DateDescending;
}
config_save_default();
window_loadsave_sort_list();
WindowLoadsaveSortList();
w->Invalidate();
break;
case WIDX_DEFAULT:
getInitialDirectoryByType(_type, path, sizeof(path));
window_loadsave_populate_list(w, isSave, path, _extension);
GetInitialDirectoryByType(_type, path, sizeof(path));
WindowLoadsavePopulateList(w, isSave, path, _extension);
WindowInitScrollWidgets(w);
w->no_list_items = static_cast<uint16_t>(_listItems.size());
break;
}
}
static void window_loadsave_scrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
static void WindowLoadsaveScrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
{
*height = w->no_list_items * SCROLLABLE_ROW_HEIGHT;
}
static void window_loadsave_scrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
static void WindowLoadsaveScrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
{
int32_t selectedItem;
@ -535,7 +535,7 @@ static void window_loadsave_scrollmousedown(rct_window* w, int32_t scrollIndex,
char directory[MAX_PATH];
safe_strcpy(directory, _listItems[selectedItem].path.c_str(), sizeof(directory));
window_loadsave_populate_list(w, includeNewItem, directory, _extension);
WindowLoadsavePopulateList(w, includeNewItem, directory, _extension);
WindowInitScrollWidgets(w);
w->no_list_items = static_cast<uint16_t>(_listItems.size());
@ -545,13 +545,13 @@ static void window_loadsave_scrollmousedown(rct_window* w, int32_t scrollIndex,
// TYPE_FILE
// Load or overwrite
if ((_type & 0x01) == LOADSAVETYPE_SAVE)
window_overwrite_prompt_open(_listItems[selectedItem].name.c_str(), _listItems[selectedItem].path.c_str());
WindowOverwritePromptOpen(_listItems[selectedItem].name.c_str(), _listItems[selectedItem].path.c_str());
else
window_loadsave_select(w, _listItems[selectedItem].path.c_str());
WindowLoadsaveSelect(w, _listItems[selectedItem].path.c_str());
}
}
static void window_loadsave_scrollmouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
static void WindowLoadsaveScrollmouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
{
int32_t selectedItem;
@ -564,7 +564,7 @@ static void window_loadsave_scrollmouseover(rct_window* w, int32_t scrollIndex,
w->Invalidate();
}
static void window_loadsave_textinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
static void WindowLoadsaveTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
{
char path[MAX_PATH];
bool overwrite;
@ -593,7 +593,7 @@ static void window_loadsave_textinput(rct_window* w, rct_widgetindex widgetIndex
w->no_list_items = 0;
w->selected_list_item = -1;
window_loadsave_populate_list(w, (_type & 1) == LOADSAVETYPE_SAVE, path, _extension);
WindowLoadsavePopulateList(w, (_type & 1) == LOADSAVETYPE_SAVE, path, _extension);
WindowInitScrollWidgets(w);
w->no_list_items = static_cast<uint16_t>(_listItems.size());
@ -616,16 +616,16 @@ static void window_loadsave_textinput(rct_window* w, rct_widgetindex widgetIndex
}
if (overwrite)
window_overwrite_prompt_open(text, path);
WindowOverwritePromptOpen(text, path);
else
window_loadsave_select(w, path);
WindowLoadsaveSelect(w, path);
break;
}
}
constexpr uint16_t DATE_TIME_GAP = 2;
static void window_loadsave_compute_max_date_width()
static void WindowLoadsaveComputeMaxDateWidth()
{
// Generate a time object for a relatively wide time: 2000-02-20 00:00:00
std::tm tm;
@ -659,7 +659,7 @@ static void window_loadsave_compute_max_date_width()
maxTimeWidth = gfx_get_string_width(time.c_str(), FontSpriteBase::MEDIUM) + DATE_TIME_GAP;
}
static void window_loadsave_invalidate(rct_window* w)
static void WindowLoadsaveInvalidate(rct_window* w)
{
window_loadsave_widgets[WIDX_TITLE].right = w->width - 2;
// close button has to move if it's on the right side
@ -686,7 +686,7 @@ static void window_loadsave_invalidate(rct_window* w)
window_loadsave_widgets[WIDX_BROWSE].bottom = w->height - 6;
}
static void window_loadsave_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowLoadsavePaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
@ -736,7 +736,7 @@ static void window_loadsave_paint(rct_window* w, rct_drawpixelinfo* dpi)
{ COLOUR_GREY });
}
static void window_loadsave_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
static void WindowLoadsaveScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
{
gfx_fill_rect(
dpi, { { dpi->x, dpi->y }, { dpi->x + dpi->width - 1, dpi->y + dpi->height - 1 } },
@ -792,7 +792,7 @@ static void window_loadsave_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, i
}
}
static bool list_item_sort(LoadSaveListItem& a, LoadSaveListItem& b)
static bool ListItemSort(LoadSaveListItem& a, LoadSaveListItem& b)
{
if (a.type != b.type)
return a.type - b.type < 0;
@ -811,12 +811,12 @@ static bool list_item_sort(LoadSaveListItem& a, LoadSaveListItem& b)
return strlogicalcmp(a.name.c_str(), b.name.c_str()) < 0;
}
static void window_loadsave_sort_list()
static void WindowLoadsaveSortList()
{
std::sort(_listItems.begin(), _listItems.end(), list_item_sort);
std::sort(_listItems.begin(), _listItems.end(), ListItemSort);
}
static void window_loadsave_populate_list(rct_window* w, int32_t includeNewItem, const char* directory, const char* extension)
static void WindowLoadsavePopulateList(rct_window* w, int32_t includeNewItem, const char* directory, const char* extension)
{
utf8 absoluteDirectory[MAX_PATH];
Path::GetAbsolute(absoluteDirectory, std::size(absoluteDirectory), directory);
@ -949,13 +949,13 @@ static void window_loadsave_populate_list(rct_window* w, int32_t includeNewItem,
showExtension = true; // Show any extension after the first iteration
}
window_loadsave_sort_list();
WindowLoadsaveSortList();
}
w->Invalidate();
}
static void window_loadsave_invoke_callback(int32_t result, const utf8* path)
static void WindowLoadsaveInvokeCallback(int32_t result, const utf8* path)
{
if (_loadSaveCallback != nullptr)
{
@ -963,14 +963,14 @@ static void window_loadsave_invoke_callback(int32_t result, const utf8* path)
}
}
static void save_path(utf8** config_str, const char* path)
static void SavePath(utf8** config_str, const char* path)
{
free(*config_str);
*config_str = path_get_directory(path);
config_save_default();
}
static bool is_valid_path(const char* path)
static bool IsValidPath(const char* path)
{
char filename[MAX_PATH];
safe_strcpy(filename, path_get_filename(path), sizeof(filename));
@ -983,9 +983,9 @@ static bool is_valid_path(const char* path)
return filename_valid_characters(filename);
}
static void window_loadsave_select(rct_window* w, const char* path)
static void WindowLoadsaveSelect(rct_window* w, const char* path)
{
if (!is_valid_path(path))
if (!IsValidPath(path))
{
context_show_error(STR_ERROR_INVALID_CHARACTERS, STR_NONE, {});
return;
@ -997,14 +997,14 @@ static void window_loadsave_select(rct_window* w, const char* path)
switch (_type & 0x0F)
{
case (LOADSAVETYPE_LOAD | LOADSAVETYPE_GAME):
save_path(&gConfigGeneral.last_save_game_directory, pathBuffer);
window_loadsave_invoke_callback(MODAL_RESULT_OK, pathBuffer);
SavePath(&gConfigGeneral.last_save_game_directory, pathBuffer);
WindowLoadsaveInvokeCallback(MODAL_RESULT_OK, pathBuffer);
window_close_by_class(WC_LOADSAVE);
gfx_invalidate_screen();
break;
case (LOADSAVETYPE_SAVE | LOADSAVETYPE_GAME):
save_path(&gConfigGeneral.last_save_game_directory, pathBuffer);
SavePath(&gConfigGeneral.last_save_game_directory, pathBuffer);
if (scenario_save(pathBuffer, gConfigGeneral.save_plugin_data ? 1 : 0))
{
gScenarioSavePath = pathBuffer;
@ -1014,51 +1014,51 @@ static void window_loadsave_select(rct_window* w, const char* path)
window_close_by_class(WC_LOADSAVE);
gfx_invalidate_screen();
window_loadsave_invoke_callback(MODAL_RESULT_OK, pathBuffer);
WindowLoadsaveInvokeCallback(MODAL_RESULT_OK, pathBuffer);
}
else
{
context_show_error(STR_SAVE_GAME, STR_GAME_SAVE_FAILED, {});
window_loadsave_invoke_callback(MODAL_RESULT_FAIL, pathBuffer);
WindowLoadsaveInvokeCallback(MODAL_RESULT_FAIL, pathBuffer);
}
break;
case (LOADSAVETYPE_LOAD | LOADSAVETYPE_LANDSCAPE):
save_path(&gConfigGeneral.last_save_landscape_directory, pathBuffer);
SavePath(&gConfigGeneral.last_save_landscape_directory, pathBuffer);
if (Editor::LoadLandscape(pathBuffer))
{
gCurrentLoadedPath = pathBuffer;
gfx_invalidate_screen();
window_loadsave_invoke_callback(MODAL_RESULT_OK, pathBuffer);
WindowLoadsaveInvokeCallback(MODAL_RESULT_OK, pathBuffer);
}
else
{
// Not the best message...
context_show_error(STR_LOAD_LANDSCAPE, STR_FAILED_TO_LOAD_FILE_CONTAINS_INVALID_DATA, {});
window_loadsave_invoke_callback(MODAL_RESULT_FAIL, pathBuffer);
WindowLoadsaveInvokeCallback(MODAL_RESULT_FAIL, pathBuffer);
}
break;
case (LOADSAVETYPE_SAVE | LOADSAVETYPE_LANDSCAPE):
save_path(&gConfigGeneral.last_save_landscape_directory, pathBuffer);
SavePath(&gConfigGeneral.last_save_landscape_directory, pathBuffer);
gScenarioFileName = std::string(String::ToStringView(pathBuffer, std::size(pathBuffer)));
if (scenario_save(pathBuffer, gConfigGeneral.save_plugin_data ? 3 : 2))
{
gCurrentLoadedPath = pathBuffer;
window_close_by_class(WC_LOADSAVE);
gfx_invalidate_screen();
window_loadsave_invoke_callback(MODAL_RESULT_OK, pathBuffer);
WindowLoadsaveInvokeCallback(MODAL_RESULT_OK, pathBuffer);
}
else
{
context_show_error(STR_SAVE_LANDSCAPE, STR_LANDSCAPE_SAVE_FAILED, {});
window_loadsave_invoke_callback(MODAL_RESULT_FAIL, pathBuffer);
WindowLoadsaveInvokeCallback(MODAL_RESULT_FAIL, pathBuffer);
}
break;
case (LOADSAVETYPE_SAVE | LOADSAVETYPE_SCENARIO):
{
save_path(&gConfigGeneral.last_save_scenario_directory, pathBuffer);
SavePath(&gConfigGeneral.last_save_scenario_directory, pathBuffer);
int32_t parkFlagsBackup = gParkFlags;
gParkFlags &= ~PARK_FLAGS_SPRITES_INITIALISED;
gEditorStep = EditorStep::Invalid;
@ -1069,32 +1069,32 @@ static void window_loadsave_select(rct_window* w, const char* path)
if (success)
{
window_close_by_class(WC_LOADSAVE);
window_loadsave_invoke_callback(MODAL_RESULT_OK, pathBuffer);
WindowLoadsaveInvokeCallback(MODAL_RESULT_OK, pathBuffer);
title_load();
}
else
{
context_show_error(STR_FILE_DIALOG_TITLE_SAVE_SCENARIO, STR_SCENARIO_SAVE_FAILED, {});
gEditorStep = EditorStep::ObjectiveSelection;
window_loadsave_invoke_callback(MODAL_RESULT_FAIL, pathBuffer);
WindowLoadsaveInvokeCallback(MODAL_RESULT_FAIL, pathBuffer);
}
break;
}
case (LOADSAVETYPE_LOAD | LOADSAVETYPE_TRACK):
{
save_path(&gConfigGeneral.last_save_track_directory, pathBuffer);
SavePath(&gConfigGeneral.last_save_track_directory, pathBuffer);
auto intent = Intent(WC_INSTALL_TRACK);
intent.putExtra(INTENT_EXTRA_PATH, std::string{ pathBuffer });
context_open_intent(&intent);
window_close_by_class(WC_LOADSAVE);
window_loadsave_invoke_callback(MODAL_RESULT_OK, pathBuffer);
WindowLoadsaveInvokeCallback(MODAL_RESULT_OK, pathBuffer);
break;
}
case (LOADSAVETYPE_SAVE | LOADSAVETYPE_TRACK):
{
save_path(&gConfigGeneral.last_save_track_directory, pathBuffer);
SavePath(&gConfigGeneral.last_save_track_directory, pathBuffer);
path_set_extension(pathBuffer, "td6", sizeof(pathBuffer));
@ -1105,20 +1105,20 @@ static void window_loadsave_select(rct_window* w, const char* path)
if (success)
{
window_close_by_class(WC_LOADSAVE);
window_ride_measurements_design_cancel();
window_loadsave_invoke_callback(MODAL_RESULT_OK, path);
WindowRideMeasurementsDesignCancel();
WindowLoadsaveInvokeCallback(MODAL_RESULT_OK, path);
}
else
{
context_show_error(STR_FILE_DIALOG_TITLE_SAVE_TRACK, STR_TRACK_SAVE_FAILED, {});
window_loadsave_invoke_callback(MODAL_RESULT_FAIL, path);
WindowLoadsaveInvokeCallback(MODAL_RESULT_FAIL, path);
}
break;
}
case (LOADSAVETYPE_LOAD | LOADSAVETYPE_HEIGHTMAP):
window_close_by_class(WC_LOADSAVE);
window_loadsave_invoke_callback(MODAL_RESULT_OK, pathBuffer);
WindowLoadsaveInvokeCallback(MODAL_RESULT_OK, pathBuffer);
break;
}
}
@ -1145,18 +1145,18 @@ static rct_widget window_overwrite_prompt_widgets[] = {
WIDGETS_END,
};
static void window_overwrite_prompt_mouseup(rct_window* w, rct_widgetindex widgetIndex);
static void window_overwrite_prompt_paint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowOverwritePromptMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowOverwritePromptPaint(rct_window* w, rct_drawpixelinfo* dpi);
static rct_window_event_list window_overwrite_prompt_events([](auto& events) {
events.mouse_up = &window_overwrite_prompt_mouseup;
events.paint = &window_overwrite_prompt_paint;
events.mouse_up = &WindowOverwritePromptMouseup;
events.paint = &WindowOverwritePromptPaint;
});
static char _window_overwrite_prompt_name[256];
static char _window_overwrite_prompt_path[MAX_PATH];
static rct_window* window_overwrite_prompt_open(const char* name, const char* path)
static rct_window* WindowOverwritePromptOpen(const char* name, const char* path)
{
rct_window* w;
@ -1178,7 +1178,7 @@ static rct_window* window_overwrite_prompt_open(const char* name, const char* pa
return w;
}
static void window_overwrite_prompt_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowOverwritePromptMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
rct_window* loadsaveWindow;
@ -1187,7 +1187,7 @@ static void window_overwrite_prompt_mouseup(rct_window* w, rct_widgetindex widge
case WIDX_OVERWRITE_OVERWRITE:
loadsaveWindow = window_find_by_class(WC_LOADSAVE);
if (loadsaveWindow != nullptr)
window_loadsave_select(loadsaveWindow, _window_overwrite_prompt_path);
WindowLoadsaveSelect(loadsaveWindow, _window_overwrite_prompt_path);
// As the window_loadsave_select function can change the order of the
// windows we can't use window_close(w).
window_close_by_class(WC_LOADSAVE_OVERWRITE_PROMPT);
@ -1200,7 +1200,7 @@ static void window_overwrite_prompt_mouseup(rct_window* w, rct_widgetindex widge
}
}
static void window_overwrite_prompt_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowOverwritePromptPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);

8
src/openrct2-ui/windows/Main.cpp
View File

@ -20,11 +20,11 @@ static rct_widget window_main_widgets[] = {
WIDGETS_END,
};
void window_main_paint(rct_window *w, rct_drawpixelinfo *dpi);
void WindowMainPaint(rct_window *w, rct_drawpixelinfo *dpi);
static rct_window_event_list window_main_events([](auto& events)
{
events.paint = &window_main_paint;
events.paint = &WindowMainPaint;
});
// clang-format on
@ -32,7 +32,7 @@ static rct_window_event_list window_main_events([](auto& events)
* Creates the main window that holds the main viewport.
* rct2: 0x0066B3E8
*/
rct_window* window_main_open()
rct_window* WindowMainOpen()
{
window_main_widgets[0].right = context_get_width();
window_main_widgets[0].bottom = context_get_height();
@ -58,7 +58,7 @@ rct_window* window_main_open()
* This function immediately jumps to 0x00685BE1 this is the second function
* decompiled.
*/
void window_main_paint(rct_window* w, rct_drawpixelinfo* dpi)
void WindowMainPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
viewport_render(dpi, w->viewport, { { dpi->x, dpi->y }, { dpi->x + dpi->width, dpi->y + dpi->height } });
}

242
src/openrct2-ui/windows/Map.cpp
View File

@ -146,39 +146,39 @@ static constexpr const uint16_t RideKeyColours[] = {
MapColour(PALETTE_INDEX_161), // COLOUR_KEY_TOILETS
};
static void window_map_close(rct_window* w);
static void window_map_resize(rct_window* w);
static void window_map_mouseup(rct_window* w, rct_widgetindex widgetIndex);
static void window_map_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void window_map_update(rct_window* w);
static void window_map_toolupdate(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void window_map_tooldown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void window_map_tooldrag(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void window_map_toolabort(rct_window* w, rct_widgetindex widgetIndex);
static void window_map_scrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height);
static void window_map_scrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void window_map_textinput(rct_window* w, rct_widgetindex widgetIndex, char* text);
static void window_map_invalidate(rct_window* w);
static void window_map_paint(rct_window* w, rct_drawpixelinfo* dpi);
static void window_map_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex);
static void WindowMapClose(rct_window* w);
static void WindowMapResize(rct_window* w);
static void WindowMapMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowMapMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowMapUpdate(rct_window* w);
static void WindowMapToolupdate(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowMapTooldown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowMapTooldrag(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowMapToolabort(rct_window* w, rct_widgetindex widgetIndex);
static void WindowMapScrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height);
static void WindowMapScrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowMapTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text);
static void WindowMapInvalidate(rct_window* w);
static void WindowMapPaint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowMapScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex);
static rct_window_event_list window_map_events([](auto& events) {
events.close = &window_map_close;
events.mouse_up = &window_map_mouseup;
events.resize = &window_map_resize;
events.mouse_down = &window_map_mousedown;
events.update = &window_map_update;
events.tool_update = &window_map_toolupdate;
events.tool_down = &window_map_tooldown;
events.tool_drag = &window_map_tooldrag;
events.tool_abort = &window_map_toolabort;
events.get_scroll_size = &window_map_scrollgetsize;
events.scroll_mousedown = &window_map_scrollmousedown;
events.scroll_mousedrag = &window_map_scrollmousedown;
events.text_input = &window_map_textinput;
events.invalidate = &window_map_invalidate;
events.paint = &window_map_paint;
events.scroll_paint = &window_map_scrollpaint;
events.close = &WindowMapClose;
events.mouse_up = &WindowMapMouseup;
events.resize = &WindowMapResize;
events.mouse_down = &WindowMapMousedown;
events.update = &WindowMapUpdate;
events.tool_update = &WindowMapToolupdate;
events.tool_down = &WindowMapTooldown;
events.tool_drag = &WindowMapTooldrag;
events.tool_abort = &WindowMapToolabort;
events.get_scroll_size = &WindowMapScrollgetsize;
events.scroll_mousedown = &WindowMapScrollmousedown;
events.scroll_mousedrag = &WindowMapScrollmousedown;
events.text_input = &WindowMapTextinput;
events.invalidate = &WindowMapInvalidate;
events.paint = &WindowMapPaint;
events.scroll_paint = &WindowMapScrollpaint;
});
/** rct2: 0x00F1AD61 */
@ -192,32 +192,32 @@ static std::vector<uint8_t> _mapImageData;
static uint16_t _landRightsToolSize;
static void window_map_init_map();
static void window_map_centre_on_view_point();
static void window_map_show_default_scenario_editor_buttons(rct_window* w);
static void window_map_draw_tab_images(rct_window* w, rct_drawpixelinfo* dpi);
static void window_map_paint_peep_overlay(rct_drawpixelinfo* dpi);
static void window_map_paint_train_overlay(rct_drawpixelinfo* dpi);
static void window_map_paint_hud_rectangle(rct_drawpixelinfo* dpi);
static void window_map_inputsize_land(rct_window* w);
static void window_map_inputsize_map(rct_window* w);
static void WindowMapInitMap();
static void WindowMapCentreOnViewPoint();
static void WindowMapShowDefaultScenarioEditorButtons(rct_window* w);
static void WindowMapDrawTabImages(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowMapPaintPeepOverlay(rct_drawpixelinfo* dpi);
static void WindowMapPaintTrainOverlay(rct_drawpixelinfo* dpi);
static void WindowMapPaintHudRectangle(rct_drawpixelinfo* dpi);
static void WindowMapInputsizeLand(rct_window* w);
static void WindowMapInputsizeMap(rct_window* w);
static void window_map_set_land_rights_tool_update(const ScreenCoordsXY& screenCoords);
static void window_map_place_park_entrance_tool_update(const ScreenCoordsXY& screenCoords);
static void window_map_set_peep_spawn_tool_update(const ScreenCoordsXY& screenCoords);
static void window_map_place_park_entrance_tool_down(const ScreenCoordsXY& screenCoords);
static void window_map_set_peep_spawn_tool_down(const ScreenCoordsXY& screenCoords);
static void map_window_increase_map_size();
static void map_window_decrease_map_size();
static void map_window_set_pixels(rct_window* w);
static void WindowMapSetLandRightsToolUpdate(const ScreenCoordsXY& screenCoords);
static void WindowMapPlaceParkEntranceToolUpdate(const ScreenCoordsXY& screenCoords);
static void WindowMapSetPeepSpawnToolUpdate(const ScreenCoordsXY& screenCoords);
static void WindowMapPlaceParkEntranceToolDown(const ScreenCoordsXY& screenCoords);
static void WindowMapSetPeepSpawnToolDown(const ScreenCoordsXY& screenCoords);
static void MapWindowIncreaseMapSize();
static void MapWindowDecreaseMapSize();
static void MapWindowSetPixels(rct_window* w);
static CoordsXY map_window_screen_to_map(ScreenCoordsXY screenCoords);
static CoordsXY MapWindowScreenToMap(ScreenCoordsXY screenCoords);
/**
*
* rct2: 0x0068C88A
*/
rct_window* window_map_open()
rct_window* WindowMapOpen()
{
rct_window* w;
@ -256,9 +256,9 @@ rct_window* window_map_open()
w->map.rotation = get_current_rotation();
window_map_init_map();
WindowMapInitMap();
gWindowSceneryRotation = 0;
window_map_centre_on_view_point();
WindowMapCentreOnViewPoint();
// Reset land rights tool size
_landRightsToolSize = 1;
@ -266,7 +266,7 @@ rct_window* window_map_open()
return w;
}
void window_map_reset()
void WindowMapReset()
{
rct_window* w;
@ -277,15 +277,15 @@ void window_map_reset()
return;
}
window_map_init_map();
window_map_centre_on_view_point();
WindowMapInitMap();
WindowMapCentreOnViewPoint();
}
/**
*
* rct2: 0x0068D0F1
*/
static void window_map_close(rct_window* w)
static void WindowMapClose(rct_window* w)
{
_mapImageData.clear();
_mapImageData.shrink_to_fit();
@ -300,7 +300,7 @@ static void window_map_close(rct_window* w)
*
* rct2: 0x0068CFC1
*/
static void window_map_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowMapMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -374,10 +374,10 @@ static void window_map_mouseup(rct_window* w, rct_widgetindex widgetIndex)
show_construction_rights();
break;
case WIDX_LAND_TOOL:
window_map_inputsize_land(w);
WindowMapInputsizeLand(w);
break;
case WIDX_MAP_SIZE_SPINNER:
window_map_inputsize_map(w);
WindowMapInputsizeMap(w);
break;
case WIDX_MAP_GENERATOR:
context_open_window(WC_MAPGEN);
@ -399,7 +399,7 @@ static void window_map_mouseup(rct_window* w, rct_widgetindex widgetIndex)
*
* rct2: 0x0068D7DC
*/
static void window_map_resize(rct_window* w)
static void WindowMapResize(rct_window* w)
{
w->flags |= WF_RESIZABLE;
w->min_width = 245;
@ -412,15 +412,15 @@ static void window_map_resize(rct_window* w)
*
* rct2: 0x0068D040
*/
static void window_map_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowMapMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
switch (widgetIndex)
{
case WIDX_MAP_SIZE_SPINNER_UP:
map_window_increase_map_size();
MapWindowIncreaseMapSize();
break;
case WIDX_MAP_SIZE_SPINNER_DOWN:
map_window_decrease_map_size();
MapWindowDecreaseMapSize();
break;
case WIDX_LAND_TOOL_SMALLER:
// Decrement land rights tool size
@ -441,17 +441,17 @@ static void window_map_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct
*
* rct2: 0x0068D7FB
*/
static void window_map_update(rct_window* w)
static void WindowMapUpdate(rct_window* w)
{
if (get_current_rotation() != w->map.rotation)
{
w->map.rotation = get_current_rotation();
window_map_init_map();
window_map_centre_on_view_point();
WindowMapInitMap();
WindowMapCentreOnViewPoint();
}
for (int32_t i = 0; i < 16; i++)
map_window_set_pixels(w);
MapWindowSetPixels(w);
w->Invalidate();
@ -478,18 +478,18 @@ static void window_map_update(rct_window* w)
*
* rct2: 0x0068D093
*/
static void window_map_toolupdate(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowMapToolupdate(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
{
switch (widgetIndex)
{
case WIDX_SET_LAND_RIGHTS:
window_map_set_land_rights_tool_update(screenCoords);
WindowMapSetLandRightsToolUpdate(screenCoords);
break;
case WIDX_BUILD_PARK_ENTRANCE:
window_map_place_park_entrance_tool_update(screenCoords);
WindowMapPlaceParkEntranceToolUpdate(screenCoords);
break;
case WIDX_PEOPLE_STARTING_POSITION:
window_map_set_peep_spawn_tool_update(screenCoords);
WindowMapSetPeepSpawnToolUpdate(screenCoords);
break;
}
}
@ -498,15 +498,15 @@ static void window_map_toolupdate(rct_window* w, rct_widgetindex widgetIndex, co
*
* rct2: 0x0068D074
*/
static void window_map_tooldown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowMapTooldown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
{
switch (widgetIndex)
{
case WIDX_BUILD_PARK_ENTRANCE:
window_map_place_park_entrance_tool_down(screenCoords);
WindowMapPlaceParkEntranceToolDown(screenCoords);
break;
case WIDX_PEOPLE_STARTING_POSITION:
window_map_set_peep_spawn_tool_down(screenCoords);
WindowMapSetPeepSpawnToolDown(screenCoords);
break;
}
}
@ -515,7 +515,7 @@ static void window_map_tooldown(rct_window* w, rct_widgetindex widgetIndex, cons
*
* rct2: 0x0068D088
*/
static void window_map_tooldrag(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowMapTooldrag(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
{
switch (widgetIndex)
{
@ -535,7 +535,7 @@ static void window_map_tooldrag(rct_window* w, rct_widgetindex widgetIndex, cons
*
* rct2: 0x0068D055
*/
static void window_map_toolabort(rct_window* w, rct_widgetindex widgetIndex)
static void WindowMapToolabort(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -565,9 +565,9 @@ static void window_map_toolabort(rct_window* w, rct_widgetindex widgetIndex)
*
* rct2: 0x0068D7CC
*/
static void window_map_scrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
static void WindowMapScrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
{
window_map_invalidate(w);
WindowMapInvalidate(w);
*width = MAP_WINDOW_MAP_SIZE;
*height = MAP_WINDOW_MAP_SIZE;
@ -577,9 +577,9 @@ static void window_map_scrollgetsize(rct_window* w, int32_t scrollIndex, int32_t
*
* rct2: 0x0068D726
*/
static void window_map_scrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
static void WindowMapScrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
{
CoordsXY c = map_window_screen_to_map(screenCoords);
CoordsXY c = MapWindowScreenToMap(screenCoords);
auto mapCoords = CoordsXY{ std::clamp(c.x, 0, MAXIMUM_MAP_SIZE_BIG - 1), std::clamp(c.y, 0, MAXIMUM_MAP_SIZE_BIG - 1) };
auto mapZ = tile_element_height(mapCoords);
@ -589,7 +589,7 @@ static void window_map_scrollmousedown(rct_window* w, int32_t scrollIndex, const
window_scroll_to_location(mainWindow, { mapCoords, mapZ });
}
if (land_tool_is_active())
if (scenery_tool_is_active())
{
// Set land terrain
int32_t landToolSize = std::max<int32_t>(1, gLandToolSize);
@ -631,7 +631,7 @@ static void window_map_scrollmousedown(rct_window* w, int32_t scrollIndex, const
}
}
static void window_map_textinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
static void WindowMapTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
{
int32_t size;
char* end;
@ -670,7 +670,7 @@ static void window_map_textinput(rct_window* w, rct_widgetindex widgetIndex, cha
*
* rct2: 0x0068CA8F
*/
static void window_map_invalidate(rct_window* w)
static void WindowMapInvalidate(rct_window* w)
{
uint64_t pressedWidgets;
int32_t i, height;
@ -779,7 +779,7 @@ static void window_map_invalidate(rct_window* w)
// if not in set land rights mode: show the default scenario editor buttons
if (gCurrentToolWidget.widget_index != WIDX_SET_LAND_RIGHTS)
{
window_map_show_default_scenario_editor_buttons(w);
WindowMapShowDefaultScenarioEditorButtons(w);
}
else
{ // if in set land rights mode: show land tool buttons + modes
@ -796,7 +796,7 @@ static void window_map_invalidate(rct_window* w)
else
{
// if no tool is active: show the default scenario editor buttons
window_map_show_default_scenario_editor_buttons(w);
WindowMapShowDefaultScenarioEditorButtons(w);
}
}
}
@ -805,10 +805,10 @@ static void window_map_invalidate(rct_window* w)
*
* rct2: 0x0068CDA9
*/
static void window_map_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowMapPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_map_draw_tab_images(w, dpi);
WindowMapDrawTabImages(w, dpi);
auto screenCoords = w->windowPos
+ ScreenCoordsXY{ window_map_widgets[WIDX_LAND_TOOL].midX(), window_map_widgets[WIDX_LAND_TOOL].midY() };
@ -868,7 +868,7 @@ static void window_map_paint(rct_window* w, rct_drawpixelinfo* dpi)
*
* rct2: 0x0068CF23
*/
static void window_map_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
static void WindowMapScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
{
gfx_clear(dpi, PALETTE_INDEX_10);
@ -884,20 +884,20 @@ static void window_map_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_
if (w->selected_tab == PAGE_PEEPS)
{
window_map_paint_peep_overlay(dpi);
WindowMapPaintPeepOverlay(dpi);
}
else
{
window_map_paint_train_overlay(dpi);
WindowMapPaintTrainOverlay(dpi);
}
window_map_paint_hud_rectangle(dpi);
WindowMapPaintHudRectangle(dpi);
}
/**
*
* rct2: 0x0068CA6C
*/
static void window_map_init_map()
static void WindowMapInitMap()
{
std::fill(_mapImageData.begin(), _mapImageData.end(), PALETTE_INDEX_10);
_currentLine = 0;
@ -907,7 +907,7 @@ static void window_map_init_map()
*
* rct2: 0x0068C990
*/
static void window_map_centre_on_view_point()
static void WindowMapCentreOnViewPoint()
{
rct_window* w = window_get_main();
rct_window* w_map;
@ -960,7 +960,7 @@ static void window_map_centre_on_view_point()
*
* rct2: 0x0068CD35 (part of 0x0068CA8F)
*/
static void window_map_show_default_scenario_editor_buttons(rct_window* w)
static void WindowMapShowDefaultScenarioEditorButtons(rct_window* w)
{
w->widgets[WIDX_BUILD_PARK_ENTRANCE].type = WindowWidgetType::FlatBtn;
w->widgets[WIDX_PEOPLE_STARTING_POSITION].type = WindowWidgetType::FlatBtn;
@ -977,23 +977,23 @@ static void window_map_show_default_scenario_editor_buttons(rct_window* w)
ft.Add<uint16_t>(gMapSize - 2);
}
static void window_map_inputsize_land(rct_window* w)
static void WindowMapInputsizeLand(rct_window* w)
{
Formatter ft;
ft.Add<int16_t>(MINIMUM_TOOL_SIZE);
ft.Add<int16_t>(MAXIMUM_TOOL_SIZE);
window_text_input_open(w, WIDX_LAND_TOOL, STR_SELECTION_SIZE, STR_ENTER_SELECTION_SIZE, ft, STR_NONE, STR_NONE, 3);
WindowTextInputOpen(w, WIDX_LAND_TOOL, STR_SELECTION_SIZE, STR_ENTER_SELECTION_SIZE, ft, STR_NONE, STR_NONE, 3);
}
static void window_map_inputsize_map(rct_window* w)
static void WindowMapInputsizeMap(rct_window* w)
{
Formatter ft;
ft.Add<int16_t>(MINIMUM_MAP_SIZE_PRACTICAL);
ft.Add<int16_t>(MAXIMUM_MAP_SIZE_PRACTICAL);
window_text_input_open(w, WIDX_MAP_SIZE_SPINNER, STR_MAP_SIZE_2, STR_ENTER_MAP_SIZE, ft, STR_NONE, STR_NONE, 4);
WindowTextInputOpen(w, WIDX_MAP_SIZE_SPINNER, STR_MAP_SIZE_2, STR_ENTER_MAP_SIZE, ft, STR_NONE, STR_NONE, 4);
}
static void window_map_draw_tab_images(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowMapDrawTabImages(rct_window* w, rct_drawpixelinfo* dpi)
{
uint32_t image;
@ -1019,7 +1019,7 @@ static void window_map_draw_tab_images(rct_window* w, rct_drawpixelinfo* dpi)
*
* part of window_map_paint_peep_overlay and window_map_paint_train_overlay
*/
static MapCoordsXY window_map_transform_to_map_coords(CoordsXY c)
static MapCoordsXY WindowMapTransformToMapCoords(CoordsXY c)
{
int32_t x = c.x, y = c.y;
@ -1051,7 +1051,7 @@ static void DrawMapPeepPixel(Peep* peep, const uint8_t flashColour, rct_drawpixe
if (peep->x == LOCATION_NULL)
return;
MapCoordsXY c = window_map_transform_to_map_coords({ peep->x, peep->y });
MapCoordsXY c = WindowMapTransformToMapCoords({ peep->x, peep->y });
auto leftTop = ScreenCoordsXY{ c.x, c.y };
auto rightBottom = leftTop;
uint8_t colour = DefaultPeepMapColour;
@ -1096,7 +1096,7 @@ static uint8_t MapGetStaffFlashColour()
*
* rct2: 0x0068DADA
*/
static void window_map_paint_peep_overlay(rct_drawpixelinfo* dpi)
static void WindowMapPaintPeepOverlay(rct_drawpixelinfo* dpi)
{
auto flashColour = MapGetGuestFlashColour();
for (auto guest : EntityList<Guest>())
@ -1114,7 +1114,7 @@ static void window_map_paint_peep_overlay(rct_drawpixelinfo* dpi)
*
* rct2: 0x0068DBC1
*/
static void window_map_paint_train_overlay(rct_drawpixelinfo* dpi)
static void WindowMapPaintTrainOverlay(rct_drawpixelinfo* dpi)
{
for (auto train : TrainManager::View())
{
@ -1123,7 +1123,7 @@ static void window_map_paint_train_overlay(rct_drawpixelinfo* dpi)
if (vehicle->x == LOCATION_NULL)
continue;
MapCoordsXY c = window_map_transform_to_map_coords({ vehicle->x, vehicle->y });
MapCoordsXY c = WindowMapTransformToMapCoords({ vehicle->x, vehicle->y });
gfx_fill_rect(dpi, { { c.x, c.y }, { c.x, c.y } }, PALETTE_INDEX_171);
}
@ -1136,7 +1136,7 @@ static void window_map_paint_train_overlay(rct_drawpixelinfo* dpi)
*
* rct2: 0x0068D8CE
*/
static void window_map_paint_hud_rectangle(rct_drawpixelinfo* dpi)
static void WindowMapPaintHudRectangle(rct_drawpixelinfo* dpi)
{
rct_window* main_window = window_get_main();
if (main_window == nullptr)
@ -1174,7 +1174,7 @@ static void window_map_paint_hud_rectangle(rct_drawpixelinfo* dpi)
*
* rct2: 0x0068D24E
*/
static void window_map_set_land_rights_tool_update(const ScreenCoordsXY& screenCoords)
static void WindowMapSetLandRightsToolUpdate(const ScreenCoordsXY& screenCoords)
{
rct_viewport* viewport;
@ -1205,7 +1205,7 @@ static void window_map_set_land_rights_tool_update(const ScreenCoordsXY& screenC
*
* rct2: 0x00666EEF
*/
static CoordsXYZD place_park_entrance_get_map_position(const ScreenCoordsXY& screenCoords)
static CoordsXYZD PlaceParkEntranceGetMapPosition(const ScreenCoordsXY& screenCoords)
{
CoordsXYZD parkEntranceMapPosition{ 0, 0, 0, INVALID_DIRECTION };
const CoordsXY mapCoords = ViewportInteractionGetTileStartAtCursor(screenCoords);
@ -1241,7 +1241,7 @@ static CoordsXYZD place_park_entrance_get_map_position(const ScreenCoordsXY& scr
*
* rct2: 0x00666FD0
*/
static void window_map_place_park_entrance_tool_update(const ScreenCoordsXY& screenCoords)
static void WindowMapPlaceParkEntranceToolUpdate(const ScreenCoordsXY& screenCoords)
{
int32_t sideDirection;
@ -1250,7 +1250,7 @@ static void window_map_place_park_entrance_tool_update(const ScreenCoordsXY& scr
gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE;
gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_ARROW;
gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_CONSTRUCT;
CoordsXYZD parkEntrancePosition = place_park_entrance_get_map_position(screenCoords);
CoordsXYZD parkEntrancePosition = PlaceParkEntranceGetMapPosition(screenCoords);
if (parkEntrancePosition.IsNull())
{
park_entrance_remove_ghost();
@ -1283,7 +1283,7 @@ static void window_map_place_park_entrance_tool_update(const ScreenCoordsXY& scr
*
* rct2: 0x0068D4E9
*/
static void window_map_set_peep_spawn_tool_update(const ScreenCoordsXY& screenCoords)
static void WindowMapSetPeepSpawnToolUpdate(const ScreenCoordsXY& screenCoords)
{
int32_t mapZ, direction;
TileElement* tileElement;
@ -1318,11 +1318,11 @@ static void window_map_set_peep_spawn_tool_update(const ScreenCoordsXY& screenCo
*
* rct2: 0x006670A4
*/
static void window_map_place_park_entrance_tool_down(const ScreenCoordsXY& screenCoords)
static void WindowMapPlaceParkEntranceToolDown(const ScreenCoordsXY& screenCoords)
{
park_entrance_remove_ghost();
CoordsXYZD parkEntrancePosition = place_park_entrance_get_map_position(screenCoords);
CoordsXYZD parkEntrancePosition = PlaceParkEntranceGetMapPosition(screenCoords);
if (!parkEntrancePosition.IsNull())
{
auto gameAction = PlaceParkEntranceAction(parkEntrancePosition, gFootpathSelectedId);
@ -1338,7 +1338,7 @@ static void window_map_place_park_entrance_tool_down(const ScreenCoordsXY& scree
*
* rct2: 0x0068D573
*/
static void window_map_set_peep_spawn_tool_down(const ScreenCoordsXY& screenCoords)
static void WindowMapSetPeepSpawnToolDown(const ScreenCoordsXY& screenCoords)
{
TileElement* tileElement;
int32_t mapZ, direction;
@ -1362,7 +1362,7 @@ static void window_map_set_peep_spawn_tool_down(const ScreenCoordsXY& screenCoor
*
* rct2: 0x0068D641
*/
static void map_window_increase_map_size()
static void MapWindowIncreaseMapSize()
{
auto increaseMapSizeAction = ChangeMapSizeAction(gMapSize + 1);
GameActions::Execute(&increaseMapSizeAction);
@ -1372,7 +1372,7 @@ static void map_window_increase_map_size()
*
* rct2: 0x0068D6B4
*/
static void map_window_decrease_map_size()
static void MapWindowDecreaseMapSize()
{
auto decreaseMapSizeAction = ChangeMapSizeAction(gMapSize - 1);
GameActions::Execute(&decreaseMapSizeAction);
@ -1418,7 +1418,7 @@ static constexpr const uint16_t ElementTypeAddColour[] = {
MapColour(PALETTE_INDEX_0), // TILE_ELEMENT_TYPE_BANNER
};
static uint16_t map_window_get_pixel_colour_peep(const CoordsXY& c)
static uint16_t MapWindowGetPixelColourPeep(const CoordsXY& c)
{
auto* surfaceElement = map_get_surface_element_at(c);
if (surfaceElement == nullptr)
@ -1452,7 +1452,7 @@ static uint16_t map_window_get_pixel_colour_peep(const CoordsXY& c)
return colour;
}
static uint16_t map_window_get_pixel_colour_ride(const CoordsXY& c)
static uint16_t MapWindowGetPixelColourRide(const CoordsXY& c)
{
Ride* ride;
uint16_t colourA = 0; // highlight colour
@ -1511,7 +1511,7 @@ static uint16_t map_window_get_pixel_colour_ride(const CoordsXY& c)
return colourB;
}
static void map_window_set_pixels(rct_window* w)
static void MapWindowSetPixels(rct_window* w)
{
uint16_t colour = 0;
int32_t x = 0, y = 0, dx = 0, dy = 0;
@ -1554,10 +1554,10 @@ static void map_window_set_pixels(rct_window* w)
switch (w->selected_tab)
{
case PAGE_PEEPS:
colour = map_window_get_pixel_colour_peep({ x, y });
colour = MapWindowGetPixelColourPeep({ x, y });
break;
case PAGE_RIDES:
colour = map_window_get_pixel_colour_ride({ x, y });
colour = MapWindowGetPixelColourRide({ x, y });
break;
}
destination[0] = (colour >> 8) & 0xFF;
@ -1575,7 +1575,7 @@ static void map_window_set_pixels(rct_window* w)
_currentLine = 0;
}
static CoordsXY map_window_screen_to_map(ScreenCoordsXY screenCoords)
static CoordsXY MapWindowScreenToMap(ScreenCoordsXY screenCoords)
{
screenCoords.x = ((screenCoords.x + 8) - MAXIMUM_MAP_SIZE_TECHNICAL) / 2;
screenCoords.y = ((screenCoords.y + 8)) / 2;

221
src/openrct2-ui/windows/MapGen.cpp
View File

@ -184,72 +184,72 @@ static rct_widget* PageWidgets[WINDOW_MAPGEN_PAGE_COUNT] = {
#pragma region Events
static void window_mapgen_shared_close(rct_window* w);
static void window_mapgen_shared_mouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowMapgenSharedClose(rct_window* w);
static void WindowMapgenSharedMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void window_mapgen_base_mouseup(rct_window* w, rct_widgetindex widgetIndex);
static void window_mapgen_base_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void window_mapgen_base_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void window_mapgen_base_update(rct_window* w);
static void window_mapgen_textinput(rct_window* w, rct_widgetindex widgetIndex, char* text);
static void window_mapgen_base_invalidate(rct_window* w);
static void window_mapgen_base_paint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowMapgenBaseMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowMapgenBaseMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowMapgenBaseDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowMapgenBaseUpdate(rct_window* w);
static void WindowMapgenTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text);
static void WindowMapgenBaseInvalidate(rct_window* w);
static void WindowMapgenBasePaint(rct_window* w, rct_drawpixelinfo* dpi);
static void window_mapgen_random_mouseup(rct_window* w, rct_widgetindex widgetIndex);
static void window_mapgen_random_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void window_mapgen_random_update(rct_window* w);
static void window_mapgen_random_invalidate(rct_window* w);
static void window_mapgen_random_paint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowMapgenRandomMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowMapgenRandomMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowMapgenRandomUpdate(rct_window* w);
static void WindowMapgenRandomInvalidate(rct_window* w);
static void WindowMapgenRandomPaint(rct_window* w, rct_drawpixelinfo* dpi);
static void window_mapgen_simplex_mouseup(rct_window* w, rct_widgetindex widgetIndex);
static void window_mapgen_simplex_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void window_mapgen_simplex_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void window_mapgen_simplex_update(rct_window* w);
static void window_mapgen_simplex_invalidate(rct_window* w);
static void window_mapgen_simplex_paint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowMapgenSimplexMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowMapgenSimplexMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowMapgenSimplexDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowMapgenSimplexUpdate(rct_window* w);
static void WindowMapgenSimplexInvalidate(rct_window* w);
static void WindowMapgenSimplexPaint(rct_window* w, rct_drawpixelinfo* dpi);
static void window_mapgen_heightmap_mouseup(rct_window* w, rct_widgetindex widgetIndex);
static void window_mapgen_heightmap_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void window_mapgen_heightmap_invalidate(rct_window* w);
static void window_mapgen_heightmap_paint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowMapgenHeightmapMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowMapgenHeightmapMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowMapgenHeightmapInvalidate(rct_window* w);
static void WindowMapgenHeightmapPaint(rct_window* w, rct_drawpixelinfo* dpi);
static rct_window_event_list BaseEvents([](auto& events) {
events.close = &window_mapgen_shared_close;
events.mouse_up = &window_mapgen_base_mouseup;
events.mouse_down = &window_mapgen_base_mousedown;
events.dropdown = &window_mapgen_base_dropdown;
events.update = &window_mapgen_base_update;
events.text_input = &window_mapgen_textinput;
events.invalidate = &window_mapgen_base_invalidate;
events.paint = &window_mapgen_base_paint;
events.close = &WindowMapgenSharedClose;
events.mouse_up = &WindowMapgenBaseMouseup;
events.mouse_down = &WindowMapgenBaseMousedown;
events.dropdown = &WindowMapgenBaseDropdown;
events.update = &WindowMapgenBaseUpdate;
events.text_input = &WindowMapgenTextinput;
events.invalidate = &WindowMapgenBaseInvalidate;
events.paint = &WindowMapgenBasePaint;
});
static rct_window_event_list RandomEvents([](auto& events) {
events.close = &window_mapgen_shared_close;
events.mouse_up = &window_mapgen_random_mouseup;
events.mouse_down = &window_mapgen_random_mousedown;
events.update = &window_mapgen_random_update;
events.invalidate = &window_mapgen_random_invalidate;
events.paint = &window_mapgen_random_paint;
events.close = &WindowMapgenSharedClose;
events.mouse_up = &WindowMapgenRandomMouseup;
events.mouse_down = &WindowMapgenRandomMousedown;
events.update = &WindowMapgenRandomUpdate;
events.invalidate = &WindowMapgenRandomInvalidate;
events.paint = &WindowMapgenRandomPaint;
});
static rct_window_event_list SimplexEvents([](auto& events) {
events.close = &window_mapgen_shared_close;
events.mouse_up = &window_mapgen_simplex_mouseup;
events.mouse_down = &window_mapgen_simplex_mousedown;
events.dropdown = &window_mapgen_simplex_dropdown;
events.update = &window_mapgen_simplex_update;
events.text_input = &window_mapgen_textinput;
events.invalidate = &window_mapgen_simplex_invalidate;
events.paint = &window_mapgen_simplex_paint;
events.close = &WindowMapgenSharedClose;
events.mouse_up = &WindowMapgenSimplexMouseup;
events.mouse_down = &WindowMapgenSimplexMousedown;
events.dropdown = &WindowMapgenSimplexDropdown;
events.update = &WindowMapgenSimplexUpdate;
events.text_input = &WindowMapgenTextinput;
events.invalidate = &WindowMapgenSimplexInvalidate;
events.paint = &WindowMapgenSimplexPaint;
});
static rct_window_event_list HeightmapEvents([](auto& events) {
events.close = &window_mapgen_shared_close;
events.mouse_up = &window_mapgen_heightmap_mouseup;
events.mouse_down = &window_mapgen_heightmap_mousedown;
events.invalidate = &window_mapgen_heightmap_invalidate;
events.paint = &window_mapgen_heightmap_paint;
events.close = &WindowMapgenSharedClose;
events.mouse_up = &WindowMapgenHeightmapMouseup;
events.mouse_down = &WindowMapgenHeightmapMousedown;
events.invalidate = &WindowMapgenHeightmapInvalidate;
events.paint = &WindowMapgenHeightmapPaint;
});
static rct_window_event_list* PageEvents[] = {
@ -423,9 +423,9 @@ constexpr int32_t WATERLEVEL_MIN = 0;
constexpr int32_t WATERLEVEL_MAX = 54;
constexpr int32_t MAX_SMOOTH_ITERATIONS = 20;
static void window_mapgen_set_page(rct_window* w, int32_t page);
static void window_mapgen_set_pressed_tab(rct_window* w);
static void window_mapgen_draw_tab_images(rct_drawpixelinfo* dpi, rct_window* w);
static void WindowMapgenSetPage(rct_window* w, int32_t page);
static void WindowMapgenSetPressedTab(rct_window* w);
static void WindowMapgenDrawTabImages(rct_drawpixelinfo* dpi, rct_window* w);
static int32_t _mapSize = 150;
static int32_t _baseHeight = 12;
@ -448,7 +448,7 @@ static bool _heightmapSmoothTiles = true;
static int32_t _heightmapLow = 2;
static int32_t _heightmapHigh = 70;
rct_window* window_mapgen_open()
rct_window* WindowMapgenOpen()
{
rct_window* w = window_bring_to_front_by_class(WC_MAPGEN);
if (w != nullptr)
@ -475,12 +475,12 @@ rct_window* window_mapgen_open()
return w;
}
static void window_mapgen_shared_close(rct_window* w)
static void WindowMapgenSharedClose(rct_window* w)
{
mapgen_unload_heightmap();
}
static void window_mapgen_shared_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowMapgenSharedMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -491,16 +491,16 @@ static void window_mapgen_shared_mouseup(rct_window* w, rct_widgetindex widgetIn
case WIDX_TAB_2:
case WIDX_TAB_3:
case WIDX_TAB_4:
window_mapgen_set_page(w, widgetIndex - WIDX_TAB_1);
WindowMapgenSetPage(w, widgetIndex - WIDX_TAB_1);
break;
}
}
#pragma region Base page
static void window_mapgen_base_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowMapgenBaseMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
window_mapgen_shared_mouseup(w, widgetIndex);
WindowMapgenSharedMouseup(w, widgetIndex);
mapgen_settings mapgenSettings;
Formatter ft;
@ -520,25 +520,24 @@ static void window_mapgen_base_mouseup(rct_window* w, rct_widgetindex widgetInde
ft.Add<int16_t>(MINIMUM_MAP_SIZE_PRACTICAL);
ft.Add<int16_t>(MAXIMUM_MAP_SIZE_PRACTICAL);
// Practical map size is 2 lower than the technical map size
window_text_input_open(
w, WIDX_MAP_SIZE, STR_MAP_SIZE_2, STR_ENTER_MAP_SIZE, ft, STR_FORMAT_INTEGER, _mapSize - 2, 4);
WindowTextInputOpen(w, WIDX_MAP_SIZE, STR_MAP_SIZE_2, STR_ENTER_MAP_SIZE, ft, STR_FORMAT_INTEGER, _mapSize - 2, 4);
break;
case WIDX_BASE_HEIGHT:
ft.Add<int16_t>((BASESIZE_MIN - 12) / 2);
ft.Add<int16_t>((BASESIZE_MAX - 12) / 2);
window_text_input_open(
WindowTextInputOpen(
w, WIDX_BASE_HEIGHT, STR_BASE_HEIGHT, STR_ENTER_BASE_HEIGHT, ft, STR_FORMAT_INTEGER, (_baseHeight - 12) / 2, 3);
break;
case WIDX_WATER_LEVEL:
ft.Add<int16_t>((WATERLEVEL_MIN - 12) / 2);
ft.Add<int16_t>((WATERLEVEL_MAX - 12) / 2);
window_text_input_open(
WindowTextInputOpen(
w, WIDX_WATER_LEVEL, STR_WATER_LEVEL, STR_ENTER_WATER_LEVEL, ft, STR_FORMAT_INTEGER, (_waterLevel - 12) / 2, 3);
break;
}
}
static void window_mapgen_base_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowMapgenBaseMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
switch (widgetIndex)
{
@ -575,7 +574,7 @@ static void window_mapgen_base_mousedown(rct_window* w, rct_widgetindex widgetIn
}
}
static void window_mapgen_base_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowMapgenBaseDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
{
int32_t type;
@ -618,7 +617,7 @@ static void window_mapgen_base_dropdown(rct_window* w, rct_widgetindex widgetInd
}
}
static void window_mapgen_base_update(rct_window* w)
static void WindowMapgenBaseUpdate(rct_window* w)
{
// Tab animation
if (++w->frame_no >= TabAnimationLoops[w->page])
@ -626,7 +625,7 @@ static void window_mapgen_base_update(rct_window* w)
widget_invalidate(w, WIDX_TAB_1);
}
static void window_mapgen_textinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
static void WindowMapgenTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
{
int32_t value;
char* end;
@ -660,7 +659,7 @@ static void window_mapgen_textinput(rct_window* w, rct_widgetindex widgetIndex,
w->Invalidate();
}
static void window_mapgen_base_invalidate(rct_window* w)
static void WindowMapgenBaseInvalidate(rct_window* w)
{
auto surfaceImage = static_cast<uint32_t>(SPR_NONE);
auto edgeImage = static_cast<uint32_t>(SPR_NONE);
@ -691,13 +690,13 @@ static void window_mapgen_base_invalidate(rct_window* w)
w->widgets[WIDX_FLOOR_TEXTURE].image = surfaceImage;
w->widgets[WIDX_WALL_TEXTURE].image = edgeImage;
window_mapgen_set_pressed_tab(w);
WindowMapgenSetPressedTab(w);
}
static void window_mapgen_base_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowMapgenBasePaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_mapgen_draw_tab_images(dpi, w);
WindowMapgenDrawTabImages(dpi, w);
const auto textColour = w->colours[1];
@ -737,9 +736,9 @@ static void window_mapgen_base_paint(rct_window* w, rct_drawpixelinfo* dpi)
#pragma region Random page
static void window_mapgen_random_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowMapgenRandomMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
window_mapgen_shared_mouseup(w, widgetIndex);
WindowMapgenSharedMouseup(w, widgetIndex);
mapgen_settings mapgenSettings;
@ -770,11 +769,11 @@ static void window_mapgen_random_mouseup(rct_window* w, rct_widgetindex widgetIn
}
}
static void window_mapgen_random_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowMapgenRandomMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
}
static void window_mapgen_random_update(rct_window* w)
static void WindowMapgenRandomUpdate(rct_window* w)
{
// Tab animation
if (++w->frame_no >= TabAnimationLoops[w->page])
@ -782,7 +781,7 @@ static void window_mapgen_random_update(rct_window* w)
widget_invalidate(w, WIDX_TAB_2);
}
static void window_mapgen_random_invalidate(rct_window* w)
static void WindowMapgenRandomInvalidate(rct_window* w)
{
if (w->widgets != PageWidgets[WINDOW_MAPGEN_PAGE_RANDOM])
{
@ -796,22 +795,22 @@ static void window_mapgen_random_invalidate(rct_window* w)
if (_placeTrees)
w->pressed_widgets |= 1ULL << WIDX_RANDOM_PLACE_TREES;
window_mapgen_set_pressed_tab(w);
WindowMapgenSetPressedTab(w);
}
static void window_mapgen_random_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowMapgenRandomPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_mapgen_draw_tab_images(dpi, w);
WindowMapgenDrawTabImages(dpi, w);
}
#pragma endregion
#pragma region Simplex page
static void window_mapgen_simplex_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowMapgenSimplexMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
window_mapgen_shared_mouseup(w, widgetIndex);
WindowMapgenSharedMouseup(w, widgetIndex);
mapgen_settings mapgenSettings;
@ -823,7 +822,7 @@ static void window_mapgen_simplex_mouseup(rct_window* w, rct_widgetindex widgetI
ft.Add<int16_t>(MINIMUM_MAP_SIZE_PRACTICAL);
ft.Add<int16_t>(MAXIMUM_MAP_SIZE_PRACTICAL);
// Practical map size is 2 lower than the technical map size
window_text_input_open(
WindowTextInputOpen(
w, WIDX_SIMPLEX_MAP_SIZE, STR_MAP_SIZE_2, STR_ENTER_MAP_SIZE, ft, STR_FORMAT_INTEGER, _mapSize - 2, 4);
break;
}
@ -847,7 +846,7 @@ static void window_mapgen_simplex_mouseup(rct_window* w, rct_widgetindex widgetI
}
}
static void window_mapgen_simplex_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowMapgenSimplexMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
switch (widgetIndex)
{
@ -916,7 +915,7 @@ static void window_mapgen_simplex_mousedown(rct_window* w, rct_widgetindex widge
}
}
static void window_mapgen_simplex_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowMapgenSimplexDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
{
int32_t type;
@ -959,7 +958,7 @@ static void window_mapgen_simplex_dropdown(rct_window* w, rct_widgetindex widget
}
}
static void window_mapgen_simplex_update(rct_window* w)
static void WindowMapgenSimplexUpdate(rct_window* w)
{
// Tab animation
if (++w->frame_no >= TabAnimationLoops[w->page])
@ -967,7 +966,7 @@ static void window_mapgen_simplex_update(rct_window* w)
widget_invalidate(w, WIDX_TAB_3);
}
static void window_mapgen_simplex_invalidate(rct_window* w)
static void WindowMapgenSimplexInvalidate(rct_window* w)
{
auto surfaceImage = static_cast<uint32_t>(SPR_NONE);
auto edgeImage = static_cast<uint32_t>(SPR_NONE);
@ -1013,13 +1012,13 @@ static void window_mapgen_simplex_invalidate(rct_window* w)
WidgetSetEnabled(w, WIDX_SIMPLEX_WALL_TEXTURE, false);
}
window_mapgen_set_pressed_tab(w);
WindowMapgenSetPressedTab(w);
}
static void window_mapgen_simplex_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowMapgenSimplexPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_mapgen_draw_tab_images(dpi, w);
WindowMapgenDrawTabImages(dpi, w);
const uint8_t textColour = w->colours[1];
@ -1094,7 +1093,7 @@ static void window_mapgen_simplex_paint(rct_window* w, rct_drawpixelinfo* dpi)
#pragma region Heightmap page
static void window_mapgen_heightmap_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowMapgenHeightmapMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
switch (widgetIndex)
{
@ -1135,7 +1134,7 @@ static void window_mapgen_heightmap_mousedown(rct_window* w, rct_widgetindex wid
}
}
static void window_mapgen_heightmap_generate_map()
static void WindowMapgenHeightmapGenerateMap()
{
mapgen_settings mapgenSettings;
mapgenSettings.water_level = _waterLevel;
@ -1149,7 +1148,7 @@ static void window_mapgen_heightmap_generate_map()
gfx_invalidate_screen();
}
static void window_mapgen_heightmap_loadsave_callback(int32_t result, const utf8* path)
static void WindowMapgenHeightmapLoadsaveCallback(int32_t result, const utf8* path)
{
if (result == MODAL_RESULT_OK)
{
@ -1162,15 +1161,15 @@ static void window_mapgen_heightmap_loadsave_callback(int32_t result, const utf8
// The window needs to be open while using the map
rct_window* const w = context_open_window(WC_MAPGEN);
_heightmapLoaded = true;
window_mapgen_set_page(w, WINDOW_MAPGEN_PAGE_HEIGHTMAP);
WindowMapgenSetPage(w, WINDOW_MAPGEN_PAGE_HEIGHTMAP);
window_mapgen_heightmap_generate_map();
WindowMapgenHeightmapGenerateMap();
}
}
static void window_mapgen_heightmap_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowMapgenHeightmapMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
window_mapgen_shared_mouseup(w, widgetIndex);
WindowMapgenSharedMouseup(w, widgetIndex);
switch (widgetIndex)
{
@ -1186,7 +1185,7 @@ static void window_mapgen_heightmap_mouseup(rct_window* w, rct_widgetindex widge
{
auto intent = Intent(WC_LOADSAVE);
intent.putExtra(INTENT_EXTRA_LOADSAVE_TYPE, LOADSAVETYPE_LOAD | LOADSAVETYPE_HEIGHTMAP);
intent.putExtra(INTENT_EXTRA_CALLBACK, reinterpret_cast<void*>(window_mapgen_heightmap_loadsave_callback));
intent.putExtra(INTENT_EXTRA_CALLBACK, reinterpret_cast<void*>(WindowMapgenHeightmapLoadsaveCallback));
context_open_intent(&intent);
return;
}
@ -1212,10 +1211,10 @@ static void window_mapgen_heightmap_mouseup(rct_window* w, rct_widgetindex widge
}
// Always regenerate the map after one of the page widgets has been changed
window_mapgen_heightmap_generate_map();
WindowMapgenHeightmapGenerateMap();
}
static void window_mapgen_heightmap_invalidate(rct_window* w)
static void WindowMapgenHeightmapInvalidate(rct_window* w)
{
if (w->widgets != PageWidgets[WINDOW_MAPGEN_PAGE_HEIGHTMAP])
{
@ -1227,13 +1226,13 @@ static void window_mapgen_heightmap_invalidate(rct_window* w)
WidgetSetCheckboxValue(w, WIDX_HEIGHTMAP_NORMALIZE, _heightmapNormalize);
WidgetSetCheckboxValue(w, WIDX_HEIGHTMAP_SMOOTH_TILES, _heightmapSmoothTiles);
window_mapgen_set_pressed_tab(w);
WindowMapgenSetPressedTab(w);
}
static void window_mapgen_heightmap_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowMapgenHeightmapPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_mapgen_draw_tab_images(dpi, w);
WindowMapgenDrawTabImages(dpi, w);
const colour_t enabledColour = w->colours[1];
const colour_t disabledColour = enabledColour | COLOUR_FLAG_INSET;
@ -1293,7 +1292,7 @@ static void window_mapgen_heightmap_paint(rct_window* w, rct_drawpixelinfo* dpi)
#pragma region Common
static void window_mapgen_set_page(rct_window* w, int32_t page)
static void WindowMapgenSetPage(rct_window* w, int32_t page)
{
w->page = page;
w->frame_no = 0;
@ -1330,7 +1329,7 @@ static void window_mapgen_set_page(rct_window* w, int32_t page)
w->Invalidate();
}
static void window_mapgen_set_pressed_tab(rct_window* w)
static void WindowMapgenSetPressedTab(rct_window* w)
{
int32_t i;
for (i = 0; i < WINDOW_MAPGEN_PAGE_COUNT; i++)
@ -1338,7 +1337,7 @@ static void window_mapgen_set_pressed_tab(rct_window* w)
w->pressed_widgets |= 1LL << (WIDX_TAB_1 + w->page);
}
static void window_mapgen_draw_tab_image(rct_drawpixelinfo* dpi, rct_window* w, int32_t page, int32_t spriteIndex)
static void WindowMapgenDrawTabImage(rct_drawpixelinfo* dpi, rct_window* w, int32_t page, int32_t spriteIndex)
{
rct_widgetindex widgetIndex = WIDX_TAB_1 + page;
@ -1356,12 +1355,12 @@ static void window_mapgen_draw_tab_image(rct_drawpixelinfo* dpi, rct_window* w,
}
}
static void window_mapgen_draw_tab_images(rct_drawpixelinfo* dpi, rct_window* w)
static void WindowMapgenDrawTabImages(rct_drawpixelinfo* dpi, rct_window* w)
{
window_mapgen_draw_tab_image(dpi, w, WINDOW_MAPGEN_PAGE_BASE, SPR_G2_TAB_LAND);
window_mapgen_draw_tab_image(dpi, w, WINDOW_MAPGEN_PAGE_RANDOM, SPR_G2_TAB_TREE);
window_mapgen_draw_tab_image(dpi, w, WINDOW_MAPGEN_PAGE_SIMPLEX, SPR_G2_TAB_PENCIL);
window_mapgen_draw_tab_image(dpi, w, WINDOW_MAPGEN_PAGE_HEIGHTMAP, SPR_TAB_GRAPH_0);
WindowMapgenDrawTabImage(dpi, w, WINDOW_MAPGEN_PAGE_BASE, SPR_G2_TAB_LAND);
WindowMapgenDrawTabImage(dpi, w, WINDOW_MAPGEN_PAGE_RANDOM, SPR_G2_TAB_TREE);
WindowMapgenDrawTabImage(dpi, w, WINDOW_MAPGEN_PAGE_SIMPLEX, SPR_G2_TAB_PENCIL);
WindowMapgenDrawTabImage(dpi, w, WINDOW_MAPGEN_PAGE_HEIGHTMAP, SPR_TAB_GRAPH_0);
}
#pragma endregion

20
src/openrct2-ui/windows/MapTooltip.cpp
View File

@ -22,13 +22,13 @@ static rct_widget window_map_tooltip_widgets[] = {
WIDGETS_END,
};
static void window_map_tooltip_update(rct_window *w);
static void window_map_tooltip_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowMapTooltipUpdate(rct_window *w);
static void WindowMapTooltipPaint(rct_window *w, rct_drawpixelinfo *dpi);
static rct_window_event_list window_map_tooltip_events([](auto& events)
{
events.update = &window_map_tooltip_update;
events.paint = &window_map_tooltip_paint;
events.update = &WindowMapTooltipUpdate;
events.paint = &WindowMapTooltipPaint;
});
// clang-format on
@ -37,7 +37,7 @@ static rct_window_event_list window_map_tooltip_events([](auto& events)
static ScreenCoordsXY _lastCursor;
static int32_t _cursorHoldDuration;
static void window_map_tooltip_open();
static void WindowMapTooltipOpen();
static Formatter _mapTooltipArgs;
@ -55,7 +55,7 @@ const Formatter& GetMapTooltip()
*
* rct2: 0x006EE77A
*/
void window_map_tooltip_update_visibility()
void WindowMapTooltipUpdateVisibility()
{
if (ThemeGetFlags() & UITHEME_FLAG_USE_FULL_BOTTOM_TOOLBAR)
{
@ -88,7 +88,7 @@ void window_map_tooltip_update_visibility()
}
else
{
window_map_tooltip_open();
WindowMapTooltipOpen();
}
}
@ -96,7 +96,7 @@ void window_map_tooltip_update_visibility()
*
* rct2: 0x006A7C43
*/
static void window_map_tooltip_open()
static void WindowMapTooltipOpen()
{
rct_window* w;
@ -126,7 +126,7 @@ static void window_map_tooltip_open()
*
* rct2: 0x006EE8CE
*/
static void window_map_tooltip_update(rct_window* w)
static void WindowMapTooltipUpdate(rct_window* w)
{
w->Invalidate();
}
@ -135,7 +135,7 @@ static void window_map_tooltip_update(rct_window* w)
*
* rct2: 0x006EE894
*/
static void window_map_tooltip_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowMapTooltipPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
rct_string_id stringId;
std::memcpy(&stringId, _mapTooltipArgs.Data(), sizeof(rct_string_id));

88
src/openrct2-ui/windows/MazeConstruction.cpp
View File

@ -85,40 +85,40 @@ static rct_widget window_maze_construction_widgets[] = {
#pragma region Events
static void window_maze_construction_close(rct_window *w);
static void window_maze_construction_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_maze_construction_resize(rct_window *w);
static void window_maze_construction_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget);
static void window_maze_construction_update(rct_window *w);
static void window_maze_construction_toolupdate(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void window_maze_construction_tooldown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void window_maze_construction_invalidate(rct_window *w);
static void window_maze_construction_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowMazeConstructionClose(rct_window *w);
static void WindowMazeConstructionMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowMazeConstructionResize(rct_window *w);
static void WindowMazeConstructionMousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget);
static void WindowMazeConstructionUpdate(rct_window *w);
static void WindowMazeConstructionToolupdate(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowMazeConstructionTooldown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowMazeConstructionInvalidate(rct_window *w);
static void WindowMazeConstructionPaint(rct_window *w, rct_drawpixelinfo *dpi);
// 0x993F6C
static rct_window_event_list window_maze_construction_events([](auto& events)
{
events.close = &window_maze_construction_close;
events.mouse_up = &window_maze_construction_mouseup;
events.resize = &window_maze_construction_resize;
events.mouse_down = &window_maze_construction_mousedown;
events.update = &window_maze_construction_update;
events.tool_update = &window_maze_construction_toolupdate;
events.tool_down = &window_maze_construction_tooldown;
events.invalidate = &window_maze_construction_invalidate;
events.paint = &window_maze_construction_paint;
events.close = &WindowMazeConstructionClose;
events.mouse_up = &WindowMazeConstructionMouseup;
events.resize = &WindowMazeConstructionResize;
events.mouse_down = &WindowMazeConstructionMousedown;
events.update = &WindowMazeConstructionUpdate;
events.tool_update = &WindowMazeConstructionToolupdate;
events.tool_down = &WindowMazeConstructionTooldown;
events.invalidate = &WindowMazeConstructionInvalidate;
events.paint = &WindowMazeConstructionPaint;
});
// clang-format on
#pragma endregion
static void window_maze_construction_construct(int32_t direction);
static void WindowMazeConstructionConstruct(int32_t direction);
/**
*
* rct2: 0x006CB481
*/
rct_window* window_maze_construction_open()
rct_window* WindowMazeConstructionOpen()
{
rct_window* w = WindowCreate(
ScreenCoordsXY(0, 29), 166, 200, &window_maze_construction_events, WC_RIDE_CONSTRUCTION, WF_NO_AUTO_CLOSE);
@ -141,7 +141,7 @@ rct_window* window_maze_construction_open()
*
* rct2: 0x006CD811
*/
static void window_maze_construction_close(rct_window* w)
static void WindowMazeConstructionClose(rct_window* w)
{
ride_construction_invalidate_current_track();
viewport_set_visibility(0);
@ -175,7 +175,7 @@ static void window_maze_construction_close(rct_window* w)
}
}
static void window_maze_construction_entrance_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowMazeConstructionEntranceMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
if (tool_set(w, widgetIndex, Tool::Crosshair))
return;
@ -193,14 +193,14 @@ static void window_maze_construction_entrance_mouseup(rct_window* w, rct_widgeti
}
_rideConstructionState = RideConstructionState::EntranceExit;
window_maze_construction_update_pressed_widgets();
WindowMazeConstructionUpdatePressedWidgets();
}
/**
*
* rct2: 0x006CD461
*/
static void window_maze_construction_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowMazeConstructionMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -209,13 +209,13 @@ static void window_maze_construction_mouseup(rct_window* w, rct_widgetindex widg
break;
case WIDX_MAZE_ENTRANCE:
case WIDX_MAZE_EXIT:
window_maze_construction_entrance_mouseup(w, widgetIndex);
WindowMazeConstructionEntranceMouseup(w, widgetIndex);
break;
case WIDX_MAZE_DIRECTION_NW:
case WIDX_MAZE_DIRECTION_NE:
case WIDX_MAZE_DIRECTION_SE:
case WIDX_MAZE_DIRECTION_SW:
window_maze_construction_construct(((widgetIndex - WIDX_MAZE_DIRECTION_NW) - get_current_rotation()) & 3);
WindowMazeConstructionConstruct(((widgetIndex - WIDX_MAZE_DIRECTION_NW) - get_current_rotation()) & 3);
break;
}
}
@ -224,7 +224,7 @@ static void window_maze_construction_mouseup(rct_window* w, rct_widgetindex widg
*
* rct2: 0x006CD623
*/
static void window_maze_construction_resize(rct_window* w)
static void WindowMazeConstructionResize(rct_window* w)
{
uint64_t disabledWidgets = 0;
if (_rideConstructionState == RideConstructionState::Place)
@ -255,32 +255,32 @@ static void window_maze_construction_resize(rct_window* w)
w->disabled_widgets = disabledWidgets;
}
static void window_maze_construction_build_mode_mousedown(RideConstructionState rideConstructionState)
static void WindowMazeConstructionBuildModeMousedown(RideConstructionState rideConstructionState)
{
if (_rideConstructionState == RideConstructionState::EntranceExit)
{
tool_cancel();
}
_rideConstructionState = rideConstructionState;
window_maze_construction_update_pressed_widgets();
WindowMazeConstructionUpdatePressedWidgets();
}
/**
*
* rct2: 0x006CD48C
*/
static void window_maze_construction_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowMazeConstructionMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
switch (widgetIndex)
{
case WIDX_MAZE_BUILD_MODE:
window_maze_construction_build_mode_mousedown(RideConstructionState::MazeBuild);
WindowMazeConstructionBuildModeMousedown(RideConstructionState::MazeBuild);
break;
case WIDX_MAZE_MOVE_MODE:
window_maze_construction_build_mode_mousedown(RideConstructionState::MazeMove);
WindowMazeConstructionBuildModeMousedown(RideConstructionState::MazeMove);
break;
case WIDX_MAZE_FILL_MODE:
window_maze_construction_build_mode_mousedown(RideConstructionState::MazeFill);
WindowMazeConstructionBuildModeMousedown(RideConstructionState::MazeFill);
break;
}
}
@ -289,7 +289,7 @@ static void window_maze_construction_mousedown(rct_window* w, rct_widgetindex wi
*
* rct2: 0x006CD767
*/
static void window_maze_construction_update(rct_window* w)
static void WindowMazeConstructionUpdate(rct_window* w)
{
auto ride = get_ride(_currentRideIndex);
if (ride == nullptr || ride->status != RideStatus::Closed)
@ -311,7 +311,7 @@ static void window_maze_construction_update(rct_window* w)
if (!WidgetIsActiveTool(w, WIDX_MAZE_ENTRANCE) && !WidgetIsActiveTool(w, WIDX_MAZE_EXIT))
{
_rideConstructionState = gRideEntranceExitPlacePreviousRideConstructionState;
window_maze_construction_update_pressed_widgets();
WindowMazeConstructionUpdatePressedWidgets();
}
break;
default:
@ -338,7 +338,7 @@ static void window_maze_construction_update(rct_window* w)
*
* rct2: 0x006CD63E
*/
static void window_maze_construction_toolupdate(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowMazeConstructionToolupdate(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
{
switch (widgetIndex)
{
@ -356,7 +356,7 @@ static void window_maze_construction_toolupdate(rct_window* w, rct_widgetindex w
*
* rct2: 0x006C825F
*/
static void window_maze_construction_entrance_tooldown(const ScreenCoordsXY& screenCoords, rct_window* w)
static void WindowMazeConstructionEntranceTooldown(const ScreenCoordsXY& screenCoords, rct_window* w)
{
ride_construction_invalidate_current_track();
@ -398,7 +398,7 @@ static void window_maze_construction_entrance_tooldown(const ScreenCoordsXY& scr
gCurrentToolWidget.widget_index = (gRideEntranceExitPlaceType == ENTRANCE_TYPE_RIDE_ENTRANCE) ? WIDX_MAZE_ENTRANCE
: WIDX_MAZE_EXIT;
window_maze_construction_update_pressed_widgets();
WindowMazeConstructionUpdatePressedWidgets();
}
});
auto res = GameActions::Execute(&rideEntranceExitPlaceAction);
@ -408,7 +408,7 @@ static void window_maze_construction_entrance_tooldown(const ScreenCoordsXY& scr
*
* rct2: 0x006CD65D
*/
static void window_maze_construction_tooldown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowMazeConstructionTooldown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
{
switch (widgetIndex)
{
@ -417,7 +417,7 @@ static void window_maze_construction_tooldown(rct_window* w, rct_widgetindex wid
break;
case WIDX_MAZE_ENTRANCE:
case WIDX_MAZE_EXIT:
window_maze_construction_entrance_tooldown(screenCoords, w);
WindowMazeConstructionEntranceTooldown(screenCoords, w);
break;
}
}
@ -426,7 +426,7 @@ static void window_maze_construction_tooldown(rct_window* w, rct_widgetindex wid
*
* rct2: 0x006CD435
*/
static void window_maze_construction_invalidate(rct_window* w)
static void WindowMazeConstructionInvalidate(rct_window* w)
{
auto ride = get_ride(_currentRideIndex);
auto ft = Formatter::Common();
@ -446,7 +446,7 @@ static void window_maze_construction_invalidate(rct_window* w)
*
* rct2: 0x006CD45B
*/
static void window_maze_construction_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowMazeConstructionPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
}
@ -455,7 +455,7 @@ static void window_maze_construction_paint(rct_window* w, rct_drawpixelinfo* dpi
*
* rct2: 0x006CD887
*/
void window_maze_construction_update_pressed_widgets()
void WindowMazeConstructionUpdatePressedWidgets()
{
rct_window* w;
@ -505,7 +505,7 @@ void window_maze_construction_update_pressed_widgets()
*
* rct2: 0x006CD4AB
*/
static void window_maze_construction_construct(int32_t direction)
static void WindowMazeConstructionConstruct(int32_t direction)
{
int32_t x, y, z, flags, mode;

258
src/openrct2-ui/windows/Multiplayer.cpp
View File

@ -126,86 +126,86 @@ static constexpr rct_string_id WindowMultiplayerPageTitles[] = {
static uint8_t _selectedGroup = 0;
static void window_multiplayer_information_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_multiplayer_information_resize(rct_window *w);
static void window_multiplayer_information_update(rct_window *w);
static void window_multiplayer_information_invalidate(rct_window *w);
static void window_multiplayer_information_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowMultiplayerInformationMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowMultiplayerInformationResize(rct_window *w);
static void WindowMultiplayerInformationUpdate(rct_window *w);
static void WindowMultiplayerInformationInvalidate(rct_window *w);
static void WindowMultiplayerInformationPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_multiplayer_players_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_multiplayer_players_resize(rct_window *w);
static void window_multiplayer_players_update(rct_window *w);
static void window_multiplayer_players_scrollgetsize(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void window_multiplayer_players_scrollmousedown(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void window_multiplayer_players_scrollmouseover(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void window_multiplayer_players_invalidate(rct_window *w);
static void window_multiplayer_players_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_multiplayer_players_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
static void WindowMultiplayerPlayersMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowMultiplayerPlayersResize(rct_window *w);
static void WindowMultiplayerPlayersUpdate(rct_window *w);
static void WindowMultiplayerPlayersScrollgetsize(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void WindowMultiplayerPlayersScrollmousedown(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowMultiplayerPlayersScrollmouseover(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowMultiplayerPlayersInvalidate(rct_window *w);
static void WindowMultiplayerPlayersPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowMultiplayerPlayersScrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
static void window_multiplayer_groups_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_multiplayer_groups_resize(rct_window *w);
static void window_multiplayer_groups_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget);
static void window_multiplayer_groups_dropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void window_multiplayer_groups_update(rct_window *w);
static void window_multiplayer_groups_scrollgetsize(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void window_multiplayer_groups_scrollmousedown(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void window_multiplayer_groups_scrollmouseover(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void window_multiplayer_groups_text_input(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void window_multiplayer_groups_invalidate(rct_window *w);
static void window_multiplayer_groups_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_multiplayer_groups_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
static void WindowMultiplayerGroupsMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowMultiplayerGroupsResize(rct_window *w);
static void WindowMultiplayerGroupsMousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowMultiplayerGroupsDropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowMultiplayerGroupsUpdate(rct_window *w);
static void WindowMultiplayerGroupsScrollgetsize(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void WindowMultiplayerGroupsScrollmousedown(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowMultiplayerGroupsScrollmouseover(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowMultiplayerGroupsTextInput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void WindowMultiplayerGroupsInvalidate(rct_window *w);
static void WindowMultiplayerGroupsPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowMultiplayerGroupsScrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
static void window_multiplayer_options_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_multiplayer_options_resize(rct_window *w);
static void window_multiplayer_options_update(rct_window *w);
static void window_multiplayer_options_invalidate(rct_window *w);
static void window_multiplayer_options_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowMultiplayerOptionsMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowMultiplayerOptionsResize(rct_window *w);
static void WindowMultiplayerOptionsUpdate(rct_window *w);
static void WindowMultiplayerOptionsInvalidate(rct_window *w);
static void WindowMultiplayerOptionsPaint(rct_window *w, rct_drawpixelinfo *dpi);
static rct_window_event_list window_multiplayer_information_events([](auto& events)
{
events.mouse_up = &window_multiplayer_information_mouseup;
events.resize = &window_multiplayer_information_resize;
events.update = &window_multiplayer_information_update;
events.invalidate = &window_multiplayer_information_invalidate;
events.paint = &window_multiplayer_information_paint;
events.mouse_up = &WindowMultiplayerInformationMouseup;
events.resize = &WindowMultiplayerInformationResize;
events.update = &WindowMultiplayerInformationUpdate;
events.invalidate = &WindowMultiplayerInformationInvalidate;
events.paint = &WindowMultiplayerInformationPaint;
});
static rct_window_event_list window_multiplayer_players_events([](auto& events)
{
events.mouse_up = &window_multiplayer_players_mouseup;
events.resize = &window_multiplayer_players_resize;
events.update = &window_multiplayer_players_update;
events.get_scroll_size = &window_multiplayer_players_scrollgetsize;
events.scroll_mousedown = &window_multiplayer_players_scrollmousedown;
events.scroll_mouseover = &window_multiplayer_players_scrollmouseover;
events.invalidate = &window_multiplayer_players_invalidate;
events.paint = &window_multiplayer_players_paint;
events.scroll_paint = &window_multiplayer_players_scrollpaint;
events.mouse_up = &WindowMultiplayerPlayersMouseup;
events.resize = &WindowMultiplayerPlayersResize;
events.update = &WindowMultiplayerPlayersUpdate;
events.get_scroll_size = &WindowMultiplayerPlayersScrollgetsize;
events.scroll_mousedown = &WindowMultiplayerPlayersScrollmousedown;
events.scroll_mouseover = &WindowMultiplayerPlayersScrollmouseover;
events.invalidate = &WindowMultiplayerPlayersInvalidate;
events.paint = &WindowMultiplayerPlayersPaint;
events.scroll_paint = &WindowMultiplayerPlayersScrollpaint;
});
static rct_window_event_list window_multiplayer_groups_events([](auto& events)
{
events.mouse_up = &window_multiplayer_groups_mouseup;
events.resize = &window_multiplayer_groups_resize;
events.mouse_down = &window_multiplayer_groups_mousedown;
events.dropdown = &window_multiplayer_groups_dropdown;
events.update = &window_multiplayer_groups_update;
events.get_scroll_size = &window_multiplayer_groups_scrollgetsize;
events.scroll_mousedown = &window_multiplayer_groups_scrollmousedown;
events.scroll_mouseover = &window_multiplayer_groups_scrollmouseover;
events.text_input = &window_multiplayer_groups_text_input;
events.invalidate = &window_multiplayer_groups_invalidate;
events.paint = &window_multiplayer_groups_paint;
events.scroll_paint = &window_multiplayer_groups_scrollpaint;
events.mouse_up = &WindowMultiplayerGroupsMouseup;
events.resize = &WindowMultiplayerGroupsResize;
events.mouse_down = &WindowMultiplayerGroupsMousedown;
events.dropdown = &WindowMultiplayerGroupsDropdown;
events.update = &WindowMultiplayerGroupsUpdate;
events.get_scroll_size = &WindowMultiplayerGroupsScrollgetsize;
events.scroll_mousedown = &WindowMultiplayerGroupsScrollmousedown;
events.scroll_mouseover = &WindowMultiplayerGroupsScrollmouseover;
events.text_input = &WindowMultiplayerGroupsTextInput;
events.invalidate = &WindowMultiplayerGroupsInvalidate;
events.paint = &WindowMultiplayerGroupsPaint;
events.scroll_paint = &WindowMultiplayerGroupsScrollpaint;
});
static rct_window_event_list window_multiplayer_options_events([](auto& events)
{
events.mouse_up = &window_multiplayer_options_mouseup;
events.resize = &window_multiplayer_options_resize;
events.update = &window_multiplayer_options_update;
events.invalidate = &window_multiplayer_options_invalidate;
events.paint = &window_multiplayer_options_paint;
events.mouse_up = &WindowMultiplayerOptionsMouseup;
events.resize = &WindowMultiplayerOptionsResize;
events.update = &WindowMultiplayerOptionsUpdate;
events.invalidate = &WindowMultiplayerOptionsInvalidate;
events.paint = &WindowMultiplayerOptionsPaint;
});
static rct_window_event_list *window_multiplayer_page_events[] = {
@ -229,26 +229,26 @@ static constexpr const int32_t window_multiplayer_animation_frames[] = {
4,
};
static void window_multiplayer_draw_tab_images(rct_window* w, rct_drawpixelinfo* dpi);
static void window_multiplayer_set_page(rct_window* w, int32_t page);
static void WindowMultiplayerDrawTabImages(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowMultiplayerSetPage(rct_window* w, int32_t page);
static bool _windowInformationSizeDirty;
static ScreenCoordsXY _windowInformationSize;
rct_window* window_multiplayer_open()
rct_window* WindowMultiplayerOpen()
{
// Check if window is already open
rct_window* window = window_bring_to_front_by_class(WC_MULTIPLAYER);
if (window == nullptr)
{
window = WindowCreateAutoPos(320, 144, &window_multiplayer_players_events, WC_MULTIPLAYER, WF_10 | WF_RESIZABLE);
window_multiplayer_set_page(window, WINDOW_MULTIPLAYER_PAGE_INFORMATION);
WindowMultiplayerSetPage(window, WINDOW_MULTIPLAYER_PAGE_INFORMATION);
}
return window;
}
static void window_multiplayer_set_page(rct_window* w, int32_t page)
static void WindowMultiplayerSetPage(rct_window* w, int32_t page)
{
_windowInformationSizeDirty = true;
@ -270,7 +270,7 @@ static void window_multiplayer_set_page(rct_window* w, int32_t page)
w->Invalidate();
}
static void window_multiplayer_anchor_border_widgets(rct_window* w)
static void WindowMultiplayerAnchorBorderWidgets(rct_window* w)
{
w->widgets[WIDX_BACKGROUND].right = w->width - 1;
w->widgets[WIDX_BACKGROUND].bottom = w->height - 1;
@ -281,7 +281,7 @@ static void window_multiplayer_anchor_border_widgets(rct_window* w)
w->widgets[WIDX_CLOSE].right = w->width - 3;
}
static void window_multiplayer_set_pressed_tab(rct_window* w)
static void WindowMultiplayerSetPressedTab(rct_window* w)
{
for (int32_t i = 0; i < 2; i++)
{
@ -290,7 +290,7 @@ static void window_multiplayer_set_pressed_tab(rct_window* w)
w->pressed_widgets |= 1LL << (WIDX_TAB1 + w->page);
}
static void window_multiplayer_groups_show_group_dropdown(rct_window* w, rct_widget* widget)
static void WindowMultiplayerGroupsShowGroupDropdown(rct_window* w, rct_widget* widget)
{
rct_widget* dropdownWidget;
int32_t numItems, i;
@ -320,7 +320,7 @@ static void window_multiplayer_groups_show_group_dropdown(rct_window* w, rct_wid
#pragma region Information page
static void window_multiplayer_information_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowMultiplayerInformationMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -333,13 +333,13 @@ static void window_multiplayer_information_mouseup(rct_window* w, rct_widgetinde
case WIDX_TAB4:
if (w->page != widgetIndex - WIDX_TAB1)
{
window_multiplayer_set_page(w, widgetIndex - WIDX_TAB1);
WindowMultiplayerSetPage(w, widgetIndex - WIDX_TAB1);
}
break;
}
}
static ScreenCoordsXY window_multiplayer_information_get_size()
static ScreenCoordsXY WindowMultiplayerInformationGetSize()
{
if (!_windowInformationSizeDirty)
{
@ -391,29 +391,29 @@ static ScreenCoordsXY window_multiplayer_information_get_size()
return _windowInformationSize;
}
static void window_multiplayer_information_resize(rct_window* w)
static void WindowMultiplayerInformationResize(rct_window* w)
{
auto size = window_multiplayer_information_get_size();
auto size = WindowMultiplayerInformationGetSize();
window_set_resize(w, size.x, size.y, size.x, size.y);
}
static void window_multiplayer_information_update(rct_window* w)
static void WindowMultiplayerInformationUpdate(rct_window* w)
{
w->frame_no++;
widget_invalidate(w, WIDX_TAB1 + w->page);
}
static void window_multiplayer_information_invalidate(rct_window* w)
static void WindowMultiplayerInformationInvalidate(rct_window* w)
{
window_multiplayer_set_pressed_tab(w);
window_multiplayer_anchor_border_widgets(w);
WindowMultiplayerSetPressedTab(w);
WindowMultiplayerAnchorBorderWidgets(w);
window_align_tabs(w, WIDX_TAB1, WIDX_TAB4);
}
static void window_multiplayer_information_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowMultiplayerInformationPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_multiplayer_draw_tab_images(w, dpi);
WindowMultiplayerDrawTabImages(w, dpi);
rct_drawpixelinfo clippedDPI;
if (clip_drawpixelinfo(&clippedDPI, dpi, w->windowPos, w->width, w->height))
@ -472,7 +472,7 @@ static void window_multiplayer_information_paint(rct_window* w, rct_drawpixelinf
#pragma region Players page
static void window_multiplayer_players_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowMultiplayerPlayersMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -485,13 +485,13 @@ static void window_multiplayer_players_mouseup(rct_window* w, rct_widgetindex wi
case WIDX_TAB4:
if (w->page != widgetIndex - WIDX_TAB1)
{
window_multiplayer_set_page(w, widgetIndex - WIDX_TAB1);
WindowMultiplayerSetPage(w, widgetIndex - WIDX_TAB1);
}
break;
}
}
static void window_multiplayer_players_resize(rct_window* w)
static void WindowMultiplayerPlayersResize(rct_window* w)
{
window_set_resize(w, 420, 124, 500, 450);
@ -504,13 +504,13 @@ static void window_multiplayer_players_resize(rct_window* w)
w->Invalidate();
}
static void window_multiplayer_players_update(rct_window* w)
static void WindowMultiplayerPlayersUpdate(rct_window* w)
{
w->frame_no++;
widget_invalidate(w, WIDX_TAB1 + w->page);
}
static void window_multiplayer_players_scrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
static void WindowMultiplayerPlayersScrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
{
int32_t i;
@ -531,7 +531,7 @@ static void window_multiplayer_players_scrollgetsize(rct_window* w, int32_t scro
}
}
static void window_multiplayer_players_scrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
static void WindowMultiplayerPlayersScrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
{
int32_t index;
@ -542,10 +542,10 @@ static void window_multiplayer_players_scrollmousedown(rct_window* w, int32_t sc
w->selected_list_item = index;
w->Invalidate();
window_player_open(network_get_player_id(index));
WindowPlayerOpen(network_get_player_id(index));
}
static void window_multiplayer_players_scrollmouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
static void WindowMultiplayerPlayersScrollmouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
{
int32_t index;
@ -557,21 +557,21 @@ static void window_multiplayer_players_scrollmouseover(rct_window* w, int32_t sc
w->Invalidate();
}
static void window_multiplayer_players_invalidate(rct_window* w)
static void WindowMultiplayerPlayersInvalidate(rct_window* w)
{
window_multiplayer_set_pressed_tab(w);
window_multiplayer_anchor_border_widgets(w);
WindowMultiplayerSetPressedTab(w);
WindowMultiplayerAnchorBorderWidgets(w);
window_multiplayer_players_widgets[WIDX_LIST].right = w->width - 4;
window_multiplayer_players_widgets[WIDX_LIST].bottom = w->height - 0x0F;
window_align_tabs(w, WIDX_TAB1, WIDX_TAB4);
}
static void window_multiplayer_players_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowMultiplayerPlayersPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
rct_string_id stringId;
WindowDrawWidgets(w, dpi);
window_multiplayer_draw_tab_images(w, dpi);
WindowMultiplayerDrawTabImages(w, dpi);
// Number of players
stringId = w->no_list_items == 1 ? STR_MULTIPLAYER_PLAYER_COUNT : STR_MULTIPLAYER_PLAYER_COUNT_PLURAL;
@ -581,7 +581,7 @@ static void window_multiplayer_players_paint(rct_window* w, rct_drawpixelinfo* d
DrawTextBasic(dpi, screenCoords, stringId, ft, { w->colours[2] });
}
static void window_multiplayer_players_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
static void WindowMultiplayerPlayersScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
{
ScreenCoordsXY screenCoords;
screenCoords.y = 0;
@ -680,7 +680,7 @@ static void window_multiplayer_players_scrollpaint(rct_window* w, rct_drawpixeli
#pragma region Groups page
static void window_multiplayer_groups_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowMultiplayerGroupsMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -693,7 +693,7 @@ static void window_multiplayer_groups_mouseup(rct_window* w, rct_widgetindex wid
case WIDX_TAB4:
if (w->page != widgetIndex - WIDX_TAB1)
{
window_multiplayer_set_page(w, widgetIndex - WIDX_TAB1);
WindowMultiplayerSetPage(w, widgetIndex - WIDX_TAB1);
}
break;
case WIDX_ADD_GROUP:
@ -711,12 +711,12 @@ static void window_multiplayer_groups_mouseup(rct_window* w, rct_widgetindex wid
case WIDX_RENAME_GROUP:;
int32_t groupIndex = network_get_group_index(_selectedGroup);
const utf8* groupName = network_get_group_name(groupIndex);
window_text_input_raw_open(w, widgetIndex, STR_GROUP_NAME, STR_ENTER_NEW_NAME_FOR_THIS_GROUP, {}, groupName, 32);
WindowTextInputRawOpen(w, widgetIndex, STR_GROUP_NAME, STR_ENTER_NEW_NAME_FOR_THIS_GROUP, {}, groupName, 32);
break;
}
}
static void window_multiplayer_groups_resize(rct_window* w)
static void WindowMultiplayerGroupsResize(rct_window* w)
{
window_set_resize(w, 320, 200, 320, 500);
@ -727,20 +727,20 @@ static void window_multiplayer_groups_resize(rct_window* w)
w->Invalidate();
}
static void window_multiplayer_groups_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowMultiplayerGroupsMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
switch (widgetIndex)
{
case WIDX_DEFAULT_GROUP_DROPDOWN:
window_multiplayer_groups_show_group_dropdown(w, widget);
WindowMultiplayerGroupsShowGroupDropdown(w, widget);
break;
case WIDX_SELECTED_GROUP_DROPDOWN:
window_multiplayer_groups_show_group_dropdown(w, widget);
WindowMultiplayerGroupsShowGroupDropdown(w, widget);
break;
}
}
static void window_multiplayer_groups_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowMultiplayerGroupsDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
{
if (dropdownIndex == -1)
{
@ -764,13 +764,13 @@ static void window_multiplayer_groups_dropdown(rct_window* w, rct_widgetindex wi
w->Invalidate();
}
static void window_multiplayer_groups_update(rct_window* w)
static void WindowMultiplayerGroupsUpdate(rct_window* w)
{
w->frame_no++;
widget_invalidate(w, WIDX_TAB1 + w->page);
}
static void window_multiplayer_groups_scrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
static void WindowMultiplayerGroupsScrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
{
int32_t i;
@ -791,7 +791,7 @@ static void window_multiplayer_groups_scrollgetsize(rct_window* w, int32_t scrol
}
}
static void window_multiplayer_groups_scrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
static void WindowMultiplayerGroupsScrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
{
int32_t index;
@ -807,7 +807,7 @@ static void window_multiplayer_groups_scrollmousedown(rct_window* w, int32_t scr
GameActions::Execute(&networkModifyGroup);
}
static void window_multiplayer_groups_scrollmouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
static void WindowMultiplayerGroupsScrollmouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
{
int32_t index;
@ -819,7 +819,7 @@ static void window_multiplayer_groups_scrollmouseover(rct_window* w, int32_t scr
w->Invalidate();
}
static void window_multiplayer_groups_text_input(rct_window* w, rct_widgetindex widgetIndex, char* text)
static void WindowMultiplayerGroupsTextInput(rct_window* w, rct_widgetindex widgetIndex, char* text)
{
if (widgetIndex != WIDX_RENAME_GROUP)
return;
@ -831,10 +831,10 @@ static void window_multiplayer_groups_text_input(rct_window* w, rct_widgetindex
GameActions::Execute(&networkModifyGroup);
}
static void window_multiplayer_groups_invalidate(rct_window* w)
static void WindowMultiplayerGroupsInvalidate(rct_window* w)
{
window_multiplayer_set_pressed_tab(w);
window_multiplayer_anchor_border_widgets(w);
WindowMultiplayerSetPressedTab(w);
WindowMultiplayerAnchorBorderWidgets(w);
window_multiplayer_groups_widgets[WIDX_PERMISSIONS_LIST].right = w->width - 4;
window_multiplayer_groups_widgets[WIDX_PERMISSIONS_LIST].bottom = w->height - 0x0F;
window_align_tabs(w, WIDX_TAB1, WIDX_TAB4);
@ -846,12 +846,12 @@ static void window_multiplayer_groups_invalidate(rct_window* w)
}
}
static void window_multiplayer_groups_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowMultiplayerGroupsPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
thread_local std::string buffer;
WindowDrawWidgets(w, dpi);
window_multiplayer_draw_tab_images(w, dpi);
WindowMultiplayerDrawTabImages(w, dpi);
rct_widget* widget = &window_multiplayer_groups_widgets[WIDX_DEFAULT_GROUP];
int32_t group = network_get_group_index(network_get_default_group());
@ -893,7 +893,7 @@ static void window_multiplayer_groups_paint(rct_window* w, rct_drawpixelinfo* dp
}
}
static void window_multiplayer_groups_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
static void WindowMultiplayerGroupsScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
{
auto screenCoords = ScreenCoordsXY{ 0, 0 };
@ -938,7 +938,7 @@ static void window_multiplayer_groups_scrollpaint(rct_window* w, rct_drawpixelin
#pragma region Options page
static void window_multiplayer_options_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowMultiplayerOptionsMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -951,7 +951,7 @@ static void window_multiplayer_options_mouseup(rct_window* w, rct_widgetindex wi
case WIDX_TAB4:
if (w->page != widgetIndex - WIDX_TAB1)
{
window_multiplayer_set_page(w, widgetIndex - WIDX_TAB1);
WindowMultiplayerSetPage(w, widgetIndex - WIDX_TAB1);
}
break;
case WIDX_LOG_CHAT_CHECKBOX:
@ -969,21 +969,21 @@ static void window_multiplayer_options_mouseup(rct_window* w, rct_widgetindex wi
}
}
static void window_multiplayer_options_resize(rct_window* w)
static void WindowMultiplayerOptionsResize(rct_window* w)
{
window_set_resize(w, 300, 100, 300, 100);
}
static void window_multiplayer_options_update(rct_window* w)
static void WindowMultiplayerOptionsUpdate(rct_window* w)
{
w->frame_no++;
widget_invalidate(w, WIDX_TAB1 + w->page);
}
static void window_multiplayer_options_invalidate(rct_window* w)
static void WindowMultiplayerOptionsInvalidate(rct_window* w)
{
window_multiplayer_set_pressed_tab(w);
window_multiplayer_anchor_border_widgets(w);
WindowMultiplayerSetPressedTab(w);
WindowMultiplayerAnchorBorderWidgets(w);
window_align_tabs(w, WIDX_TAB1, WIDX_TAB4);
if (network_get_mode() == NETWORK_MODE_CLIENT)
@ -996,15 +996,15 @@ static void window_multiplayer_options_invalidate(rct_window* w)
WidgetSetCheckboxValue(w, WIDX_KNOWN_KEYS_ONLY_CHECKBOX, gConfigNetwork.known_keys_only);
}
static void window_multiplayer_options_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowMultiplayerOptionsPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_multiplayer_draw_tab_images(w, dpi);
WindowMultiplayerDrawTabImages(w, dpi);
}
#pragma endregion
static void window_multiplayer_draw_tab_image(rct_window* w, rct_drawpixelinfo* dpi, int32_t page, int32_t spriteIndex)
static void WindowMultiplayerDrawTabImage(rct_window* w, rct_drawpixelinfo* dpi, int32_t page, int32_t spriteIndex)
{
rct_widgetindex widgetIndex = WIDX_TAB1 + page;
@ -1026,10 +1026,10 @@ static void window_multiplayer_draw_tab_image(rct_window* w, rct_drawpixelinfo*
}
}
static void window_multiplayer_draw_tab_images(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowMultiplayerDrawTabImages(rct_window* w, rct_drawpixelinfo* dpi)
{
window_multiplayer_draw_tab_image(w, dpi, WINDOW_MULTIPLAYER_PAGE_INFORMATION, SPR_TAB_KIOSKS_AND_FACILITIES_0);
window_multiplayer_draw_tab_image(w, dpi, WINDOW_MULTIPLAYER_PAGE_PLAYERS, SPR_TAB_GUESTS_0);
window_multiplayer_draw_tab_image(w, dpi, WINDOW_MULTIPLAYER_PAGE_GROUPS, SPR_TAB_STAFF_OPTIONS_0);
window_multiplayer_draw_tab_image(w, dpi, WINDOW_MULTIPLAYER_PAGE_OPTIONS, SPR_TAB_GEARS_0);
WindowMultiplayerDrawTabImage(w, dpi, WINDOW_MULTIPLAYER_PAGE_INFORMATION, SPR_TAB_KIOSKS_AND_FACILITIES_0);
WindowMultiplayerDrawTabImage(w, dpi, WINDOW_MULTIPLAYER_PAGE_PLAYERS, SPR_TAB_GUESTS_0);
WindowMultiplayerDrawTabImage(w, dpi, WINDOW_MULTIPLAYER_PAGE_GROUPS, SPR_TAB_STAFF_OPTIONS_0);
WindowMultiplayerDrawTabImage(w, dpi, WINDOW_MULTIPLAYER_PAGE_OPTIONS, SPR_TAB_GEARS_0);
}

44
src/openrct2-ui/windows/NetworkStatus.cpp
View File

@ -33,27 +33,27 @@ static rct_widget window_network_status_widgets[] = {
static char window_network_status_text[1024];
static void window_network_status_onclose(rct_window *w);
static void window_network_status_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_network_status_update(rct_window *w);
static void window_network_status_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void window_network_status_invalidate(rct_window *w);
static void window_network_status_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowNetworkStatusOnclose(rct_window *w);
static void WindowNetworkStatusMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowNetworkStatusUpdate(rct_window *w);
static void WindowNetworkStatusTextinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void WindowNetworkStatusInvalidate(rct_window *w);
static void WindowNetworkStatusPaint(rct_window *w, rct_drawpixelinfo *dpi);
static rct_window_event_list window_network_status_events([](auto& events)
{
events.close = &window_network_status_onclose;
events.mouse_up = &window_network_status_mouseup;
events.update = &window_network_status_update;
events.text_input = &window_network_status_textinput;
events.invalidate = &window_network_status_invalidate;
events.paint = &window_network_status_paint;
events.close = &WindowNetworkStatusOnclose;
events.mouse_up = &WindowNetworkStatusMouseup;
events.update = &WindowNetworkStatusUpdate;
events.text_input = &WindowNetworkStatusTextinput;
events.invalidate = &WindowNetworkStatusInvalidate;
events.paint = &WindowNetworkStatusPaint;
});
// clang-format on
static close_callback _onClose = nullptr;
rct_window* window_network_status_open(const char* text, close_callback onClose)
rct_window* WindowNetworkStatusOpen(const char* text, close_callback onClose)
{
_onClose = onClose;
safe_strcpy(window_network_status_text, text, sizeof(window_network_status_text));
@ -82,25 +82,25 @@ rct_window* window_network_status_open(const char* text, close_callback onClose)
return window;
}
void window_network_status_close()
void WindowNetworkStatusClose()
{
_onClose = nullptr;
window_close_by_class(WC_NETWORK_STATUS);
}
rct_window* window_network_status_open_password()
rct_window* WindowNetworkStatusOpenPassword()
{
rct_window* window;
window = window_bring_to_front_by_class(WC_NETWORK_STATUS);
if (window == nullptr)
return nullptr;
window_text_input_raw_open(window, WIDX_PASSWORD, STR_PASSWORD_REQUIRED, STR_PASSWORD_REQUIRED_DESC, {}, _password, 32);
WindowTextInputRawOpen(window, WIDX_PASSWORD, STR_PASSWORD_REQUIRED, STR_PASSWORD_REQUIRED_DESC, {}, _password, 32);
return window;
}
static void window_network_status_onclose(rct_window* w)
static void WindowNetworkStatusOnclose(rct_window* w)
{
if (_onClose != nullptr)
{
@ -108,7 +108,7 @@ static void window_network_status_onclose(rct_window* w)
}
}
static void window_network_status_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowNetworkStatusMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -118,12 +118,12 @@ static void window_network_status_mouseup(rct_window* w, rct_widgetindex widgetI
}
}
static void window_network_status_update(rct_window* w)
static void WindowNetworkStatusUpdate(rct_window* w)
{
widget_invalidate(w, WIDX_BACKGROUND);
}
static void window_network_status_textinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
static void WindowNetworkStatusTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
{
_password[0] = '\0';
switch (widgetIndex)
@ -143,7 +143,7 @@ static void window_network_status_textinput(rct_window* w, rct_widgetindex widge
}
}
static void window_network_status_invalidate(rct_window* w)
static void WindowNetworkStatusInvalidate(rct_window* w)
{
window_network_status_widgets[WIDX_BACKGROUND].right = w->width - 1;
window_network_status_widgets[WIDX_BACKGROUND].bottom = w->height - 1;
@ -152,7 +152,7 @@ static void window_network_status_invalidate(rct_window* w)
window_network_status_widgets[WIDX_CLOSE].right = w->width - 2 - 0x0B + 0x0A;
}
static void window_network_status_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowNetworkStatusPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);

2
src/openrct2-ui/windows/NewCampaign.cpp
View File

@ -370,7 +370,7 @@ public:
}
};
rct_window* window_new_campaign_open(int16_t campaignType)
rct_window* WindowNewCampaignOpen(int16_t campaignType)
{
auto w = static_cast<NewCampaignWindow*>(window_bring_to_front_by_class(WC_NEW_CAMPAIGN));
if (w != nullptr)

164
src/openrct2-ui/windows/NewRide.cpp
View File

@ -211,29 +211,29 @@ static rct_widget window_new_ride_widgets[] = {
#pragma region Events
static void window_new_ride_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_new_ride_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget);
static void window_new_ride_update(rct_window *w);
static void window_new_ride_scrollgetsize(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void window_new_ride_scrollmousedown(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void window_new_ride_scrollmouseover(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void window_new_ride_invalidate(rct_window *w);
static void window_new_ride_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_new_ride_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
static void window_new_ride_list_vehicles_for(uint8_t rideType, const rct_ride_entry* rideEntry, char* buffer, size_t bufferLen);
static void WindowNewRideMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowNewRideMousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget);
static void WindowNewRideUpdate(rct_window *w);
static void WindowNewRideScrollgetsize(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void WindowNewRideScrollmousedown(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowNewRideScrollmouseover(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowNewRideInvalidate(rct_window *w);
static void WindowNewRidePaint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowNewRideScrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
static void WindowNewRideListVehiclesFor(uint8_t rideType, const rct_ride_entry* rideEntry, char* buffer, size_t bufferLen);
// 0x0098E354
static rct_window_event_list window_new_ride_events([](auto& events)
{
events.mouse_up = &window_new_ride_mouseup;
events.mouse_down = &window_new_ride_mousedown;
events.update = &window_new_ride_update;
events.get_scroll_size = &window_new_ride_scrollgetsize;
events.scroll_mousedown = &window_new_ride_scrollmousedown;
events.scroll_mouseover = &window_new_ride_scrollmouseover;
events.invalidate = &window_new_ride_invalidate;
events.paint = &window_new_ride_paint;
events.scroll_paint = &window_new_ride_scrollpaint;
events.mouse_up = &WindowNewRideMouseup;
events.mouse_down = &WindowNewRideMousedown;
events.update = &WindowNewRideUpdate;
events.get_scroll_size = &WindowNewRideScrollgetsize;
events.scroll_mousedown = &WindowNewRideScrollmousedown;
events.scroll_mouseover = &WindowNewRideScrollmouseover;
events.invalidate = &WindowNewRideInvalidate;
events.paint = &WindowNewRidePaint;
events.scroll_paint = &WindowNewRideScrollpaint;
});
#pragma endregion
@ -256,13 +256,13 @@ static constexpr const int32_t window_new_ride_tab_animation_divisor[] = {
4, 8, 2, 4, 4, 4, 2,
};
static void window_new_ride_set_page(rct_window* w, int32_t page);
static void window_new_ride_refresh_widget_sizing(rct_window* w);
static RideSelection window_new_ride_scroll_get_ride_list_item_at(rct_window* w, const ScreenCoordsXY& screenCoords);
static void window_new_ride_paint_ride_information(
static void WindowNewRideSetPage(rct_window* w, int32_t page);
static void WindowNewRideRefreshWidgetSizing(rct_window* w);
static RideSelection WindowNewRideScrollGetRideListItemAt(rct_window* w, const ScreenCoordsXY& screenCoords);
static void WindowNewRidePaintRideInformation(
rct_window* w, rct_drawpixelinfo* dpi, RideSelection item, const ScreenCoordsXY& screenPos, int32_t width);
static void window_new_ride_select(rct_window* w);
static RideSelection* window_new_ride_iterate_over_ride_type(uint8_t rideType, RideSelection* nextListItem);
static void WindowNewRideSelect(rct_window* w);
static RideSelection* WindowNewRideIterateOverRideType(uint8_t rideType, RideSelection* nextListItem);
static RideSelection _lastTrackDesignCountRideType;
static int32_t _lastTrackDesignCount;
@ -271,7 +271,7 @@ static int32_t _lastTrackDesignCount;
*
* rct2: 0x006ACA58
*/
void window_new_ride_init_vars()
void WindowNewRideInitVars()
{
// If we are in the track designer, default to the Roller Coaster tab
if (gScreenFlags & SCREEN_FLAGS_TRACK_DESIGNER)
@ -299,7 +299,7 @@ void window_new_ride_init_vars()
* Note: When the user has selection by track type enabled, the categories are determined by the track type, not those in the
* rct_ride_entry.
*/
static void window_new_ride_populate_list()
static void WindowNewRidePopulateList()
{
uint8_t currentCategory = _windowNewRideCurrentTab;
RideSelection* nextListItem = _windowNewRideListItems;
@ -314,14 +314,14 @@ static void window_new_ride_populate_list()
if (GetRideTypeDescriptor(rideType).Category != currentCategory)
continue;
nextListItem = window_new_ride_iterate_over_ride_type(rideType, nextListItem);
nextListItem = WindowNewRideIterateOverRideType(rideType, nextListItem);
}
nextListItem->Type = RIDE_TYPE_NULL;
nextListItem->EntryIndex = OBJECT_ENTRY_INDEX_NULL;
}
static RideSelection* window_new_ride_iterate_over_ride_type(uint8_t rideType, RideSelection* nextListItem)
static RideSelection* WindowNewRideIterateOverRideType(uint8_t rideType, RideSelection* nextListItem)
{
bool buttonForRideTypeCreated = false;
bool allowDrawingOverLastButton = false;
@ -386,7 +386,7 @@ static RideSelection* window_new_ride_iterate_over_ride_type(uint8_t rideType, R
*
* rct2: 0x006B7220
*/
static void window_new_ride_scroll_to_focused_ride(rct_window* w)
static void WindowNewRideScrollToFocusedRide(rct_window* w)
{
int32_t scrollWidth = 0;
int32_t scrollHeight = 0;
@ -421,7 +421,7 @@ static void window_new_ride_scroll_to_focused_ride(rct_window* w)
*
* rct2: 0x006B3CFF
*/
rct_window* window_new_ride_open()
rct_window* WindowNewRideOpen()
{
rct_window* w;
@ -438,7 +438,7 @@ rct_window* window_new_ride_open()
w->enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_TAB_1) | (1ULL << WIDX_TAB_2) | (1ULL << WIDX_TAB_3)
| (1ULL << WIDX_TAB_4) | (1ULL << WIDX_TAB_5) | (1ULL << WIDX_TAB_6) | (1ULL << WIDX_TAB_7)
| (1ULL << WIDX_LAST_DEVELOPMENT_BUTTON) | (1ULL << WIDX_RESEARCH_FUNDING_BUTTON);
window_new_ride_populate_list();
WindowNewRidePopulateList();
WindowInitScrollWidgets(w);
w->frame_no = 0;
@ -450,22 +450,22 @@ rct_window* window_new_ride_open()
w->new_ride.HighlightedRide = _windowNewRideListItems[0];
w->width = 1;
window_new_ride_refresh_widget_sizing(w);
WindowNewRideRefreshWidgetSizing(w);
if (_windowNewRideCurrentTab != WINDOW_NEW_RIDE_PAGE_RESEARCH)
{
window_new_ride_scroll_to_focused_ride(w);
WindowNewRideScrollToFocusedRide(w);
}
return w;
}
rct_window* window_new_ride_open_research()
rct_window* WindowNewRideOpenResearch()
{
rct_window* w;
w = window_new_ride_open();
window_new_ride_set_page(w, WINDOW_NEW_RIDE_PAGE_RESEARCH);
w = WindowNewRideOpen();
WindowNewRideSetPage(w, WINDOW_NEW_RIDE_PAGE_RESEARCH);
return w;
}
@ -473,7 +473,7 @@ rct_window* window_new_ride_open_research()
*
* rct2: 0x006B3EBA
*/
void window_new_ride_focus(RideSelection rideItem)
void WindowNewRideFocus(RideSelection rideItem)
{
rct_window* w;
rct_ride_entry* rideEntry;
@ -487,7 +487,7 @@ void window_new_ride_focus(RideSelection rideItem)
rideEntry = get_ride_entry(rideItem.EntryIndex);
uint8_t rideTypeIndex = ride_entry_get_first_non_null_ride_type(rideEntry);
window_new_ride_set_page(w, GetRideTypeDescriptor(rideTypeIndex).Category);
WindowNewRideSetPage(w, GetRideTypeDescriptor(rideTypeIndex).Category);
for (RideSelection* listItem = _windowNewRideListItems; listItem->Type != RIDE_TYPE_NULL; listItem++)
{
@ -495,7 +495,7 @@ void window_new_ride_focus(RideSelection rideItem)
{
_windowNewRideHighlightedItem[0] = rideItem;
w->new_ride.HighlightedRide = rideItem;
window_new_ride_scroll_to_focused_ride(w);
WindowNewRideScrollToFocusedRide(w);
entryFound = true;
break;
}
@ -511,20 +511,20 @@ void window_new_ride_focus(RideSelection rideItem)
{
_windowNewRideHighlightedItem[0] = rideItem;
w->new_ride.HighlightedRide = rideItem;
window_new_ride_scroll_to_focused_ride(w);
WindowNewRideScrollToFocusedRide(w);
break;
}
}
}
}
static void window_new_ride_set_page(rct_window* w, int32_t page)
static void WindowNewRideSetPage(rct_window* w, int32_t page)
{
_windowNewRideCurrentTab = page;
w->frame_no = 0;
w->new_ride.HighlightedRide = { RIDE_TYPE_NULL, OBJECT_ENTRY_INDEX_NULL };
w->new_ride.selected_ride_countdown = std::numeric_limits<uint16_t>::max();
window_new_ride_populate_list();
WindowNewRidePopulateList();
if (page < WINDOW_NEW_RIDE_PAGE_RESEARCH)
{
w->new_ride.HighlightedRide = _windowNewRideHighlightedItem[page];
@ -532,12 +532,12 @@ static void window_new_ride_set_page(rct_window* w, int32_t page)
w->new_ride.HighlightedRide = _windowNewRideListItems[0];
}
window_new_ride_refresh_widget_sizing(w);
WindowNewRideRefreshWidgetSizing(w);
w->Invalidate();
if (page < WINDOW_NEW_RIDE_PAGE_RESEARCH)
{
window_new_ride_scroll_to_focused_ride(w);
WindowNewRideScrollToFocusedRide(w);
}
}
@ -545,7 +545,7 @@ static void window_new_ride_set_page(rct_window* w, int32_t page)
*
* rct2: 0x006B3DF1
*/
static void window_new_ride_refresh_widget_sizing(rct_window* w)
static void WindowNewRideRefreshWidgetSizing(rct_window* w)
{
int32_t width, height;
@ -596,7 +596,7 @@ static void window_new_ride_refresh_widget_sizing(rct_window* w)
WindowInitScrollWidgets(w);
}
static void window_new_ride_set_pressed_tab(rct_window* w)
static void WindowNewRideSetPressedTab(rct_window* w)
{
int32_t i;
for (i = 0; i < WINDOW_NEW_RIDE_PAGE_COUNT; i++)
@ -608,7 +608,7 @@ static constexpr const int32_t ThrillRidesTabAnimationSequence[] = {
5, 6, 5, 4, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 0, 0, 0,
};
static void window_new_ride_draw_tab_image(rct_drawpixelinfo* dpi, rct_window* w, int32_t page, int32_t spriteIndex)
static void WindowNewRideDrawTabImage(rct_drawpixelinfo* dpi, rct_window* w, int32_t page, int32_t spriteIndex)
{
rct_widgetindex widgetIndex = WIDX_TAB_1 + page;
@ -626,23 +626,22 @@ static void window_new_ride_draw_tab_image(rct_drawpixelinfo* dpi, rct_window* w
}
}
static void window_new_ride_draw_tab_images(rct_drawpixelinfo* dpi, rct_window* w)
static void WindowNewRideDrawTabImages(rct_drawpixelinfo* dpi, rct_window* w)
{
window_new_ride_draw_tab_image(dpi, w, WINDOW_NEW_RIDE_PAGE_TRANSPORT, IMAGE_TYPE_REMAP | SPR_TAB_RIDES_TRANSPORT_0);
window_new_ride_draw_tab_image(dpi, w, WINDOW_NEW_RIDE_PAGE_GENTLE, SPR_TAB_RIDES_GENTLE_0);
window_new_ride_draw_tab_image(
dpi, w, WINDOW_NEW_RIDE_PAGE_ROLLER_COASTER, IMAGE_TYPE_REMAP | SPR_TAB_RIDES_ROLLER_COASTERS_0);
window_new_ride_draw_tab_image(dpi, w, WINDOW_NEW_RIDE_PAGE_THRILL, SPR_TAB_RIDES_THRILL_0);
window_new_ride_draw_tab_image(dpi, w, WINDOW_NEW_RIDE_PAGE_WATER, SPR_TAB_RIDES_WATER_0);
window_new_ride_draw_tab_image(dpi, w, WINDOW_NEW_RIDE_PAGE_SHOP, SPR_TAB_RIDES_SHOP_0);
window_new_ride_draw_tab_image(dpi, w, WINDOW_NEW_RIDE_PAGE_RESEARCH, SPR_TAB_FINANCES_RESEARCH_0);
WindowNewRideDrawTabImage(dpi, w, WINDOW_NEW_RIDE_PAGE_TRANSPORT, IMAGE_TYPE_REMAP | SPR_TAB_RIDES_TRANSPORT_0);
WindowNewRideDrawTabImage(dpi, w, WINDOW_NEW_RIDE_PAGE_GENTLE, SPR_TAB_RIDES_GENTLE_0);
WindowNewRideDrawTabImage(dpi, w, WINDOW_NEW_RIDE_PAGE_ROLLER_COASTER, IMAGE_TYPE_REMAP | SPR_TAB_RIDES_ROLLER_COASTERS_0);
WindowNewRideDrawTabImage(dpi, w, WINDOW_NEW_RIDE_PAGE_THRILL, SPR_TAB_RIDES_THRILL_0);
WindowNewRideDrawTabImage(dpi, w, WINDOW_NEW_RIDE_PAGE_WATER, SPR_TAB_RIDES_WATER_0);
WindowNewRideDrawTabImage(dpi, w, WINDOW_NEW_RIDE_PAGE_SHOP, SPR_TAB_RIDES_SHOP_0);
WindowNewRideDrawTabImage(dpi, w, WINDOW_NEW_RIDE_PAGE_RESEARCH, SPR_TAB_FINANCES_RESEARCH_0);
}
/**
*
* rct2: 0x006B6B38
*/
static void window_new_ride_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowNewRideMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -662,17 +661,17 @@ static void window_new_ride_mouseup(rct_window* w, rct_widgetindex widgetIndex)
*
* rct2: 0x006B6B4F
*/
static void window_new_ride_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowNewRideMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
if (widgetIndex >= WIDX_TAB_1 && widgetIndex <= WIDX_TAB_7)
window_new_ride_set_page(w, widgetIndex - WIDX_TAB_1);
WindowNewRideSetPage(w, widgetIndex - WIDX_TAB_1);
}
/**
*
* rct2: 0x006B6CE7
*/
static void window_new_ride_update(rct_window* w)
static void WindowNewRideUpdate(rct_window* w)
{
w->frame_no++;
if (w->frame_no >= window_new_ride_tab_animation_loops[_windowNewRideCurrentTab])
@ -681,9 +680,9 @@ static void window_new_ride_update(rct_window* w)
widget_invalidate(w, WIDX_TAB_1 + _windowNewRideCurrentTab);
if (w->new_ride.SelectedRide.Type != RIDE_TYPE_NULL && w->new_ride.selected_ride_countdown-- == 0)
window_new_ride_select(w);
WindowNewRideSelect(w);
window_new_ride_populate_list();
WindowNewRidePopulateList();
// widget_invalidate(w, WIDX_RIDE_LIST);
}
@ -691,7 +690,7 @@ static void window_new_ride_update(rct_window* w)
*
* rct2: 0x006B6BC9
*/
static void window_new_ride_scrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
static void WindowNewRideScrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
{
RideSelection* listItem = _windowNewRideListItems;
@ -708,11 +707,11 @@ static void window_new_ride_scrollgetsize(rct_window* w, int32_t scrollIndex, in
*
* rct2: 0x006B6C89
*/
static void window_new_ride_scrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
static void WindowNewRideScrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
{
RideSelection item;
item = window_new_ride_scroll_get_ride_list_item_at(w, screenCoords);
item = WindowNewRideScrollGetRideListItemAt(w, screenCoords);
if (item.Type == RIDE_TYPE_NULL && item.EntryIndex == OBJECT_ENTRY_INDEX_NULL)
return;
@ -728,14 +727,14 @@ static void window_new_ride_scrollmousedown(rct_window* w, int32_t scrollIndex,
*
* rct2: 0x006B6C51
*/
static void window_new_ride_scrollmouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
static void WindowNewRideScrollmouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
{
RideSelection item;
if (w->new_ride.SelectedRide.Type != RIDE_TYPE_NULL)
return;
item = window_new_ride_scroll_get_ride_list_item_at(w, screenCoords);
item = WindowNewRideScrollGetRideListItemAt(w, screenCoords);
if (w->new_ride.HighlightedRide == item)
return;
@ -749,9 +748,9 @@ static void window_new_ride_scrollmouseover(rct_window* w, int32_t scrollIndex,
*
* rct2: 0x006B6819
*/
static void window_new_ride_invalidate(rct_window* w)
static void WindowNewRideInvalidate(rct_window* w)
{
window_new_ride_set_pressed_tab(w);
WindowNewRideSetPressedTab(w);
window_new_ride_widgets[WIDX_TITLE].text = window_new_ride_titles[_windowNewRideCurrentTab];
window_new_ride_widgets[WIDX_TAB_7].type = WindowWidgetType::Tab;
@ -775,22 +774,21 @@ static void window_new_ride_invalidate(rct_window* w)
*
* rct2: 0x006B689B
*/
static void window_new_ride_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowNewRidePaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_new_ride_draw_tab_images(dpi, w);
WindowNewRideDrawTabImages(dpi, w);
if (_windowNewRideCurrentTab != WINDOW_NEW_RIDE_PAGE_RESEARCH)
{
RideSelection item;
item = w->new_ride.HighlightedRide;
if (item.Type != RIDE_TYPE_NULL || item.EntryIndex != OBJECT_ENTRY_INDEX_NULL)
window_new_ride_paint_ride_information(
w, dpi, item, w->windowPos + ScreenCoordsXY{ 3, w->height - 64 }, w->width - 6);
WindowNewRidePaintRideInformation(w, dpi, item, w->windowPos + ScreenCoordsXY{ 3, w->height - 64 }, w->width - 6);
}
else
{
window_research_development_page_paint(w, dpi, WIDX_CURRENTLY_IN_DEVELOPMENT_GROUP);
WindowResearchDevelopmentPagePaint(w, dpi, WIDX_CURRENTLY_IN_DEVELOPMENT_GROUP);
}
}
@ -798,7 +796,7 @@ static void window_new_ride_paint(rct_window* w, rct_drawpixelinfo* dpi)
*
* rct2: 0x006B6ABF
*/
static void window_new_ride_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
static void WindowNewRideScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
{
if (_windowNewRideCurrentTab == WINDOW_NEW_RIDE_PAGE_RESEARCH)
return;
@ -849,7 +847,7 @@ static void window_new_ride_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, i
*
* rct2: 0x006B6D3C
*/
static RideSelection window_new_ride_scroll_get_ride_list_item_at(rct_window* w, const ScreenCoordsXY& screenCoords)
static RideSelection WindowNewRideScrollGetRideListItemAt(rct_window* w, const ScreenCoordsXY& screenCoords)
{
RideSelection result;
result.Type = RIDE_TYPE_NULL;
@ -876,7 +874,7 @@ static RideSelection window_new_ride_scroll_get_ride_list_item_at(rct_window* w,
return result;
}
static int32_t get_num_track_designs(RideSelection item)
static int32_t GetNumTrackDesigns(RideSelection item)
{
std::string entryName;
@ -896,7 +894,7 @@ static int32_t get_num_track_designs(RideSelection item)
*
* rct2: 0x006B701C
*/
static void window_new_ride_paint_ride_information(
static void WindowNewRidePaintRideInformation(
rct_window* w, rct_drawpixelinfo* dpi, RideSelection item, const ScreenCoordsXY& screenPos, int32_t width)
{
rct_ride_entry* rideEntry = get_ride_entry(item.EntryIndex);
@ -910,7 +908,7 @@ static void window_new_ride_paint_ride_information(
DrawTextWrapped(dpi, screenPos, width, STR_NEW_RIDE_NAME_AND_DESCRIPTION, ft);
char availabilityString[AVAILABILITY_STRING_SIZE];
window_new_ride_list_vehicles_for(item.Type, rideEntry, availabilityString, sizeof(availabilityString));
WindowNewRideListVehiclesFor(item.Type, rideEntry, availabilityString, sizeof(availabilityString));
if (availabilityString[0] != 0)
{
@ -924,7 +922,7 @@ static void window_new_ride_paint_ride_information(
if (item.Type != _lastTrackDesignCountRideType.Type || item.EntryIndex != _lastTrackDesignCountRideType.EntryIndex)
{
_lastTrackDesignCountRideType = item;
_lastTrackDesignCount = get_num_track_designs(item);
_lastTrackDesignCount = GetNumTrackDesigns(item);
}
ft.Add<int32_t>(_lastTrackDesignCount);
@ -969,7 +967,7 @@ static void window_new_ride_paint_ride_information(
*
* rct2: 0x006B6B78
*/
static void window_new_ride_select(rct_window* w)
static void WindowNewRideSelect(rct_window* w)
{
RideSelection item = w->new_ride.SelectedRide;
if (item.Type == RIDE_TYPE_NULL)
@ -990,7 +988,7 @@ static void window_new_ride_select(rct_window* w)
ride_construct_new(item);
}
static void window_new_ride_list_vehicles_for(uint8_t rideType, const rct_ride_entry* rideEntry, char* buffer, size_t bufferLen)
static void WindowNewRideListVehiclesFor(uint8_t rideType, const rct_ride_entry* rideEntry, char* buffer, size_t bufferLen)
{
std::fill_n(buffer, bufferLen, 0);
if (GetRideTypeDescriptor(rideType).HasFlag(RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY))

2
src/openrct2-ui/windows/News.cpp
View File

@ -307,7 +307,7 @@ public:
}
};
rct_window* window_news_open()
rct_window* WindowNewsOpen()
{
return WindowFocusOrCreate<NewsWindow>(WC_RECENT_NEWS, WW, WH, 0);
}

54
src/openrct2-ui/windows/NewsOptions.cpp
View File

@ -83,25 +83,25 @@ static rct_widget window_news_options_widgets[] = {
WIDGETS_END,
};
static void window_news_options_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_news_options_update(rct_window *w);
static void window_news_options_invalidate(rct_window *w);
static void window_news_options_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowNewsOptionsMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowNewsOptionsUpdate(rct_window *w);
static void WindowNewsOptionsInvalidate(rct_window *w);
static void WindowNewsOptionsPaint(rct_window *w, rct_drawpixelinfo *dpi);
static rct_window_event_list window_news_options_events([](auto& events)
{
events.mouse_up = &window_news_options_mouseup;
events.update = &window_news_options_update;
events.invalidate = &window_news_options_invalidate;
events.paint = &window_news_options_paint;
events.mouse_up = &WindowNewsOptionsMouseup;
events.update = &WindowNewsOptionsUpdate;
events.invalidate = &WindowNewsOptionsInvalidate;
events.paint = &WindowNewsOptionsPaint;
});
// clang-format on
static void window_news_options_set_page(rct_window* w, int32_t page);
static void window_news_options_draw_tab_images(rct_window* w, rct_drawpixelinfo* dpi);
static bool* get_notification_value_ptr(const notification_def* ndef);
static void WindowNewsOptionsSetPage(rct_window* w, int32_t page);
static void WindowNewsOptionsDrawTabImages(rct_window* w, rct_drawpixelinfo* dpi);
static bool* GetNotificationValuePtr(const notification_def* ndef);
rct_window* window_news_options_open()
rct_window* WindowNewsOptionsOpen()
{
rct_window* window;
@ -122,7 +122,7 @@ rct_window* window_news_options_open()
return window;
}
static void window_news_options_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowNewsOptionsMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -132,7 +132,7 @@ static void window_news_options_mouseup(rct_window* w, rct_widgetindex widgetInd
case WIDX_TAB_PARK:
case WIDX_TAB_RIDE:
case WIDX_TAB_GUEST:
window_news_options_set_page(w, widgetIndex - WIDX_TAB_PARK);
WindowNewsOptionsSetPage(w, widgetIndex - WIDX_TAB_PARK);
break;
default:
{
@ -149,7 +149,7 @@ static void window_news_options_mouseup(rct_window* w, rct_widgetindex widgetInd
if (matchIndex == checkBoxIndex)
{
// Toggle value
bool* configValue = get_notification_value_ptr(ndef);
bool* configValue = GetNotificationValuePtr(ndef);
*configValue = !(*configValue);
config_save_default();
@ -165,13 +165,13 @@ static void window_news_options_mouseup(rct_window* w, rct_widgetindex widgetInd
}
}
static void window_news_options_update(rct_window* w)
static void WindowNewsOptionsUpdate(rct_window* w)
{
w->frame_no++;
widget_invalidate(w, WIDX_TAB_PARK + w->page);
}
static void window_news_options_invalidate(rct_window* w)
static void WindowNewsOptionsInvalidate(rct_window* w)
{
// Set pressed tab
w->pressed_widgets &= ~(1ULL << WIDX_TAB_PARK);
@ -200,7 +200,7 @@ static void window_news_options_invalidate(rct_window* w)
checkboxWidget->bottom = checkboxWidget->top + LIST_ROW_HEIGHT + 3;
checkboxWidget->text = ndef->caption;
const bool* configValue = get_notification_value_ptr(ndef);
const bool* configValue = GetNotificationValuePtr(ndef);
WidgetSetCheckboxValue(w, checkboxWidgetIndex, *configValue);
checkboxWidgetIndex++;
@ -231,13 +231,13 @@ static void window_news_options_invalidate(rct_window* w)
}
}
static void window_news_options_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowNewsOptionsPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_news_options_draw_tab_images(w, dpi);
WindowNewsOptionsDrawTabImages(w, dpi);
}
static void window_news_options_set_page(rct_window* w, int32_t page)
static void WindowNewsOptionsSetPage(rct_window* w, int32_t page)
{
if (w->page != page)
{
@ -258,7 +258,7 @@ const int32_t window_news_option_tab_animation_frames[] = {
8,
};
static void window_news_options_draw_tab_image(rct_window* w, rct_drawpixelinfo* dpi, int32_t page, int32_t spriteIndex)
static void WindowNewsOptionsDrawTabImage(rct_window* w, rct_drawpixelinfo* dpi, int32_t page, int32_t spriteIndex)
{
rct_widgetindex widgetIndex = WIDX_TAB_PARK + page;
@ -279,14 +279,14 @@ static void window_news_options_draw_tab_image(rct_window* w, rct_drawpixelinfo*
}
}
static void window_news_options_draw_tab_images(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowNewsOptionsDrawTabImages(rct_window* w, rct_drawpixelinfo* dpi)
{
window_news_options_draw_tab_image(w, dpi, NOTIFICATION_CATEGORY_PARK, SPR_TAB_PARK);
window_news_options_draw_tab_image(w, dpi, NOTIFICATION_CATEGORY_RIDE, SPR_TAB_RIDE_0);
window_news_options_draw_tab_image(w, dpi, NOTIFICATION_CATEGORY_GUEST, SPR_TAB_GUESTS_0);
WindowNewsOptionsDrawTabImage(w, dpi, NOTIFICATION_CATEGORY_PARK, SPR_TAB_PARK);
WindowNewsOptionsDrawTabImage(w, dpi, NOTIFICATION_CATEGORY_RIDE, SPR_TAB_RIDE_0);
WindowNewsOptionsDrawTabImage(w, dpi, NOTIFICATION_CATEGORY_GUEST, SPR_TAB_GUESTS_0);
}
static bool* get_notification_value_ptr(const notification_def* ndef)
static bool* GetNotificationValuePtr(const notification_def* ndef)
{
bool* configValue = reinterpret_cast<bool*>(reinterpret_cast<size_t>(&gConfigNotifications) + ndef->config_offset);
return configValue;

2
src/openrct2-ui/windows/ObjectLoadError.cpp
View File

@ -562,7 +562,7 @@ public:
}
};
rct_window* window_object_load_error_open(utf8* path, size_t numMissingObjects, const ObjectEntryDescriptor* missingObjects)
rct_window* WindowObjectLoadErrorOpen(utf8* path, size_t numMissingObjects, const ObjectEntryDescriptor* missingObjects)
{
// Check if window is already open
auto* window = window_bring_to_front_by_class(WC_OBJECT_LOAD_ERROR);

4
src/openrct2-ui/windows/Options.cpp
View File

@ -1936,7 +1936,7 @@ private:
this->Invalidate();
break;
case WIDX_TITLE_SEQUENCE_BUTTON:
window_title_editor_open(0);
WindowTitleEditorOpen(0);
break;
case WIDX_SCENARIO_UNLOCKING:
gConfigGeneral.scenario_unlocking_enabled ^= 1;
@ -2441,7 +2441,7 @@ private:
*
* rct2: 0x006BAC5B
*/
rct_window* window_options_open()
rct_window* WindowOptionsOpen()
{
auto* window = window_bring_to_front_by_class(WC_OPTIONS);
if (window == nullptr)

374
src/openrct2-ui/windows/Park.cpp
View File

@ -149,121 +149,121 @@ static rct_widget *window_park_page_widgets[] = {
#pragma region Events
static void window_park_entrance_close(rct_window *w);
static void window_park_entrance_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_park_entrance_resize(rct_window *w);
static void window_park_entrance_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget);
static void window_park_entrance_dropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void window_park_entrance_update(rct_window *w);
static void window_park_entrance_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void window_park_entrance_invalidate(rct_window *w);
static void window_park_entrance_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowParkEntranceClose(rct_window *w);
static void WindowParkEntranceMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowParkEntranceResize(rct_window *w);
static void WindowParkEntranceMousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowParkEntranceDropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowParkEntranceUpdate(rct_window *w);
static void WindowParkEntranceTextinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void WindowParkEntranceInvalidate(rct_window *w);
static void WindowParkEntrancePaint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_park_rating_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_park_rating_resize(rct_window *w);
static void window_park_rating_update(rct_window *w);
static void window_park_rating_invalidate(rct_window *w);
static void window_park_rating_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowParkRatingMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowParkRatingResize(rct_window *w);
static void WindowParkRatingUpdate(rct_window *w);
static void WindowParkRatingInvalidate(rct_window *w);
static void WindowParkRatingPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_park_guests_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_park_guests_resize(rct_window *w);
static void window_park_guests_update(rct_window *w);
static void window_park_guests_invalidate(rct_window *w);
static void window_park_guests_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowParkGuestsMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowParkGuestsResize(rct_window *w);
static void WindowParkGuestsUpdate(rct_window *w);
static void WindowParkGuestsInvalidate(rct_window *w);
static void WindowParkGuestsPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_park_price_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_park_price_resize(rct_window *w);
static void window_park_price_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget);
static void window_park_price_update(rct_window *w);
static void window_park_price_invalidate(rct_window *w);
static void window_park_price_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowParkPriceMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowParkPriceResize(rct_window *w);
static void WindowParkPriceMousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowParkPriceUpdate(rct_window *w);
static void WindowParkPriceInvalidate(rct_window *w);
static void WindowParkPricePaint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_park_stats_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_park_stats_resize(rct_window *w);
static void window_park_stats_update(rct_window *w);
static void window_park_stats_invalidate(rct_window *w);
static void window_park_stats_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowParkStatsMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowParkStatsResize(rct_window *w);
static void WindowParkStatsUpdate(rct_window *w);
static void WindowParkStatsInvalidate(rct_window *w);
static void WindowParkStatsPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_park_objective_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_park_objective_resize(rct_window *w);
static void window_park_objective_update(rct_window *w);
static void window_park_objective_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void window_park_objective_invalidate(rct_window *w);
static void window_park_objective_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowParkObjectiveMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowParkObjectiveResize(rct_window *w);
static void WindowParkObjectiveUpdate(rct_window *w);
static void WindowParkObjectiveTextinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void WindowParkObjectiveInvalidate(rct_window *w);
static void WindowParkObjectivePaint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_park_awards_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_park_awards_resize(rct_window *w);
static void window_park_awards_update(rct_window *w);
static void window_park_awards_invalidate(rct_window *w);
static void window_park_awards_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowParkAwardsMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowParkAwardsResize(rct_window *w);
static void WindowParkAwardsUpdate(rct_window *w);
static void WindowParkAwardsInvalidate(rct_window *w);
static void WindowParkAwardsPaint(rct_window *w, rct_drawpixelinfo *dpi);
static rct_window_event_list window_park_entrance_events([](auto& events)
{
events.close = &window_park_entrance_close;
events.mouse_up = &window_park_entrance_mouseup;
events.resize = &window_park_entrance_resize;
events.mouse_down = &window_park_entrance_mousedown;
events.dropdown = &window_park_entrance_dropdown;
events.update = &window_park_entrance_update;
events.text_input = &window_park_entrance_textinput;
events.invalidate = &window_park_entrance_invalidate;
events.paint = &window_park_entrance_paint;
events.close = &WindowParkEntranceClose;
events.mouse_up = &WindowParkEntranceMouseup;
events.resize = &WindowParkEntranceResize;
events.mouse_down = &WindowParkEntranceMousedown;
events.dropdown = &WindowParkEntranceDropdown;
events.update = &WindowParkEntranceUpdate;
events.text_input = &WindowParkEntranceTextinput;
events.invalidate = &WindowParkEntranceInvalidate;
events.paint = &WindowParkEntrancePaint;
});
static rct_window_event_list window_park_rating_events([](auto& events)
{
events.mouse_up = &window_park_rating_mouseup;
events.resize = &window_park_rating_resize;
events.update = &window_park_rating_update;
events.invalidate = &window_park_rating_invalidate;
events.paint = &window_park_rating_paint;
events.mouse_up = &WindowParkRatingMouseup;
events.resize = &WindowParkRatingResize;
events.update = &WindowParkRatingUpdate;
events.invalidate = &WindowParkRatingInvalidate;
events.paint = &WindowParkRatingPaint;
});
static rct_window_event_list window_park_guests_events([](auto& events)
{
events.mouse_up = &window_park_guests_mouseup;
events.resize = &window_park_guests_resize;
events.update = &window_park_guests_update;
events.invalidate = &window_park_guests_invalidate;
events.paint = &window_park_guests_paint;
events.mouse_up = &WindowParkGuestsMouseup;
events.resize = &WindowParkGuestsResize;
events.update = &WindowParkGuestsUpdate;
events.invalidate = &WindowParkGuestsInvalidate;
events.paint = &WindowParkGuestsPaint;
});
static rct_window_event_list window_park_price_events([](auto& events)
{
events.mouse_up = &window_park_price_mouseup;
events.resize = &window_park_price_resize;
events.mouse_down = &window_park_price_mousedown;
events.update = &window_park_price_update;
events.invalidate = &window_park_price_invalidate;
events.paint = &window_park_price_paint;
events.mouse_up = &WindowParkPriceMouseup;
events.resize = &WindowParkPriceResize;
events.mouse_down = &WindowParkPriceMousedown;
events.update = &WindowParkPriceUpdate;
events.invalidate = &WindowParkPriceInvalidate;
events.paint = &WindowParkPricePaint;
});
static rct_window_event_list window_park_stats_events([](auto& events)
{
events.mouse_up = &window_park_stats_mouseup;
events.resize = &window_park_stats_resize;
events.update = &window_park_stats_update;
events.invalidate = &window_park_stats_invalidate;
events.paint = &window_park_stats_paint;
events.mouse_up = &WindowParkStatsMouseup;
events.resize = &WindowParkStatsResize;
events.update = &WindowParkStatsUpdate;
events.invalidate = &WindowParkStatsInvalidate;
events.paint = &WindowParkStatsPaint;
});
static rct_window_event_list window_park_objective_events([](auto& events)
{
events.mouse_up = &window_park_objective_mouseup;
events.resize = &window_park_objective_resize;
events.update = &window_park_objective_update;
events.text_input = &window_park_objective_textinput;
events.invalidate = &window_park_objective_invalidate;
events.paint = &window_park_objective_paint;
events.mouse_up = &WindowParkObjectiveMouseup;
events.resize = &WindowParkObjectiveResize;
events.update = &WindowParkObjectiveUpdate;
events.text_input = &WindowParkObjectiveTextinput;
events.invalidate = &WindowParkObjectiveInvalidate;
events.paint = &WindowParkObjectivePaint;
});
static rct_window_event_list window_park_awards_events([](auto& events)
{
events.mouse_up = &window_park_awards_mouseup;
events.resize = &window_park_awards_resize;
events.update = &window_park_awards_update;
events.invalidate = &window_park_awards_invalidate;
events.paint = &window_park_awards_paint;
events.mouse_up = &WindowParkAwardsMouseup;
events.resize = &WindowParkAwardsResize;
events.update = &WindowParkAwardsUpdate;
events.invalidate = &WindowParkAwardsInvalidate;
events.paint = &WindowParkAwardsPaint;
});
static rct_window_event_list *window_park_page_events[] = {
@ -395,18 +395,18 @@ static constexpr const window_park_award ParkAwards[] = {
};
// clang-format on
static void window_park_init_viewport(rct_window* w);
static void window_park_set_page(rct_window* w, int32_t page);
static void window_park_anchor_border_widgets(rct_window* w);
static void window_park_set_pressed_tab(rct_window* w);
static void window_park_draw_tab_images(rct_drawpixelinfo* dpi, rct_window* w);
static void window_park_set_disabled_tabs(rct_window* w);
static void WindowParkInitViewport(rct_window* w);
static void WindowParkSetPage(rct_window* w, int32_t page);
static void WindowParkAnchorBorderWidgets(rct_window* w);
static void WindowParkSetPressedTab(rct_window* w);
static void WindowParkDrawTabImages(rct_drawpixelinfo* dpi, rct_window* w);
static void WindowParkSetDisabledTabs(rct_window* w);
/**
*
* rct2: 0x00667F11
*/
static rct_window* window_park_open()
static rct_window* WindowParkOpen()
{
rct_window* w;
@ -419,7 +419,7 @@ static rct_window* window_park_open()
w->list_information_type = std::numeric_limits<uint16_t>::max();
w->numberOfStaff = -1;
w->var_492 = 0;
window_park_set_disabled_tabs(w);
WindowParkSetDisabledTabs(w);
return w;
}
@ -428,13 +428,13 @@ static rct_window* window_park_open()
*
* rct2: 0x00667F8B
*/
static void window_park_set_disabled_tabs(rct_window* w)
static void WindowParkSetDisabledTabs(rct_window* w)
{
// Disable price tab if money is disabled
w->disabled_widgets = (gParkFlags & PARK_FLAGS_NO_MONEY) ? (1ULL << WIDX_TAB_4) : 0;
}
static void window_park_prepare_window_title_text()
static void WindowParkPrepareWindowTitleText()
{
auto& park = OpenRCT2::GetContext()->GetGameState()->GetPark();
auto parkName = park.Name.c_str();
@ -450,14 +450,14 @@ static void window_park_prepare_window_title_text()
*
* rct2: 0x00667C48
*/
rct_window* window_park_entrance_open()
rct_window* WindowParkEntranceOpen()
{
rct_window* window;
window = window_bring_to_front_by_class(WC_PARK_INFORMATION);
if (window == nullptr)
{
window = window_park_open();
window = WindowParkOpen();
}
window->page = WINDOW_PARK_PAGE_ENTRANCE;
@ -467,7 +467,7 @@ rct_window* window_park_entrance_open()
window->event_handlers = &window_park_entrance_events;
window->pressed_widgets = 0;
WindowInitScrollWidgets(window);
window_park_init_viewport(window);
WindowParkInitViewport(window);
return window;
}
@ -476,7 +476,7 @@ rct_window* window_park_entrance_open()
*
* rct2: 0x0066860C
*/
static void window_park_entrance_close(rct_window* w)
static void WindowParkEntranceClose(rct_window* w)
{
if (input_test_flag(INPUT_FLAG_TOOL_ACTIVE))
if (w->classification == gCurrentToolWidget.window_classification && w->number == gCurrentToolWidget.window_number)
@ -487,7 +487,7 @@ static void window_park_entrance_close(rct_window* w)
*
* rct2: 0x0066817C
*/
static void window_park_entrance_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowParkEntranceMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -501,7 +501,7 @@ static void window_park_entrance_mouseup(rct_window* w, rct_widgetindex widgetIn
case WIDX_TAB_5:
case WIDX_TAB_6:
case WIDX_TAB_7:
window_park_set_page(w, widgetIndex - WIDX_TAB_1);
WindowParkSetPage(w, widgetIndex - WIDX_TAB_1);
break;
case WIDX_BUY_LAND_RIGHTS:
context_open_window(WC_LAND_RIGHTS);
@ -512,7 +512,7 @@ static void window_park_entrance_mouseup(rct_window* w, rct_widgetindex widgetIn
case WIDX_RENAME:
{
auto& park = OpenRCT2::GetContext()->GetGameState()->GetPark();
window_text_input_raw_open(
WindowTextInputRawOpen(
w, WIDX_RENAME, STR_PARK_NAME, STR_ENTER_PARK_NAME, {}, park.Name.c_str(), USER_STRING_MAX_LENGTH);
break;
}
@ -529,18 +529,18 @@ static void window_park_entrance_mouseup(rct_window* w, rct_widgetindex widgetIn
*
* rct2: 0x00668637
*/
static void window_park_entrance_resize(rct_window* w)
static void WindowParkEntranceResize(rct_window* w)
{
w->flags |= WF_RESIZABLE;
window_set_resize(w, 230, 174 + 9, 230 * 3, (274 + 9) * 3);
window_park_init_viewport(w);
WindowParkInitViewport(w);
}
/**
*
* rct2: 0x006681BF
*/
static void window_park_entrance_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowParkEntranceMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
if (widgetIndex == WIDX_OPEN_OR_CLOSE)
{
@ -568,7 +568,7 @@ static void window_park_entrance_mousedown(rct_window* w, rct_widgetindex widget
*
* rct2: 0x006682B8
*/
static void window_park_entrance_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowParkEntranceDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
{
if (widgetIndex == WIDX_OPEN_OR_CLOSE)
{
@ -590,7 +590,7 @@ static void window_park_entrance_dropdown(rct_window* w, rct_widgetindex widgetI
*
* rct2: 0x006686B5
*/
static void window_park_entrance_update(rct_window* w)
static void WindowParkEntranceUpdate(rct_window* w)
{
w->frame_no++;
widget_invalidate(w, WIDX_TAB_1);
@ -600,7 +600,7 @@ static void window_park_entrance_update(rct_window* w)
*
* rct2: 0x0066848B
*/
static void window_park_entrance_textinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
static void WindowParkEntranceTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
{
if (widgetIndex == WIDX_RENAME && text != nullptr)
{
@ -613,14 +613,14 @@ static void window_park_entrance_textinput(rct_window* w, rct_widgetindex widget
*
* rct2: 0x00667FDC
*/
static void window_park_entrance_invalidate(rct_window* w)
static void WindowParkEntranceInvalidate(rct_window* w)
{
int32_t i, height;
w->widgets = window_park_page_widgets[w->page];
WindowInitScrollWidgets(w);
window_park_set_pressed_tab(w);
WindowParkSetPressedTab(w);
// Set open / close park button state
{
@ -650,7 +650,7 @@ static void window_park_entrance_invalidate(rct_window* w)
window_park_entrance_widgets[WIDX_BUY_LAND_RIGHTS].type = WindowWidgetType::FlatBtn;
window_align_tabs(w, WIDX_TAB_1, WIDX_TAB_7);
window_park_anchor_border_widgets(w);
WindowParkAnchorBorderWidgets(w);
// Anchor entrance page specific widgets
window_park_entrance_widgets[WIDX_VIEWPORT].right = w->width - 26;
@ -704,12 +704,12 @@ static void window_park_entrance_invalidate(rct_window* w)
*
* rct2: 0x006680D0
*/
static void window_park_entrance_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowParkEntrancePaint(rct_window* w, rct_drawpixelinfo* dpi)
{
rct_widget* labelWidget;
WindowDrawWidgets(w, dpi);
window_park_draw_tab_images(dpi, w);
WindowParkDrawTabImages(dpi, w);
// Draw viewport
if (w->viewport != nullptr)
@ -733,7 +733,7 @@ static void window_park_entrance_paint(rct_window* w, rct_drawpixelinfo* dpi)
*
* rct2: 0x00669B55
*/
static void window_park_init_viewport(rct_window* w)
static void WindowParkInitViewport(rct_window* w)
{
int32_t viewportFlags;
@ -789,14 +789,14 @@ static void window_park_init_viewport(rct_window* w)
*
* rct2: 0x00667CA4
*/
rct_window* window_park_rating_open()
rct_window* WindowParkRatingOpen()
{
rct_window* window;
window = window_bring_to_front_by_class(WC_PARK_INFORMATION);
if (window == nullptr)
{
window = window_park_open();
window = WindowParkOpen();
}
if (input_test_flag(INPUT_FLAG_TOOL_ACTIVE))
@ -820,19 +820,19 @@ rct_window* window_park_rating_open()
*
* rct2: 0x00668A06
*/
static void window_park_rating_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowParkRatingMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
if (widgetIndex == WIDX_CLOSE)
window_close(w);
else if (widgetIndex >= WIDX_TAB_1 && widgetIndex <= WIDX_TAB_7)
window_park_set_page(w, widgetIndex - WIDX_TAB_1);
WindowParkSetPage(w, widgetIndex - WIDX_TAB_1);
}
/**
*
* rct2: 0x00668A36
*/
static void window_park_rating_resize(rct_window* w)
static void WindowParkRatingResize(rct_window* w)
{
window_set_resize(w, 255, 182, 255, 182);
}
@ -841,7 +841,7 @@ static void window_park_rating_resize(rct_window* w)
*
* rct2: 0x00668A21
*/
static void window_park_rating_update(rct_window* w)
static void WindowParkRatingUpdate(rct_window* w)
{
w->frame_no++;
widget_invalidate(w, WIDX_TAB_2);
@ -851,7 +851,7 @@ static void window_park_rating_update(rct_window* w)
*
* rct2: 0x006686CB
*/
static void window_park_rating_invalidate(rct_window* w)
static void WindowParkRatingInvalidate(rct_window* w)
{
rct_widget* widgets;
@ -862,21 +862,21 @@ static void window_park_rating_invalidate(rct_window* w)
WindowInitScrollWidgets(w);
}
window_park_set_pressed_tab(w);
window_park_prepare_window_title_text();
WindowParkSetPressedTab(w);
WindowParkPrepareWindowTitleText();
window_align_tabs(w, WIDX_TAB_1, WIDX_TAB_7);
window_park_anchor_border_widgets(w);
WindowParkAnchorBorderWidgets(w);
}
/**
*
* rct2: 0x0066875D
*/
static void window_park_rating_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowParkRatingPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_park_draw_tab_images(dpi, w);
WindowParkDrawTabImages(dpi, w);
auto screenPos = w->windowPos;
rct_widget* widget = &window_park_rating_widgets[WIDX_PAGE_BACKGROUND];
@ -923,14 +923,14 @@ static void window_park_rating_paint(rct_window* w, rct_drawpixelinfo* dpi)
*
* rct2: 0x00667D35
*/
rct_window* window_park_guests_open()
rct_window* WindowParkGuestsOpen()
{
rct_window* window;
window = window_bring_to_front_by_class(WC_PARK_INFORMATION);
if (window == nullptr)
{
window = window_park_open();
window = WindowParkOpen();
}
if (input_test_flag(INPUT_FLAG_TOOL_ACTIVE))
@ -954,19 +954,19 @@ rct_window* window_park_guests_open()
*
* rct2: 0x00668DEB
*/
static void window_park_guests_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowParkGuestsMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
if (widgetIndex == WIDX_CLOSE)
window_close(w);
else if (widgetIndex >= WIDX_TAB_1 && widgetIndex <= WIDX_TAB_7)
window_park_set_page(w, widgetIndex - WIDX_TAB_1);
WindowParkSetPage(w, widgetIndex - WIDX_TAB_1);
}
/**
*
* rct2: 0x00668E33
*/
static void window_park_guests_resize(rct_window* w)
static void WindowParkGuestsResize(rct_window* w)
{
window_set_resize(w, 255, 182, 255, 182);
}
@ -975,7 +975,7 @@ static void window_park_guests_resize(rct_window* w)
*
* rct2: 0x00668E06
*/
static void window_park_guests_update(rct_window* w)
static void WindowParkGuestsUpdate(rct_window* w)
{
w->frame_no++;
w->var_492 = (w->var_492 + 1) % 24;
@ -986,7 +986,7 @@ static void window_park_guests_update(rct_window* w)
*
* rct2: 0x00668AB0
*/
static void window_park_guests_invalidate(rct_window* w)
static void WindowParkGuestsInvalidate(rct_window* w)
{
rct_widget* widgets;
@ -997,21 +997,21 @@ static void window_park_guests_invalidate(rct_window* w)
WindowInitScrollWidgets(w);
}
window_park_set_pressed_tab(w);
window_park_prepare_window_title_text();
WindowParkSetPressedTab(w);
WindowParkPrepareWindowTitleText();
window_align_tabs(w, WIDX_TAB_1, WIDX_TAB_7);
window_park_anchor_border_widgets(w);
WindowParkAnchorBorderWidgets(w);
}
/**
*
* rct2: 0x00668B42
*/
static void window_park_guests_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowParkGuestsPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_park_draw_tab_images(dpi, w);
WindowParkDrawTabImages(dpi, w);
auto screenPos = ScreenCoordsXY{ w->windowPos.x, w->windowPos.y };
rct_widget* widget = &window_park_guests_widgets[WIDX_PAGE_BACKGROUND];
@ -1071,19 +1071,19 @@ static void window_park_guests_paint(rct_window* w, rct_drawpixelinfo* dpi)
*
* rct2: 0x00669011
*/
static void window_park_price_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowParkPriceMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
if (widgetIndex == WIDX_CLOSE)
window_close(w);
else if (widgetIndex >= WIDX_TAB_1 && widgetIndex <= WIDX_TAB_7)
window_park_set_page(w, widgetIndex - WIDX_TAB_1);
WindowParkSetPage(w, widgetIndex - WIDX_TAB_1);
}
/**
*
* rct2: 0x0066908C
*/
static void window_park_price_resize(rct_window* w)
static void WindowParkPriceResize(rct_window* w)
{
window_set_resize(w, 230, 124, 230, 124);
}
@ -1092,7 +1092,7 @@ static void window_park_price_resize(rct_window* w)
*
* rct2: 0x0066902C
*/
static void window_park_price_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowParkPriceMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
int32_t newFee;
@ -1116,7 +1116,7 @@ static void window_park_price_mousedown(rct_window* w, rct_widgetindex widgetInd
*
* rct2: 0x00669077
*/
static void window_park_price_update(rct_window* w)
static void WindowParkPriceUpdate(rct_window* w)
{
w->frame_no++;
widget_invalidate(w, WIDX_TAB_4);
@ -1126,7 +1126,7 @@ static void window_park_price_update(rct_window* w)
*
* rct2: 0x00668EAD
*/
static void window_park_price_invalidate(rct_window* w)
static void WindowParkPriceInvalidate(rct_window* w)
{
rct_widget* widgets;
@ -1137,8 +1137,8 @@ static void window_park_price_invalidate(rct_window* w)
WindowInitScrollWidgets(w);
}
window_park_set_pressed_tab(w);
window_park_prepare_window_title_text();
WindowParkSetPressedTab(w);
WindowParkPrepareWindowTitleText();
// Show a tooltip if the park is pay per ride.
window_park_price_widgets[WIDX_PRICE_LABEL].tooltip = STR_NONE;
@ -1165,17 +1165,17 @@ static void window_park_price_invalidate(rct_window* w)
}
window_align_tabs(w, WIDX_TAB_1, WIDX_TAB_7);
window_park_anchor_border_widgets(w);
WindowParkAnchorBorderWidgets(w);
}
/**
*
* rct2: 0x00668F99
*/
static void window_park_price_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowParkPricePaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_park_draw_tab_images(dpi, w);
WindowParkDrawTabImages(dpi, w);
auto screenCoords = w->windowPos
+ ScreenCoordsXY{ w->widgets[WIDX_PAGE_BACKGROUND].left + 4, w->widgets[WIDX_PAGE_BACKGROUND].top + 30 };
@ -1199,19 +1199,19 @@ static void window_park_price_paint(rct_window* w, rct_drawpixelinfo* dpi)
*
* rct2: 0x0066928C
*/
static void window_park_stats_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowParkStatsMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
if (widgetIndex == WIDX_CLOSE)
window_close(w);
else if (widgetIndex >= WIDX_TAB_1 && widgetIndex <= WIDX_TAB_7)
window_park_set_page(w, widgetIndex - WIDX_TAB_1);
WindowParkSetPage(w, widgetIndex - WIDX_TAB_1);
}
/**
*
* rct2: 0x00669338
*/
static void window_park_stats_resize(rct_window* w)
static void WindowParkStatsResize(rct_window* w)
{
window_set_resize(w, 230, 119, 230, 119);
}
@ -1220,7 +1220,7 @@ static void window_park_stats_resize(rct_window* w)
*
* rct2: 0x006692A8
*/
static void window_park_stats_update(rct_window* w)
static void WindowParkStatsUpdate(rct_window* w)
{
int32_t i;
@ -1248,7 +1248,7 @@ static void window_park_stats_update(rct_window* w)
*
* rct2: 0x00669106
*/
static void window_park_stats_invalidate(rct_window* w)
static void WindowParkStatsInvalidate(rct_window* w)
{
rct_widget* widgets;
@ -1259,23 +1259,23 @@ static void window_park_stats_invalidate(rct_window* w)
WindowInitScrollWidgets(w);
}
window_park_set_pressed_tab(w);
window_park_prepare_window_title_text();
WindowParkSetPressedTab(w);
WindowParkPrepareWindowTitleText();
window_align_tabs(w, WIDX_TAB_1, WIDX_TAB_7);
window_park_anchor_border_widgets(w);
WindowParkAnchorBorderWidgets(w);
}
/**
*
* rct2: 0x00669198
*/
static void window_park_stats_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowParkStatsPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
int32_t parkSize, stringIndex;
WindowDrawWidgets(w, dpi);
window_park_draw_tab_images(dpi, w);
WindowParkDrawTabImages(dpi, w);
auto screenCoords = w->windowPos
+ ScreenCoordsXY{ window_park_awards_widgets[WIDX_PAGE_BACKGROUND].left + 4,
@ -1330,14 +1330,14 @@ static void window_park_stats_paint(rct_window* w, rct_drawpixelinfo* dpi)
*
* rct2: 0x00667E57
*/
rct_window* window_park_objective_open()
rct_window* WindowParkObjectiveOpen()
{
rct_window* window;
window = window_bring_to_front_by_class(WC_PARK_INFORMATION);
if (window == nullptr)
{
window = window_park_open();
window = WindowParkOpen();
}
if (input_test_flag(INPUT_FLAG_TOOL_ACTIVE))
@ -1364,7 +1364,7 @@ rct_window* window_park_objective_open()
*
* rct2: 0x006695AA
*/
static void window_park_objective_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowParkObjectiveMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -1378,10 +1378,10 @@ static void window_park_objective_mouseup(rct_window* w, rct_widgetindex widgetI
case WIDX_TAB_5:
case WIDX_TAB_6:
case WIDX_TAB_7:
window_park_set_page(w, widgetIndex - WIDX_TAB_1);
WindowParkSetPage(w, widgetIndex - WIDX_TAB_1);
break;
case WIDX_ENTER_NAME:
window_text_input_open(
WindowTextInputOpen(
w, WIDX_ENTER_NAME, STR_ENTER_NAME, STR_PLEASE_ENTER_YOUR_NAME_FOR_THE_SCENARIO_CHART, {}, 0, 0, 32);
break;
}
@ -1391,7 +1391,7 @@ static void window_park_objective_mouseup(rct_window* w, rct_widgetindex widgetI
*
* rct2: 0x00669681
*/
static void window_park_objective_resize(rct_window* w)
static void WindowParkObjectiveResize(rct_window* w)
{
#ifndef NO_TTF
if (gCurrentTTFFontSet != nullptr)
@ -1405,7 +1405,7 @@ static void window_park_objective_resize(rct_window* w)
*
* rct2: 0x0066966C
*/
static void window_park_objective_update(rct_window* w)
static void WindowParkObjectiveUpdate(rct_window* w)
{
w->frame_no++;
widget_invalidate(w, WIDX_TAB_6);
@ -1415,7 +1415,7 @@ static void window_park_objective_update(rct_window* w)
*
* rct2: 0x006695CC
*/
static void window_park_objective_textinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
static void WindowParkObjectiveTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
{
if (widgetIndex == WIDX_ENTER_NAME && text != nullptr && text[0] != 0)
{
@ -1428,10 +1428,10 @@ static void window_park_objective_textinput(rct_window* w, rct_widgetindex widge
*
* rct2: 0x006693B2
*/
static void window_park_objective_invalidate(rct_window* w)
static void WindowParkObjectiveInvalidate(rct_window* w)
{
window_park_set_pressed_tab(w);
window_park_prepare_window_title_text();
WindowParkSetPressedTab(w);
WindowParkPrepareWindowTitleText();
// Show name input button on scenario completion.
if (gParkFlags & PARK_FLAGS_SCENARIO_COMPLETE_NAME_INPUT)
@ -1444,17 +1444,17 @@ static void window_park_objective_invalidate(rct_window* w)
window_park_objective_widgets[WIDX_ENTER_NAME].type = WindowWidgetType::Empty;
window_align_tabs(w, WIDX_TAB_1, WIDX_TAB_7);
window_park_anchor_border_widgets(w);
WindowParkAnchorBorderWidgets(w);
}
/**
*
* rct2: 0x0066945C
*/
static void window_park_objective_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowParkObjectivePaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_park_draw_tab_images(dpi, w);
WindowParkDrawTabImages(dpi, w);
// Scenario description
auto screenCoords = w->windowPos
@ -1521,14 +1521,14 @@ static void window_park_objective_paint(rct_window* w, rct_drawpixelinfo* dpi)
*
* rct2: 0x00667DC6
*/
rct_window* window_park_awards_open()
rct_window* WindowParkAwardsOpen()
{
rct_window* window;
window = window_bring_to_front_by_class(WC_PARK_INFORMATION);
if (window == nullptr)
{
window = window_park_open();
window = WindowParkOpen();
}
if (input_test_flag(INPUT_FLAG_TOOL_ACTIVE))
@ -1552,19 +1552,19 @@ rct_window* window_park_awards_open()
*
* rct2: 0x00669851
*/
static void window_park_awards_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowParkAwardsMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
if (widgetIndex == WIDX_CLOSE)
window_close(w);
else if (widgetIndex >= WIDX_TAB_1 && widgetIndex <= WIDX_TAB_7)
window_park_set_page(w, widgetIndex - WIDX_TAB_1);
WindowParkSetPage(w, widgetIndex - WIDX_TAB_1);
}
/**
*
* rct2: 0x00669882
*/
static void window_park_awards_resize(rct_window* w)
static void WindowParkAwardsResize(rct_window* w)
{
window_set_resize(w, 230, 182, 230, 182);
}
@ -1573,7 +1573,7 @@ static void window_park_awards_resize(rct_window* w)
*
* rct2: 0x0066986D
*/
static void window_park_awards_update(rct_window* w)
static void WindowParkAwardsUpdate(rct_window* w)
{
w->frame_no++;
widget_invalidate(w, WIDX_TAB_7);
@ -1583,7 +1583,7 @@ static void window_park_awards_update(rct_window* w)
*
* rct2: 0x006696FB
*/
static void window_park_awards_invalidate(rct_window* w)
static void WindowParkAwardsInvalidate(rct_window* w)
{
rct_widget* widgets;
@ -1594,21 +1594,21 @@ static void window_park_awards_invalidate(rct_window* w)
WindowInitScrollWidgets(w);
}
window_park_set_pressed_tab(w);
window_park_prepare_window_title_text();
WindowParkSetPressedTab(w);
WindowParkPrepareWindowTitleText();
window_align_tabs(w, WIDX_TAB_1, WIDX_TAB_7);
window_park_anchor_border_widgets(w);
WindowParkAnchorBorderWidgets(w);
}
/**
*
* rct2: 0x0066978D
*/
static void window_park_awards_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowParkAwardsPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_park_draw_tab_images(dpi, w);
WindowParkDrawTabImages(dpi, w);
auto screenCoords = w->windowPos
+ ScreenCoordsXY{ window_park_awards_widgets[WIDX_PAGE_BACKGROUND].left + 4,
@ -1639,7 +1639,7 @@ static void window_park_awards_paint(rct_window* w, rct_drawpixelinfo* dpi)
*
* rct2: 0x00668496
*/
static void window_park_set_page(rct_window* w, int32_t page)
static void WindowParkSetPage(rct_window* w, int32_t page)
{
int32_t listen;
@ -1662,7 +1662,7 @@ static void window_park_set_page(rct_window* w, int32_t page)
w->hold_down_widgets = window_park_page_hold_down_widgets[page];
w->event_handlers = window_park_page_events[page];
w->widgets = window_park_page_widgets[page];
window_park_set_disabled_tabs(w);
WindowParkSetDisabledTabs(w);
w->Invalidate();
window_event_resize_call(w);
@ -1672,7 +1672,7 @@ static void window_park_set_page(rct_window* w, int32_t page)
w->viewport->flags |= VIEWPORT_FLAG_SOUND_ON;
}
static void window_park_anchor_border_widgets(rct_window* w)
static void WindowParkAnchorBorderWidgets(rct_window* w)
{
w->widgets[WIDX_BACKGROUND].right = w->width - 1;
w->widgets[WIDX_BACKGROUND].bottom = w->height - 1;
@ -1683,7 +1683,7 @@ static void window_park_anchor_border_widgets(rct_window* w)
w->widgets[WIDX_CLOSE].right = w->width - 3;
}
static void window_park_set_pressed_tab(rct_window* w)
static void WindowParkSetPressedTab(rct_window* w)
{
int32_t i;
for (i = 0; i < 7; i++)
@ -1691,7 +1691,7 @@ static void window_park_set_pressed_tab(rct_window* w)
w->pressed_widgets |= 1LL << (WIDX_TAB_1 + w->page);
}
static void window_park_draw_tab_images(rct_drawpixelinfo* dpi, rct_window* w)
static void WindowParkDrawTabImages(rct_drawpixelinfo* dpi, rct_window* w)
{
int32_t sprite_idx;

126
src/openrct2-ui/windows/Player.cpp
View File

@ -80,42 +80,42 @@ static rct_widget *window_player_page_widgets[] = {
#pragma region Events
static void window_player_overview_close(rct_window *w);
static void window_player_overview_mouse_up(rct_window *w, rct_widgetindex widgetIndex);
static void window_player_overview_resize(rct_window *w);
static void window_player_overview_mouse_down(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget);
static void window_player_overview_dropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void window_player_overview_update(rct_window* w);
static void window_player_overview_invalidate(rct_window *w);
static void window_player_overview_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowPlayerOverviewClose(rct_window *w);
static void WindowPlayerOverviewMouseUp(rct_window *w, rct_widgetindex widgetIndex);
static void WindowPlayerOverviewResize(rct_window *w);
static void WindowPlayerOverviewMouseDown(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget);
static void WindowPlayerOverviewDropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowPlayerOverviewUpdate(rct_window* w);
static void WindowPlayerOverviewInvalidate(rct_window *w);
static void WindowPlayerOverviewPaint(rct_window *w, rct_drawpixelinfo *dpi);
static rct_window_event_list window_player_overview_events([](auto& events)
{
events.close = &window_player_overview_close;
events.mouse_up = &window_player_overview_mouse_up;
events.resize = &window_player_overview_resize;
events.mouse_down = &window_player_overview_mouse_down;
events.dropdown = &window_player_overview_dropdown;
events.update = &window_player_overview_update;
events.invalidate = &window_player_overview_invalidate;
events.paint = &window_player_overview_paint;
events.close = &WindowPlayerOverviewClose;
events.mouse_up = &WindowPlayerOverviewMouseUp;
events.resize = &WindowPlayerOverviewResize;
events.mouse_down = &WindowPlayerOverviewMouseDown;
events.dropdown = &WindowPlayerOverviewDropdown;
events.update = &WindowPlayerOverviewUpdate;
events.invalidate = &WindowPlayerOverviewInvalidate;
events.paint = &WindowPlayerOverviewPaint;
});
static void window_player_statistics_close(rct_window *w);
static void window_player_statistics_mouse_up(rct_window *w, rct_widgetindex widgetIndex);
static void window_player_statistics_resize(rct_window *w);
static void window_player_statistics_update(rct_window* w);
static void window_player_statistics_invalidate(rct_window *w);
static void window_player_statistics_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowPlayerStatisticsClose(rct_window *w);
static void WindowPlayerStatisticsMouseUp(rct_window *w, rct_widgetindex widgetIndex);
static void WindowPlayerStatisticsResize(rct_window *w);
static void WindowPlayerStatisticsUpdate(rct_window* w);
static void WindowPlayerStatisticsInvalidate(rct_window *w);
static void WindowPlayerStatisticsPaint(rct_window *w, rct_drawpixelinfo *dpi);
static rct_window_event_list window_player_statistics_events([](auto& events)
{
events.close = &window_player_statistics_close;
events.mouse_up = &window_player_statistics_mouse_up;
events.resize = &window_player_statistics_resize;
events.update = &window_player_statistics_update;
events.invalidate = &window_player_statistics_invalidate;
events.paint = &window_player_statistics_paint;
events.close = &WindowPlayerStatisticsClose;
events.mouse_up = &WindowPlayerStatisticsMouseUp;
events.resize = &WindowPlayerStatisticsResize;
events.update = &WindowPlayerStatisticsUpdate;
events.invalidate = &WindowPlayerStatisticsInvalidate;
events.paint = &WindowPlayerStatisticsPaint;
});
static rct_window_event_list *window_player_page_events[] = {
@ -125,10 +125,10 @@ static rct_window_event_list *window_player_page_events[] = {
#pragma endregion
static void window_player_set_page(rct_window* w, int32_t page);
static void window_player_draw_tab_images(rct_drawpixelinfo *dpi, rct_window *w);
static void window_player_update_viewport(rct_window *w, bool scroll);
static void window_player_update_title(rct_window* w);
static void WindowPlayerSetPage(rct_window* w, int32_t page);
static void WindowPlayerDrawTabImages(rct_drawpixelinfo *dpi, rct_window *w);
static void WindowPlayerUpdateViewport(rct_window *w, bool scroll);
static void WindowPlayerUpdateTitle(rct_window* w);
static uint32_t window_player_page_enabled_widgets[] = {
(1ULL << WIDX_CLOSE) |
@ -145,7 +145,7 @@ static uint32_t window_player_page_enabled_widgets[] = {
};
// clang-format on
rct_window* window_player_open(uint8_t id)
rct_window* WindowPlayerOpen(uint8_t id)
{
rct_window* window;
@ -178,12 +178,12 @@ rct_window* window_player_open(uint8_t id)
window->pressed_widgets = 0;
WindowInitScrollWidgets(window);
window_player_set_page(window, WINDOW_PLAYER_PAGE_OVERVIEW);
WindowPlayerSetPage(window, WINDOW_PLAYER_PAGE_OVERVIEW);
return window;
}
static void window_player_overview_show_group_dropdown(rct_window* w, rct_widget* widget)
static void WindowPlayerOverviewShowGroupDropdown(rct_window* w, rct_widget* widget)
{
rct_widget* dropdownWidget;
int32_t numItems, i;
@ -210,11 +210,11 @@ static void window_player_overview_show_group_dropdown(rct_window* w, rct_widget
Dropdown::SetChecked(network_get_group_index(network_get_player_group(player)), true);
}
void window_player_overview_close(rct_window* w)
void WindowPlayerOverviewClose(rct_window* w)
{
}
void window_player_overview_mouse_up(rct_window* w, rct_widgetindex widgetIndex)
void WindowPlayerOverviewMouseUp(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -223,7 +223,7 @@ void window_player_overview_mouse_up(rct_window* w, rct_widgetindex widgetIndex)
break;
case WIDX_TAB_1:
case WIDX_TAB_2:
window_player_set_page(w, widgetIndex - WIDX_TAB_1);
WindowPlayerSetPage(w, widgetIndex - WIDX_TAB_1);
break;
case WIDX_LOCATE:
{
@ -252,17 +252,17 @@ void window_player_overview_mouse_up(rct_window* w, rct_widgetindex widgetIndex)
}
}
void window_player_overview_mouse_down(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
void WindowPlayerOverviewMouseDown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
switch (widgetIndex)
{
case WIDX_GROUP_DROPDOWN:
window_player_overview_show_group_dropdown(w, widget);
WindowPlayerOverviewShowGroupDropdown(w, widget);
break;
}
}
void window_player_overview_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
void WindowPlayerOverviewDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
{
const auto playerId = static_cast<uint8_t>(w->number);
const auto playerIdx = network_get_player_index(playerId);
@ -286,12 +286,12 @@ void window_player_overview_dropdown(rct_window* w, rct_widgetindex widgetIndex,
GameActions::Execute(&playerSetGroupAction);
}
void window_player_overview_resize(rct_window* w)
void WindowPlayerOverviewResize(rct_window* w)
{
window_set_resize(w, 240, 170, 500, 300);
}
void window_player_overview_update(rct_window* w)
void WindowPlayerOverviewUpdate(rct_window* w)
{
w->frame_no++;
widget_invalidate(w, WIDX_TAB_1 + w->page);
@ -311,13 +311,13 @@ void window_player_overview_update(rct_window* w)
w->var_4AE = get_current_rotation();
scroll = false;
}
window_player_update_viewport(w, scroll);
WindowPlayerUpdateViewport(w, scroll);
}
void window_player_overview_paint(rct_window* w, rct_drawpixelinfo* dpi)
void WindowPlayerOverviewPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_player_draw_tab_images(dpi, w);
WindowPlayerDrawTabImages(dpi, w);
int32_t player = network_get_player_index(static_cast<uint8_t>(w->number));
if (player == -1)
@ -373,7 +373,7 @@ void window_player_overview_paint(rct_window* w, rct_drawpixelinfo* dpi)
}
}
void window_player_overview_invalidate(rct_window* w)
void WindowPlayerOverviewInvalidate(rct_window* w)
{
int32_t playerIndex = network_get_player_index(static_cast<uint8_t>(w->number));
if (playerIndex == -1)
@ -391,7 +391,7 @@ void window_player_overview_invalidate(rct_window* w)
w->pressed_widgets &= ~(WIDX_TAB_2);
w->pressed_widgets |= 1ULL << (w->page + WIDX_TAB_1);
window_player_update_title(w);
WindowPlayerUpdateTitle(w);
w->widgets[WIDX_BACKGROUND].right = w->width - 1;
w->widgets[WIDX_BACKGROUND].bottom = w->height - 1;
@ -434,7 +434,7 @@ void window_player_overview_invalidate(rct_window* w)
WidgetSetEnabled(w, WIDX_KICK, canKick && !isOwnWindow && !isServer);
}
void window_player_statistics_close(rct_window* w)
void WindowPlayerStatisticsClose(rct_window* w)
{
if (w->error.var_480)
{
@ -442,7 +442,7 @@ void window_player_statistics_close(rct_window* w)
}
}
void window_player_statistics_mouse_up(rct_window* w, rct_widgetindex widgetIndex)
void WindowPlayerStatisticsMouseUp(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -451,17 +451,17 @@ void window_player_statistics_mouse_up(rct_window* w, rct_widgetindex widgetInde
break;
case WIDX_TAB_1:
case WIDX_TAB_2:
window_player_set_page(w, widgetIndex - WIDX_TAB_1);
WindowPlayerSetPage(w, widgetIndex - WIDX_TAB_1);
break;
}
}
void window_player_statistics_resize(rct_window* w)
void WindowPlayerStatisticsResize(rct_window* w)
{
window_set_resize(w, 210, 80, 210, 80);
}
void window_player_statistics_update(rct_window* w)
void WindowPlayerStatisticsUpdate(rct_window* w)
{
w->frame_no++;
widget_invalidate(w, WIDX_TAB_1 + w->page);
@ -472,7 +472,7 @@ void window_player_statistics_update(rct_window* w)
}
}
void window_player_statistics_invalidate(rct_window* w)
void WindowPlayerStatisticsInvalidate(rct_window* w)
{
if (window_player_page_widgets[w->page] != w->widgets)
{
@ -484,7 +484,7 @@ void window_player_statistics_invalidate(rct_window* w)
w->pressed_widgets &= ~(WIDX_TAB_2);
w->pressed_widgets |= 1ULL << (w->page + WIDX_TAB_1);
window_player_update_title(w);
WindowPlayerUpdateTitle(w);
w->widgets[WIDX_BACKGROUND].right = w->width - 1;
w->widgets[WIDX_BACKGROUND].bottom = w->height - 1;
@ -497,10 +497,10 @@ void window_player_statistics_invalidate(rct_window* w)
window_align_tabs(w, WIDX_TAB_1, WIDX_TAB_2);
}
void window_player_statistics_paint(rct_window* w, rct_drawpixelinfo* dpi)
void WindowPlayerStatisticsPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_player_draw_tab_images(dpi, w);
WindowPlayerDrawTabImages(dpi, w);
int32_t player = network_get_player_index(static_cast<uint8_t>(w->number));
if (player == -1)
@ -523,7 +523,7 @@ void window_player_statistics_paint(rct_window* w, rct_drawpixelinfo* dpi)
DrawTextBasic(dpi, screenCoords, STR_MONEY_SPENT, ft);
}
static void window_player_set_page(rct_window* w, int32_t page)
static void WindowPlayerSetPage(rct_window* w, int32_t page)
{
int32_t originalPage = w->page;
@ -551,12 +551,12 @@ static void window_player_set_page(rct_window* w, int32_t page)
viewport_create(w, w->windowPos, w->width, w->height, focus);
w->flags |= WF_NO_SCROLLING;
window_event_invalidate_call(w);
window_player_update_viewport(w, false);
WindowPlayerUpdateViewport(w, false);
}
else if (originalPage != page)
{
window_event_invalidate_call(w);
window_player_update_viewport(w, false);
WindowPlayerUpdateViewport(w, false);
}
}
else
@ -565,7 +565,7 @@ static void window_player_set_page(rct_window* w, int32_t page)
}
}
static void window_player_draw_tab_images(rct_drawpixelinfo* dpi, rct_window* w)
static void WindowPlayerDrawTabImages(rct_drawpixelinfo* dpi, rct_window* w)
{
rct_widget* widget;
@ -593,7 +593,7 @@ static void window_player_draw_tab_images(rct_drawpixelinfo* dpi, rct_window* w)
}
}
static void window_player_update_viewport(rct_window* w, bool scroll)
static void WindowPlayerUpdateViewport(rct_window* w, bool scroll)
{
int32_t playerIndex = network_get_player_index(static_cast<uint8_t>(w->number));
if (playerIndex == -1)
@ -640,7 +640,7 @@ static void window_player_update_viewport(rct_window* w, bool scroll)
}
}
static void window_player_update_title(rct_window* w)
static void WindowPlayerUpdateTitle(rct_window* w)
{
auto ft = Formatter::Common();
int32_t player = network_get_player_index(static_cast<uint8_t>(w->number));

100
src/openrct2-ui/windows/Research.cpp
View File

@ -99,36 +99,36 @@ static rct_widget *window_research_page_widgets[] = {
#pragma region Events
static void window_research_development_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_research_development_update(rct_window *w);
static void window_research_development_invalidate(rct_window *w);
static void window_research_development_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowResearchDevelopmentMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowResearchDevelopmentUpdate(rct_window *w);
static void WindowResearchDevelopmentInvalidate(rct_window *w);
static void WindowResearchDevelopmentPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_research_funding_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_research_funding_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget);
static void window_research_funding_dropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void window_research_funding_update(rct_window *w);
static void window_research_funding_invalidate(rct_window *w);
static void window_research_funding_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowResearchFundingMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowResearchFundingMousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowResearchFundingDropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowResearchFundingUpdate(rct_window *w);
static void WindowResearchFundingInvalidate(rct_window *w);
static void WindowResearchFundingPaint(rct_window *w, rct_drawpixelinfo *dpi);
//
static rct_window_event_list window_research_development_events([](auto& events)
{
events.mouse_up = &window_research_development_mouseup;
events.update = &window_research_development_update;
events.invalidate = &window_research_development_invalidate;
events.paint = &window_research_development_paint;
events.mouse_up = &WindowResearchDevelopmentMouseup;
events.update = &WindowResearchDevelopmentUpdate;
events.invalidate = &WindowResearchDevelopmentInvalidate;
events.paint = &WindowResearchDevelopmentPaint;
});
// 0x009890E8
static rct_window_event_list window_research_funding_events([](auto& events)
{
events.mouse_up = &window_research_funding_mouseup;
events.mouse_down = &window_research_funding_mousedown;
events.dropdown = &window_research_funding_dropdown;
events.update = &window_research_funding_update;
events.invalidate = &window_research_funding_invalidate;
events.paint = &window_research_funding_paint;
events.mouse_up = &WindowResearchFundingMouseup;
events.mouse_down = &WindowResearchFundingMousedown;
events.dropdown = &WindowResearchFundingDropdown;
events.update = &WindowResearchFundingUpdate;
events.invalidate = &WindowResearchFundingInvalidate;
events.paint = &WindowResearchFundingPaint;
});
static rct_window_event_list *window_research_page_events[] = {
@ -175,11 +175,11 @@ static constexpr const rct_string_id ResearchStageNames[] = {
STR_RESEARCH_STAGE_UNKNOWN,
};
static void window_research_set_page(rct_window* w, int32_t page);
static void window_research_set_pressed_tab(rct_window* w);
static void window_research_draw_tab_images(rct_drawpixelinfo* dpi, rct_window* w);
static void WindowResearchSetPage(rct_window* w, int32_t page);
static void WindowResearchSetPressedTab(rct_window* w);
static void WindowResearchDrawTabImages(rct_drawpixelinfo* dpi, rct_window* w);
rct_window* window_research_open()
rct_window* WindowResearchOpen()
{
rct_window* w;
@ -219,7 +219,7 @@ rct_window* window_research_open()
*
* rct2: 0x006B6B38
*/
static void window_research_development_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowResearchDevelopmentMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -228,7 +228,7 @@ static void window_research_development_mouseup(rct_window* w, rct_widgetindex w
break;
case WIDX_TAB_1:
case WIDX_TAB_2:
window_research_set_page(w, widgetIndex - WIDX_TAB_1);
WindowResearchSetPage(w, widgetIndex - WIDX_TAB_1);
break;
case WIDX_LAST_DEVELOPMENT_BUTTON:
News::OpenSubject(News::ItemType::Research, gResearchLastItem->rawValue);
@ -240,7 +240,7 @@ static void window_research_development_mouseup(rct_window* w, rct_widgetindex w
*
* rct2: 0x0069CBA6
*/
static void window_research_development_update(rct_window* w)
static void WindowResearchDevelopmentUpdate(rct_window* w)
{
// Tab animation
if (++w->frame_no >= window_research_tab_animation_loops[w->page])
@ -252,7 +252,7 @@ static void window_research_development_update(rct_window* w)
*
* rct2: 0x006B6819
*/
static void window_research_development_invalidate(rct_window* w)
static void WindowResearchDevelopmentInvalidate(rct_window* w)
{
if (w->widgets != window_research_page_widgets[WINDOW_RESEARCH_PAGE_DEVELOPMENT])
{
@ -260,7 +260,7 @@ static void window_research_development_invalidate(rct_window* w)
WindowInitScrollWidgets(w);
}
window_research_set_pressed_tab(w);
WindowResearchSetPressedTab(w);
window_research_development_widgets[WIDX_LAST_DEVELOPMENT_BUTTON].type = WindowWidgetType::Empty;
if (gResearchLastItem.has_value())
@ -277,15 +277,15 @@ static void window_research_development_invalidate(rct_window* w)
*
* rct2: 0x006B689B
*/
static void window_research_development_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowResearchDevelopmentPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_research_draw_tab_images(dpi, w);
WindowResearchDrawTabImages(dpi, w);
window_research_development_page_paint(w, dpi, WIDX_CURRENTLY_IN_DEVELOPMENT_GROUP);
WindowResearchDevelopmentPagePaint(w, dpi, WIDX_CURRENTLY_IN_DEVELOPMENT_GROUP);
}
void window_research_development_page_paint(rct_window* w, rct_drawpixelinfo* dpi, rct_widgetindex baseWidgetIndex)
void WindowResearchDevelopmentPagePaint(rct_window* w, rct_drawpixelinfo* dpi, rct_widgetindex baseWidgetIndex)
{
baseWidgetIndex = baseWidgetIndex - WIDX_CURRENTLY_IN_DEVELOPMENT_GROUP;
@ -415,7 +415,7 @@ void window_research_development_page_paint(rct_window* w, rct_drawpixelinfo* dp
*
* rct2: 0x0069DB3F
*/
static void window_research_funding_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowResearchFundingMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -424,7 +424,7 @@ static void window_research_funding_mouseup(rct_window* w, rct_widgetindex widge
break;
case WIDX_TAB_1:
case WIDX_TAB_2:
window_research_set_page(w, widgetIndex - WIDX_TAB_1);
WindowResearchSetPage(w, widgetIndex - WIDX_TAB_1);
break;
case WIDX_TRANSPORT_RIDES:
case WIDX_GENTLE_RIDES:
@ -447,7 +447,7 @@ static void window_research_funding_mouseup(rct_window* w, rct_widgetindex widge
*
* rct2: 0x0069DB66
*/
static void window_research_funding_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowResearchFundingMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
rct_widget* dropdownWidget;
int32_t i;
@ -474,7 +474,7 @@ static void window_research_funding_mousedown(rct_window* w, rct_widgetindex wid
*
* rct2: 0x0069DB6D
*/
static void window_research_funding_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowResearchFundingDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
{
if (widgetIndex != WIDX_RESEARCH_FUNDING_DROPDOWN_BUTTON || dropdownIndex == -1)
return;
@ -487,7 +487,7 @@ static void window_research_funding_dropdown(rct_window* w, rct_widgetindex widg
*
* rct2: 0x0069DC23
*/
static void window_research_funding_update(rct_window* w)
static void WindowResearchFundingUpdate(rct_window* w)
{
// Tab animation
if (++w->frame_no >= window_research_tab_animation_loops[w->page])
@ -499,7 +499,7 @@ static void window_research_funding_update(rct_window* w)
*
* rct2: 0x0069DA64
*/
static void window_research_funding_invalidate(rct_window* w)
static void WindowResearchFundingInvalidate(rct_window* w)
{
if (w->widgets != window_research_page_widgets[WINDOW_RESEARCH_PAGE_FUNDING])
{
@ -507,7 +507,7 @@ static void window_research_funding_invalidate(rct_window* w)
WindowInitScrollWidgets(w);
}
window_research_set_pressed_tab(w);
WindowResearchSetPressedTab(w);
if ((gParkFlags & PARK_FLAGS_NO_MONEY) || (gResearchProgressStage == RESEARCH_STAGE_FINISHED_ALL))
{
@ -555,15 +555,15 @@ static void window_research_funding_invalidate(rct_window* w)
*
* rct2: 0x0069DAF0
*/
static void window_research_funding_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowResearchFundingPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_research_draw_tab_images(dpi, w);
WindowResearchDrawTabImages(dpi, w);
window_research_funding_page_paint(w, dpi, WIDX_RESEARCH_FUNDING);
WindowResearchFundingPagePaint(w, dpi, WIDX_RESEARCH_FUNDING);
}
void window_research_funding_page_paint(rct_window* w, rct_drawpixelinfo* dpi, rct_widgetindex baseWidgetIndex)
void WindowResearchFundingPagePaint(rct_window* w, rct_drawpixelinfo* dpi, rct_widgetindex baseWidgetIndex)
{
if (gParkFlags & PARK_FLAGS_NO_MONEY)
return;
@ -582,7 +582,7 @@ void window_research_funding_page_paint(rct_window* w, rct_drawpixelinfo* dpi, r
*
* rct2: 0x0069CAC5
*/
static void window_research_set_page(rct_window* w, int32_t page)
static void WindowResearchSetPage(rct_window* w, int32_t page)
{
w->page = page;
w->frame_no = 0;
@ -613,7 +613,7 @@ static void window_research_set_page(rct_window* w, int32_t page)
w->Invalidate();
}
static void window_research_set_pressed_tab(rct_window* w)
static void WindowResearchSetPressedTab(rct_window* w)
{
int32_t i;
for (i = 0; i < WINDOW_RESEARCH_PAGE_COUNT; i++)
@ -621,7 +621,7 @@ static void window_research_set_pressed_tab(rct_window* w)
w->pressed_widgets |= 1LL << (WIDX_TAB_1 + w->page);
}
static void window_research_draw_tab_image(rct_drawpixelinfo* dpi, rct_window* w, int32_t page, int32_t spriteIndex)
static void WindowResearchDrawTabImage(rct_drawpixelinfo* dpi, rct_window* w, int32_t page, int32_t spriteIndex)
{
rct_widgetindex widgetIndex = WIDX_TAB_1 + page;
@ -641,10 +641,10 @@ static void window_research_draw_tab_image(rct_drawpixelinfo* dpi, rct_window* w
}
}
static void window_research_draw_tab_images(rct_drawpixelinfo* dpi, rct_window* w)
static void WindowResearchDrawTabImages(rct_drawpixelinfo* dpi, rct_window* w)
{
window_research_draw_tab_image(dpi, w, WINDOW_RESEARCH_PAGE_DEVELOPMENT, SPR_TAB_FINANCES_RESEARCH_0);
window_research_draw_tab_image(dpi, w, WINDOW_RESEARCH_PAGE_FUNDING, SPR_TAB_FINANCES_SUMMARY_0);
WindowResearchDrawTabImage(dpi, w, WINDOW_RESEARCH_PAGE_DEVELOPMENT, SPR_TAB_FINANCES_RESEARCH_0);
WindowResearchDrawTabImage(dpi, w, WINDOW_RESEARCH_PAGE_FUNDING, SPR_TAB_FINANCES_SUMMARY_0);
}
#pragma endregion

932
src/openrct2-ui/windows/Ride.cpp
View File

File diff suppressed because it is too large Load Diff

310
src/openrct2-ui/windows/RideConstruction.cpp
View File

@ -142,30 +142,30 @@ static rct_widget window_ride_construction_widgets[] = {
#pragma region Events
static void window_ride_construction_close(rct_window* w);
static void window_ride_construction_mouseup(rct_window* w, rct_widgetindex widgetIndex);
static void window_ride_construction_resize(rct_window* w);
static void window_ride_construction_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void window_ride_construction_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void window_ride_construction_update(rct_window* w);
static void window_ride_construction_toolupdate(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void window_ride_construction_tooldown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void window_ride_construction_invalidate(rct_window* w);
static void window_ride_construction_paint(rct_window* w, rct_drawpixelinfo* dpi);
static bool track_piece_direction_is_diagonal(const uint8_t direction);
static void WindowRideConstructionClose(rct_window* w);
static void WindowRideConstructionMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowRideConstructionResize(rct_window* w);
static void WindowRideConstructionMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowRideConstructionDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowRideConstructionUpdate(rct_window* w);
static void WindowRideConstructionToolupdate(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowRideConstructionTooldown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowRideConstructionInvalidate(rct_window* w);
static void WindowRideConstructionPaint(rct_window* w, rct_drawpixelinfo* dpi);
static bool TrackPieceDirectionIsDiagonal(const uint8_t direction);
// 0x993EEC
static rct_window_event_list window_ride_construction_events([](auto& events) {
events.close = &window_ride_construction_close;
events.mouse_up = &window_ride_construction_mouseup;
events.resize = &window_ride_construction_resize;
events.mouse_down = &window_ride_construction_mousedown;
events.dropdown = &window_ride_construction_dropdown;
events.update = &window_ride_construction_update;
events.tool_update = &window_ride_construction_toolupdate;
events.tool_down = &window_ride_construction_tooldown;
events.invalidate = &window_ride_construction_invalidate;
events.paint = &window_ride_construction_paint;
events.close = &WindowRideConstructionClose;
events.mouse_up = &WindowRideConstructionMouseup;
events.resize = &WindowRideConstructionResize;
events.mouse_down = &WindowRideConstructionMousedown;
events.dropdown = &WindowRideConstructionDropdown;
events.update = &WindowRideConstructionUpdate;
events.tool_update = &WindowRideConstructionToolupdate;
events.tool_down = &WindowRideConstructionTooldown;
events.invalidate = &WindowRideConstructionInvalidate;
events.paint = &WindowRideConstructionPaint;
});
#pragma endregion
@ -448,28 +448,28 @@ static uint8_t _currentlyShowingBrakeOrBoosterSpeed;
static uint32_t _currentDisabledSpecialTrackPieces;
static void window_ride_construction_construct(rct_window* w);
static void window_ride_construction_mouseup_demolish(rct_window* w);
static void window_ride_construction_rotate(rct_window* w);
static void window_ride_construction_entrance_click(rct_window* w);
static void window_ride_construction_exit_click(rct_window* w);
static void WindowRideConstructionConstruct(rct_window* w);
static void WindowRideConstructionMouseupDemolish(rct_window* w);
static void WindowRideConstructionRotate(rct_window* w);
static void WindowRideConstructionEntranceClick(rct_window* w);
static void WindowRideConstructionExitClick(rct_window* w);
static void window_ride_construction_draw_track_piece(
static void WindowRideConstructionDrawTrackPiece(
rct_window* w, rct_drawpixelinfo* dpi, ride_id_t rideIndex, int32_t trackType, int32_t trackDirection, int32_t unknown,
int32_t width, int32_t height);
static void sub_6CBCE2(
static void Sub6CbcE2(
rct_drawpixelinfo* dpi, ride_id_t rideIndex, int32_t trackType, int32_t trackDirection, int32_t edx,
const CoordsXY& originCoords, int32_t originZ);
static void window_ride_construction_update_map_selection();
static void window_ride_construction_update_possible_ride_configurations();
static void window_ride_construction_update_widgets(rct_window* w);
static void window_ride_construction_select_map_tiles(
static void WindowRideConstructionUpdateMapSelection();
static void WindowRideConstructionUpdatePossibleRideConfigurations();
static void WindowRideConstructionUpdateWidgets(rct_window* w);
static void WindowRideConstructionSelectMapTiles(
Ride* ride, int32_t trackType, int32_t trackDirection, const CoordsXY& tileCoords);
static void window_ride_construction_show_special_track_dropdown(rct_window* w, rct_widget* widget);
static void ride_selected_track_set_seat_rotation(int32_t seatRotation);
static void WindowRideConstructionShowSpecialTrackDropdown(rct_window* w, rct_widget* widget);
static void RideSelectedTrackSetSeatRotation(int32_t seatRotation);
static void UpdateLiftHillSelected(int32_t slope);
static void ride_construction_set_brakes_speed(int32_t brakesSpeed);
static void ride_construction_tooldown_entrance_exit(const ScreenCoordsXY& screenCoords);
static void RideConstructionSetBrakesSpeed(int32_t brakesSpeed);
static void RideConstructionTooldownEntranceExit(const ScreenCoordsXY& screenCoords);
static track_type_t _currentPossibleRideConfigurations[32];
@ -484,19 +484,19 @@ static constexpr const rct_string_id RideConstructionSeatAngleRotationStrings[]
STR_RIDE_CONSTRUCTION_SEAT_ROTATION_ANGLE_450, STR_RIDE_CONSTRUCTION_SEAT_ROTATION_ANGLE_495,
};
static bool is_track_enabled(int32_t trackFlagIndex)
static bool IsTrackEnabled(int32_t trackFlagIndex)
{
return (_enabledRidePieces & (1ULL << trackFlagIndex)) != 0;
}
static int32_t ride_get_alternative_type(Ride* ride)
static int32_t RideGetAlternativeType(Ride* ride)
{
return (_currentTrackAlternative & RIDE_TYPE_ALTERNATIVE_TRACK_TYPE) ? ride->GetRideTypeDescriptor().AlternateType
: ride->type;
}
/* move to ride.c */
static void close_ride_window_for_construction(ride_id_t rideId)
static void CloseRideWindowForConstruction(ride_id_t rideId)
{
rct_window* w = window_find_by_number(WC_RIDE, EnumValue(rideId));
if (w != nullptr && w->page == 1)
@ -507,10 +507,10 @@ static void close_ride_window_for_construction(ride_id_t rideId)
*
* rct2: 0x006CB481
*/
rct_window* window_ride_construction_open()
rct_window* WindowRideConstructionOpen()
{
ride_id_t rideIndex = _currentRideIndex;
close_ride_window_for_construction(rideIndex);
CloseRideWindowForConstruction(rideIndex);
auto ride = get_ride(rideIndex);
if (ride == nullptr)
@ -579,7 +579,7 @@ rct_window* window_ride_construction_open()
*
* rct2: 0x006C845D
*/
static void window_ride_construction_close(rct_window* w)
static void WindowRideConstructionClose(rct_window* w)
{
ride_construction_invalidate_current_track();
viewport_set_visibility(0);
@ -637,9 +637,9 @@ static void window_ride_construction_close(rct_window* w)
*
* rct2: 0x006C6E14
*/
static void window_ride_construction_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowRideConstructionMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
window_ride_construction_update_enabled_track_pieces();
WindowRideConstructionUpdateEnabledTrackPieces();
switch (widgetIndex)
{
case WIDX_CLOSE:
@ -652,21 +652,21 @@ static void window_ride_construction_mouseup(rct_window* w, rct_widgetindex widg
ride_select_previous_section();
break;
case WIDX_CONSTRUCT:
window_ride_construction_construct(w);
WindowRideConstructionConstruct(w);
// Force any footpath construction to recheck the area.
gProvisionalFootpath.Flags |= PROVISIONAL_PATH_FLAG_2;
break;
case WIDX_DEMOLISH:
window_ride_construction_mouseup_demolish(w);
WindowRideConstructionMouseupDemolish(w);
break;
case WIDX_ROTATE:
window_ride_construction_rotate(w);
WindowRideConstructionRotate(w);
break;
case WIDX_ENTRANCE:
window_ride_construction_entrance_click(w);
WindowRideConstructionEntranceClick(w);
break;
case WIDX_EXIT:
window_ride_construction_exit_click(w);
WindowRideConstructionExitClick(w);
break;
case WIDX_SIMULATE:
{
@ -685,9 +685,9 @@ static void window_ride_construction_mouseup(rct_window* w, rct_widgetindex widg
*
* rct2: 0x006C7934
*/
static void window_ride_construction_resize(rct_window* w)
static void WindowRideConstructionResize(rct_window* w)
{
window_ride_construction_update_enabled_track_pieces();
WindowRideConstructionUpdateEnabledTrackPieces();
w->enabled_widgets &= ~(1ULL << WIDX_CONSTRUCT);
if (_rideConstructionState != RideConstructionState::Place)
{
@ -698,7 +698,7 @@ static void window_ride_construction_resize(rct_window* w)
if (ride == nullptr)
return;
int32_t rideType = ride_get_alternative_type(ride);
int32_t rideType = RideGetAlternativeType(ride);
uint64_t disabledWidgets = 0;
@ -714,7 +714,7 @@ static void window_ride_construction_resize(rct_window* w)
{
disabledWidgets |= (1ULL << WIDX_LEFT_CURVE_LARGE) | (1ULL << WIDX_RIGHT_CURVE_LARGE);
}
if (is_track_enabled(TRACK_SLOPE_CURVE) && is_track_enabled(TRACK_CURVE_VERY_SMALL))
if (IsTrackEnabled(TRACK_SLOPE_CURVE) && IsTrackEnabled(TRACK_CURVE_VERY_SMALL))
{
// Disable small curves if the start or end of the track is sloped.
if (_previousTrackSlopeEnd != TRACK_SLOPE_NONE || _currentTrackSlopeEnd != TRACK_SLOPE_NONE)
@ -723,9 +723,9 @@ static void window_ride_construction_resize(rct_window* w)
| (1ULL << WIDX_RIGHT_CURVE_VERY_SMALL);
}
}
if (!is_track_enabled(TRACK_SLOPE_CURVE))
if (!IsTrackEnabled(TRACK_SLOPE_CURVE))
{
if (is_track_enabled(TRACK_CURVE_VERTICAL))
if (IsTrackEnabled(TRACK_CURVE_VERTICAL))
{
// Disable all curves only on vertical track
if (_previousTrackSlopeEnd != TRACK_SLOPE_UP_90 || _currentTrackSlopeEnd != TRACK_SLOPE_UP_90)
@ -749,7 +749,7 @@ static void window_ride_construction_resize(rct_window* w)
}
}
}
if (!is_track_enabled(TRACK_FLAT_ROLL_BANKING))
if (!IsTrackEnabled(TRACK_FLAT_ROLL_BANKING))
{
// Disable banking
disabledWidgets |= (1ULL << WIDX_BANKING_GROUPBOX) | (1ULL << WIDX_BANK_LEFT) | (1ULL << WIDX_BANK_STRAIGHT)
@ -761,7 +761,7 @@ static void window_ride_construction_resize(rct_window* w)
{
disabledWidgets |= (1ULL << WIDX_BANK_LEFT) | (1ULL << WIDX_BANK_RIGHT);
}
if (!is_track_enabled(TRACK_SLOPE) && !is_track_enabled(TRACK_SLOPE_STEEP))
if (!IsTrackEnabled(TRACK_SLOPE) && !IsTrackEnabled(TRACK_SLOPE_STEEP))
{
if (!ride->GetRideTypeDescriptor().SupportsTrackPiece(TRACK_REVERSE_FREEFALL))
{
@ -806,7 +806,7 @@ static void window_ride_construction_resize(rct_window* w)
}
break;
}
if (!is_track_enabled(TRACK_SLOPE_ROLL_BANKING))
if (!IsTrackEnabled(TRACK_SLOPE_ROLL_BANKING))
{
if (_currentTrackBankEnd != TRACK_BANK_NONE)
{
@ -821,7 +821,7 @@ static void window_ride_construction_resize(rct_window* w)
case TRACK_SLOPE_DOWN_60:
disabledWidgets |= (1ULL << WIDX_LEFT_CURVE_VERY_SMALL) | (1ULL << WIDX_LEFT_CURVE) | (1ULL << WIDX_RIGHT_CURVE)
| (1ULL << WIDX_RIGHT_CURVE_VERY_SMALL);
if (!is_track_enabled(TRACK_SLOPE_CURVE_STEEP))
if (!IsTrackEnabled(TRACK_SLOPE_CURVE_STEEP))
{
disabledWidgets |= (1ULL << WIDX_LEFT_CURVE_SMALL) | (1ULL << WIDX_RIGHT_CURVE_SMALL);
}
@ -830,7 +830,7 @@ static void window_ride_construction_resize(rct_window* w)
case TRACK_SLOPE_DOWN_90:
disabledWidgets |= (1ULL << WIDX_LEFT_CURVE_VERY_SMALL) | (1ULL << WIDX_LEFT_CURVE) | (1ULL << WIDX_RIGHT_CURVE)
| (1ULL << WIDX_RIGHT_CURVE_VERY_SMALL);
if (!is_track_enabled(TRACK_CURVE_VERTICAL))
if (!IsTrackEnabled(TRACK_CURVE_VERTICAL))
{
disabledWidgets |= (1ULL << WIDX_LEFT_CURVE_SMALL) | (1ULL << WIDX_RIGHT_CURVE_SMALL);
}
@ -848,7 +848,7 @@ static void window_ride_construction_resize(rct_window* w)
{
case TRACK_SLOPE_NONE:
if (_currentTrackCurve != TRACK_CURVE_NONE
|| (is_track_enabled(TRACK_SLOPE_STEEP_LONG) && track_piece_direction_is_diagonal(_currentTrackPieceDirection)))
|| (IsTrackEnabled(TRACK_SLOPE_STEEP_LONG) && TrackPieceDirectionIsDiagonal(_currentTrackPieceDirection)))
{
disabledWidgets |= (1ULL << WIDX_SLOPE_DOWN_STEEP) | (1ULL << WIDX_SLOPE_UP_STEEP);
}
@ -858,10 +858,8 @@ static void window_ride_construction_resize(rct_window* w)
break;
case TRACK_SLOPE_DOWN_60:
disabledWidgets |= (1ULL << WIDX_SLOPE_UP) | (1ULL << WIDX_SLOPE_UP_STEEP);
if (!is_track_enabled(TRACK_SLOPE_LONG)
&& !(
is_track_enabled(TRACK_SLOPE_STEEP_LONG)
&& !track_piece_direction_is_diagonal(_currentTrackPieceDirection)))
if (!IsTrackEnabled(TRACK_SLOPE_LONG)
&& !(IsTrackEnabled(TRACK_SLOPE_STEEP_LONG) && !TrackPieceDirectionIsDiagonal(_currentTrackPieceDirection)))
{
disabledWidgets |= (1ULL << WIDX_LEVEL);
}
@ -871,10 +869,8 @@ static void window_ride_construction_resize(rct_window* w)
break;
case TRACK_SLOPE_UP_60:
disabledWidgets |= (1ULL << WIDX_SLOPE_DOWN_STEEP) | (1ULL << WIDX_SLOPE_DOWN);
if (!is_track_enabled(TRACK_SLOPE_LONG)
&& !(
is_track_enabled(TRACK_SLOPE_STEEP_LONG)
&& !track_piece_direction_is_diagonal(_currentTrackPieceDirection)))
if (!IsTrackEnabled(TRACK_SLOPE_LONG)
&& !(IsTrackEnabled(TRACK_SLOPE_STEEP_LONG) && !TrackPieceDirectionIsDiagonal(_currentTrackPieceDirection)))
{
disabledWidgets |= (1ULL << WIDX_LEVEL);
}
@ -886,12 +882,12 @@ static void window_ride_construction_resize(rct_window* w)
}
if (_previousTrackSlopeEnd == TRACK_SLOPE_NONE)
{
if (!is_track_enabled(TRACK_SLOPE_LONG) && !is_track_enabled(TRACK_SLOPE_STEEP_LONG))
if (!IsTrackEnabled(TRACK_SLOPE_LONG) && !IsTrackEnabled(TRACK_SLOPE_STEEP_LONG))
{
disabledWidgets |= (1ULL << WIDX_SLOPE_DOWN_STEEP) | (1ULL << WIDX_SLOPE_UP_STEEP);
}
}
if (is_track_enabled(TRACK_SLOPE_VERTICAL))
if (IsTrackEnabled(TRACK_SLOPE_VERTICAL))
{
if (_previousTrackSlopeEnd == TRACK_SLOPE_UP_60 && _currentTrackPieceDirection < 4)
{
@ -923,7 +919,7 @@ static void window_ride_construction_resize(rct_window* w)
}
if (_currentTrackSlopeEnd != TRACK_SLOPE_NONE)
{
if (is_track_enabled(TRACK_SLOPE_ROLL_BANKING))
if (IsTrackEnabled(TRACK_SLOPE_ROLL_BANKING))
{
if (_previousTrackSlopeEnd == TRACK_SLOPE_NONE)
{
@ -958,7 +954,7 @@ static void window_ride_construction_resize(rct_window* w)
}
if (_currentTrackCurve != TRACK_CURVE_NONE)
{
if (!is_track_enabled(TRACK_LIFT_HILL_CURVE))
if (!IsTrackEnabled(TRACK_LIFT_HILL_CURVE))
{
disabledWidgets |= (1ULL << WIDX_CHAIN_LIFT);
}
@ -979,7 +975,7 @@ static void window_ride_construction_resize(rct_window* w)
{
disabledWidgets |= (1ULL << WIDX_CHAIN_LIFT);
}
if (!is_track_enabled(TRACK_LIFT_HILL_STEEP))
if (!IsTrackEnabled(TRACK_LIFT_HILL_STEEP))
{
if (_previousTrackSlopeEnd == TRACK_SLOPE_UP_60 || _currentTrackSlopeEnd == TRACK_SLOPE_UP_60)
{
@ -1004,7 +1000,7 @@ static void window_ride_construction_resize(rct_window* w)
{
disabledWidgets |= (1ULL << WIDX_SLOPE_UP_STEEP);
if (_currentTrackCurve == TRACK_CURVE_LEFT || _currentTrackCurve == TRACK_CURVE_RIGHT
|| _rideConstructionState != RideConstructionState::Back || !is_track_enabled(TRACK_SLOPE_CURVE_BANKED))
|| _rideConstructionState != RideConstructionState::Back || !IsTrackEnabled(TRACK_SLOPE_CURVE_BANKED))
{
disabledWidgets |= (1ULL << WIDX_LEVEL);
}
@ -1013,13 +1009,13 @@ static void window_ride_construction_resize(rct_window* w)
{
disabledWidgets |= (1ULL << WIDX_SLOPE_DOWN_STEEP);
if (_currentTrackCurve == TRACK_CURVE_LEFT || _currentTrackCurve == TRACK_CURVE_RIGHT
|| _rideConstructionState != RideConstructionState::Front || !is_track_enabled(TRACK_SLOPE_CURVE_BANKED))
|| _rideConstructionState != RideConstructionState::Front || !IsTrackEnabled(TRACK_SLOPE_CURVE_BANKED))
{
disabledWidgets |= (1ULL << WIDX_LEVEL);
}
}
}
else if (is_track_enabled(TRACK_SLOPE_CURVE_BANKED))
else if (IsTrackEnabled(TRACK_SLOPE_CURVE_BANKED))
{
disabledWidgets |= (1ULL << WIDX_SLOPE_DOWN_STEEP) | (1ULL << WIDX_SLOPE_UP_STEEP);
if (_currentTrackBankEnd == TRACK_BANK_LEFT)
@ -1072,12 +1068,12 @@ static void window_ride_construction_resize(rct_window* w)
}
if ((_currentTrackLiftHill & CONSTRUCTION_LIFT_HILL_SELECTED) && !gCheatsEnableChainLiftOnAllTrack)
{
if (_currentTrackSlopeEnd != TRACK_SLOPE_NONE && !is_track_enabled(TRACK_LIFT_HILL_CURVE))
if (_currentTrackSlopeEnd != TRACK_SLOPE_NONE && !IsTrackEnabled(TRACK_LIFT_HILL_CURVE))
{
disabledWidgets |= (1ULL << WIDX_LEFT_CURVE_SMALL) | (1ULL << WIDX_LEFT_CURVE) | (1ULL << WIDX_LEFT_CURVE_LARGE)
| (1ULL << WIDX_RIGHT_CURVE_SMALL) | (1ULL << WIDX_RIGHT_CURVE) | (1ULL << WIDX_RIGHT_CURVE_LARGE);
}
if (!is_track_enabled(TRACK_LIFT_HILL_STEEP))
if (!IsTrackEnabled(TRACK_LIFT_HILL_STEEP))
{
if (w->widgets[WIDX_SLOPE_UP_STEEP].tooltip == STR_RIDE_CONSTRUCTION_STEEP_SLOPE_UP_TIP)
{
@ -1119,7 +1115,7 @@ static void window_ride_construction_resize(rct_window* w)
| (1ULL << WIDX_LEFT_CURVE_SMALL) | (1ULL << WIDX_LEFT_CURVE);
}
}
if (is_track_enabled(TRACK_HELIX_LARGE_UNBANKED))
if (IsTrackEnabled(TRACK_HELIX_LARGE_UNBANKED))
{
if (_currentTrackSlopeEnd == TRACK_SLOPE_NONE && _currentTrackBankEnd == TRACK_SLOPE_NONE)
{
@ -1134,8 +1130,8 @@ static void window_ride_construction_resize(rct_window* w)
}
}
else if (
(is_track_enabled(TRACK_HELIX_SMALL)
|| (is_track_enabled(TRACK_HELIX_LARGE) && _currentTrackCurve != TRACK_CURVE_LEFT_SMALL
(IsTrackEnabled(TRACK_HELIX_SMALL)
|| (IsTrackEnabled(TRACK_HELIX_LARGE) && _currentTrackCurve != TRACK_CURVE_LEFT_SMALL
&& _currentTrackCurve != TRACK_CURVE_RIGHT_SMALL))
&& (_currentTrackCurve == TRACK_CURVE_LEFT || _currentTrackCurve == TRACK_CURVE_RIGHT
|| _currentTrackCurve == TRACK_CURVE_LEFT_SMALL || _currentTrackCurve == TRACK_CURVE_RIGHT_SMALL)
@ -1148,7 +1144,7 @@ static void window_ride_construction_resize(rct_window* w)
disabledWidgets &= ~(1ULL << WIDX_SLOPE_UP_STEEP);
}
}
if (is_track_enabled(TRACK_SLOPE_CURVE_BANKED))
if (IsTrackEnabled(TRACK_SLOPE_CURVE_BANKED))
{
if (_rideConstructionState == RideConstructionState::Front)
{
@ -1240,13 +1236,13 @@ static void window_ride_construction_resize(rct_window* w)
*
* rct2: 0x006C6E6A
*/
static void window_ride_construction_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowRideConstructionMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
auto ride = get_ride(_currentRideIndex);
if (ride == nullptr)
return;
window_ride_construction_update_enabled_track_pieces();
WindowRideConstructionUpdateEnabledTrackPieces();
switch (widgetIndex)
{
case WIDX_LEFT_CURVE:
@ -1307,7 +1303,7 @@ static void window_ride_construction_mousedown(rct_window* w, rct_widgetindex wi
break;
case WIDX_SLOPE_DOWN_STEEP:
ride_construction_invalidate_current_track();
if (is_track_enabled(TRACK_HELIX_SMALL))
if (IsTrackEnabled(TRACK_HELIX_SMALL))
{
if (_currentTrackCurve == TRACK_CURVE_LEFT && _currentTrackBankEnd == TRACK_BANK_LEFT)
{
@ -1338,7 +1334,7 @@ static void window_ride_construction_mousedown(rct_window* w, rct_widgetindex wi
break;
}
}
if (is_track_enabled(TRACK_HELIX_LARGE))
if (IsTrackEnabled(TRACK_HELIX_LARGE))
{
if (_currentTrackCurve == TRACK_CURVE_LEFT && _currentTrackBankEnd == TRACK_BANK_LEFT)
{
@ -1355,7 +1351,7 @@ static void window_ride_construction_mousedown(rct_window* w, rct_widgetindex wi
break;
}
}
if (is_track_enabled(TRACK_HELIX_LARGE_UNBANKED))
if (IsTrackEnabled(TRACK_HELIX_LARGE_UNBANKED))
{
if (_currentTrackBankEnd == TRACK_BANK_NONE)
{
@ -1439,7 +1435,7 @@ static void window_ride_construction_mousedown(rct_window* w, rct_widgetindex wi
break;
case WIDX_SLOPE_UP_STEEP:
ride_construction_invalidate_current_track();
if (is_track_enabled(TRACK_HELIX_SMALL))
if (IsTrackEnabled(TRACK_HELIX_SMALL))
{
if (_currentTrackCurve == TRACK_CURVE_LEFT && _currentTrackBankEnd == TRACK_BANK_LEFT)
{
@ -1470,7 +1466,7 @@ static void window_ride_construction_mousedown(rct_window* w, rct_widgetindex wi
break;
}
}
if (is_track_enabled(TRACK_HELIX_LARGE))
if (IsTrackEnabled(TRACK_HELIX_LARGE))
{
if (_currentTrackCurve == TRACK_CURVE_LEFT && _currentTrackBankEnd == TRACK_BANK_LEFT)
{
@ -1487,7 +1483,7 @@ static void window_ride_construction_mousedown(rct_window* w, rct_widgetindex wi
break;
}
}
if (is_track_enabled(TRACK_HELIX_LARGE_UNBANKED))
if (IsTrackEnabled(TRACK_HELIX_LARGE_UNBANKED))
{
if (_currentTrackBankEnd == TRACK_BANK_NONE)
{
@ -1550,7 +1546,7 @@ static void window_ride_construction_mousedown(rct_window* w, rct_widgetindex wi
{
if (_rideConstructionState == RideConstructionState::Selected)
{
ride_construction_set_brakes_speed(brakesSpeed);
RideConstructionSetBrakesSpeed(brakesSpeed);
}
else
{
@ -1576,7 +1572,7 @@ static void window_ride_construction_mousedown(rct_window* w, rct_widgetindex wi
{
if (_rideConstructionState == RideConstructionState::Selected)
{
ride_construction_set_brakes_speed(brakesSpeed);
RideConstructionSetBrakesSpeed(brakesSpeed);
}
else
{
@ -1587,7 +1583,7 @@ static void window_ride_construction_mousedown(rct_window* w, rct_widgetindex wi
}
break;
case WIDX_SPECIAL_TRACK_DROPDOWN:
window_ride_construction_show_special_track_dropdown(w, widget);
WindowRideConstructionShowSpecialTrackDropdown(w, widget);
break;
case WIDX_U_TRACK:
ride_construction_invalidate_current_track();
@ -1608,7 +1604,7 @@ static void window_ride_construction_mousedown(rct_window* w, rct_widgetindex wi
{
if (_rideConstructionState == RideConstructionState::Selected)
{
ride_selected_track_set_seat_rotation(_currentSeatRotationAngle + 1);
RideSelectedTrackSetSeatRotation(_currentSeatRotationAngle + 1);
}
else
{
@ -1622,7 +1618,7 @@ static void window_ride_construction_mousedown(rct_window* w, rct_widgetindex wi
{
if (_rideConstructionState == RideConstructionState::Selected)
{
ride_selected_track_set_seat_rotation(_currentSeatRotationAngle - 1);
RideSelectedTrackSetSeatRotation(_currentSeatRotationAngle - 1);
}
else
{
@ -1638,7 +1634,7 @@ static void window_ride_construction_mousedown(rct_window* w, rct_widgetindex wi
*
* rct2: 0x006C78CD
*/
static void window_ride_construction_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowRideConstructionDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
{
if (widgetIndex != WIDX_SPECIAL_TRACK_DROPDOWN)
return;
@ -1779,7 +1775,7 @@ static void RideConstructPlacedBackwardGameActionCallback(const GameAction* ga,
*
* rct2: 0x006C9F72
*/
static void window_ride_construction_construct(rct_window* w)
static void WindowRideConstructionConstruct(rct_window* w)
{
ride_id_t rideIndex;
int32_t trackType, trackDirection, liftHillAndAlternativeState, properties;
@ -1853,7 +1849,7 @@ static void window_ride_construction_construct(rct_window* w)
*
* rct2: 0x006C9BA5
*/
static void window_ride_construction_mouseup_demolish(rct_window* w)
static void WindowRideConstructionMouseupDemolish(rct_window* w)
{
int32_t direction;
TileElement* tileElement;
@ -1971,7 +1967,7 @@ static void window_ride_construction_mouseup_demolish(rct_window* w)
*
* rct2: 0x006C78AA
*/
static void window_ride_construction_rotate(rct_window* w)
static void WindowRideConstructionRotate(rct_window* w)
{
_autoRotatingShop = false;
_currentTrackPieceDirection = (_currentTrackPieceDirection + 1) & 3;
@ -1984,7 +1980,7 @@ static void window_ride_construction_rotate(rct_window* w)
*
* rct2: 0x006C7802
*/
static void window_ride_construction_entrance_click(rct_window* w)
static void WindowRideConstructionEntranceClick(rct_window* w)
{
if (tool_set(w, WIDX_ENTRANCE, Tool::Crosshair))
{
@ -2014,7 +2010,7 @@ static void window_ride_construction_entrance_click(rct_window* w)
*
* rct2: 0x006C7866
*/
static void window_ride_construction_exit_click(rct_window* w)
static void WindowRideConstructionExitClick(rct_window* w)
{
if (tool_set(w, WIDX_EXIT, Tool::Crosshair))
{
@ -2044,7 +2040,7 @@ static void window_ride_construction_exit_click(rct_window* w)
*
* rct2: 0x006C8374
*/
static void window_ride_construction_update(rct_window* w)
static void WindowRideConstructionUpdate(rct_window* w)
{
auto ride = get_ride(_currentRideIndex);
if (ride == nullptr)
@ -2107,7 +2103,7 @@ static void window_ride_construction_update(rct_window* w)
*
* rct2: 0x006CC538
*/
static std::optional<CoordsXY> ride_get_place_position_from_screen_position(ScreenCoordsXY screenCoords)
static std::optional<CoordsXY> RideGetPlacePositionFromScreenPosition(ScreenCoordsXY screenCoords)
{
CoordsXY mapCoords;
@ -2214,7 +2210,7 @@ static std::optional<CoordsXY> ride_get_place_position_from_screen_position(Scre
*
* rct2: 0x006C8229
*/
static void window_ride_construction_toolupdate(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowRideConstructionToolupdate(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
{
switch (widgetIndex)
{
@ -2232,7 +2228,7 @@ static void window_ride_construction_toolupdate(rct_window* w, rct_widgetindex w
*
* rct2: 0x006C8248
*/
static void window_ride_construction_tooldown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowRideConstructionTooldown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
{
switch (widgetIndex)
{
@ -2241,7 +2237,7 @@ static void window_ride_construction_tooldown(rct_window* w, rct_widgetindex wid
break;
case WIDX_ENTRANCE:
case WIDX_EXIT:
ride_construction_tooldown_entrance_exit(screenCoords);
RideConstructionTooldownEntranceExit(screenCoords);
break;
}
}
@ -2250,7 +2246,7 @@ static void window_ride_construction_tooldown(rct_window* w, rct_widgetindex wid
*
* rct2: 0x006C6AD5
*/
static void window_ride_construction_invalidate(rct_window* w)
static void WindowRideConstructionInvalidate(rct_window* w)
{
auto ride = get_ride(_currentRideIndex);
if (ride == nullptr)
@ -2310,7 +2306,7 @@ static void window_ride_construction_invalidate(rct_window* w)
*
* rct2: 0x006C6B86
*/
static void window_ride_construction_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowRideConstructionPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
rct_drawpixelinfo clipdpi;
rct_widget* widget;
@ -2334,7 +2330,7 @@ static void window_ride_construction_paint(rct_window* w, rct_drawpixelinfo* dpi
height = widget->height() - 1;
if (clip_drawpixelinfo(&clipdpi, dpi, screenCoords, width, height))
{
window_ride_construction_draw_track_piece(
WindowRideConstructionDrawTrackPiece(
w, &clipdpi, rideIndex, trackType, trackDirection, liftHillAndInvertedState, width, height);
}
@ -2352,7 +2348,7 @@ static void window_ride_construction_paint(rct_window* w, rct_drawpixelinfo* dpi
}
}
static void window_ride_construction_draw_track_piece(
static void WindowRideConstructionDrawTrackPiece(
rct_window* w, rct_drawpixelinfo* dpi, ride_id_t rideIndex, int32_t trackType, int32_t trackDirection,
int32_t liftHillAndInvertedState, int32_t width, int32_t height)
{
@ -2386,7 +2382,7 @@ static void window_ride_construction_draw_track_piece(
dpi->x += rotatedScreenCoords.x - width / 2;
dpi->y += rotatedScreenCoords.y - height / 2 - 16;
sub_6CBCE2(dpi, rideIndex, trackType, trackDirection, liftHillAndInvertedState, { 4096, 4096 }, 1024);
Sub6CbcE2(dpi, rideIndex, trackType, trackDirection, liftHillAndInvertedState, { 4096, 4096 }, 1024);
}
static TileElement _tempTrackTileElement;
@ -2400,7 +2396,7 @@ static TileElement* _backupTileElementArrays[5];
* dl: rideIndex
* dh: trackType
*/
static void sub_6CBCE2(
static void Sub6CbcE2(
rct_drawpixelinfo* dpi, ride_id_t rideIndex, int32_t trackType, int32_t trackDirection, int32_t liftHillAndInvertedState,
const CoordsXY& originCoords, int32_t originZ)
{
@ -2486,17 +2482,17 @@ static void sub_6CBCE2(
*
* rct2: 0x006C84CE
*/
void window_ride_construction_update_active_elements_impl()
void WindowRideConstructionUpdateActiveElementsImpl()
{
rct_window* w;
TileElement* tileElement;
window_ride_construction_update_enabled_track_pieces();
WindowRideConstructionUpdateEnabledTrackPieces();
w = window_find_by_class(WC_RIDE_CONSTRUCTION);
if (w == nullptr)
return;
window_ride_construction_update_map_selection();
WindowRideConstructionUpdateMapSelection();
_selectedTrackType = TrackElemType::None;
if (_rideConstructionState == RideConstructionState::Selected)
@ -2513,15 +2509,15 @@ void window_ride_construction_update_active_elements_impl()
}
}
window_ride_construction_update_possible_ride_configurations();
window_ride_construction_update_widgets(w);
WindowRideConstructionUpdatePossibleRideConfigurations();
WindowRideConstructionUpdateWidgets(w);
}
/**
*
* rct2: 0x006C6A77
*/
void window_ride_construction_update_enabled_track_pieces()
void WindowRideConstructionUpdateEnabledTrackPieces()
{
auto ride = get_ride(_currentRideIndex);
if (ride == nullptr)
@ -2531,7 +2527,7 @@ void window_ride_construction_update_enabled_track_pieces()
if (rideEntry == nullptr)
return;
int32_t rideType = ride_get_alternative_type(ride);
int32_t rideType = RideGetAlternativeType(ride);
_enabledRidePieces = GetRideTypeDescriptor(rideType).GetAvailableTrackPieces();
}
@ -2660,7 +2656,7 @@ void UpdateGhostTrackAndArrow()
*
* rct2: 0x006C84E2
*/
static void window_ride_construction_update_map_selection()
static void WindowRideConstructionUpdateMapSelection()
{
int32_t trackType, trackDirection;
CoordsXYZ trackPos{};
@ -2697,7 +2693,7 @@ static void window_ride_construction_update_map_selection()
auto ride = get_ride(_currentRideIndex);
if (ride != nullptr)
{
window_ride_construction_select_map_tiles(ride, trackType, trackDirection, trackPos);
WindowRideConstructionSelectMapTiles(ride, trackType, trackDirection, trackPos);
map_invalidate_map_selection_tiles();
}
}
@ -2706,7 +2702,7 @@ static void window_ride_construction_update_map_selection()
*
* rct2: 0x006C8648
*/
static void window_ride_construction_update_possible_ride_configurations()
static void WindowRideConstructionUpdatePossibleRideConfigurations()
{
int32_t trackType;
@ -2726,7 +2722,7 @@ static void window_ride_construction_update_possible_ride_configurations()
if (trackTypeCategory == TRACK_NONE)
continue;
if (!is_track_enabled(trackTypeCategory))
if (!IsTrackEnabled(trackTypeCategory))
{
continue;
}
@ -2783,13 +2779,13 @@ static void window_ride_construction_update_possible_ride_configurations()
*
* rct2: 0x006C87F5
*/
static void window_ride_construction_update_widgets(rct_window* w)
static void WindowRideConstructionUpdateWidgets(rct_window* w)
{
auto ride = get_ride(_currentRideIndex);
if (ride == nullptr)
return;
int32_t rideType = ride_get_alternative_type(ride);
int32_t rideType = RideGetAlternativeType(ride);
w->hold_down_widgets = 0;
if (GetRideTypeDescriptor(rideType).HasFlag(RIDE_TYPE_FLAG_IS_SHOP) || !_stationConstructed)
@ -2814,7 +2810,7 @@ static void window_ride_construction_update_widgets(rct_window* w)
window_ride_construction_widgets[WIDX_SPECIAL_TRACK_DROPDOWN].type = WindowWidgetType::Button;
}
if (is_track_enabled(TRACK_STRAIGHT))
if (IsTrackEnabled(TRACK_STRAIGHT))
{
window_ride_construction_widgets[WIDX_STRAIGHT].type = WindowWidgetType::FlatBtn;
}
@ -2846,7 +2842,7 @@ static void window_ride_construction_update_widgets(rct_window* w)
window_ride_construction_widgets[WIDX_RIGHT_CURVE_SMALL].right = 137;
window_ride_construction_widgets[WIDX_LEFT_CURVE_SMALL].image = SPR_RIDE_CONSTRUCTION_LEFT_CURVE;
window_ride_construction_widgets[WIDX_RIGHT_CURVE_SMALL].image = SPR_RIDE_CONSTRUCTION_RIGHT_CURVE;
if (is_track_enabled(TRACK_CURVE_VERTICAL))
if (IsTrackEnabled(TRACK_CURVE_VERTICAL))
{
window_ride_construction_widgets[WIDX_LEFT_CURVE_SMALL].type = WindowWidgetType::FlatBtn;
window_ride_construction_widgets[WIDX_LEFT_CURVE_SMALL].left = 6;
@ -2857,7 +2853,7 @@ static void window_ride_construction_update_widgets(rct_window* w)
window_ride_construction_widgets[WIDX_RIGHT_CURVE_SMALL].right = 159;
window_ride_construction_widgets[WIDX_RIGHT_CURVE_SMALL].image = SPR_RIDE_CONSTRUCTION_RIGHT_CURVE_SMALL;
}
if (is_track_enabled(TRACK_CURVE))
if (IsTrackEnabled(TRACK_CURVE))
{
window_ride_construction_widgets[WIDX_LEFT_CURVE].type = WindowWidgetType::FlatBtn;
window_ride_construction_widgets[WIDX_RIGHT_CURVE].type = WindowWidgetType::FlatBtn;
@ -2868,12 +2864,12 @@ static void window_ride_construction_update_widgets(rct_window* w)
window_ride_construction_widgets[WIDX_RIGHT_CURVE_SMALL].right = 159;
window_ride_construction_widgets[WIDX_RIGHT_CURVE_SMALL].image = SPR_RIDE_CONSTRUCTION_RIGHT_CURVE_SMALL;
}
if (is_track_enabled(TRACK_CURVE_SMALL))
if (IsTrackEnabled(TRACK_CURVE_SMALL))
{
window_ride_construction_widgets[WIDX_LEFT_CURVE_SMALL].type = WindowWidgetType::FlatBtn;
window_ride_construction_widgets[WIDX_RIGHT_CURVE_SMALL].type = WindowWidgetType::FlatBtn;
}
if (is_track_enabled(TRACK_CURVE_VERY_SMALL))
if (IsTrackEnabled(TRACK_CURVE_VERY_SMALL))
{
window_ride_construction_widgets[WIDX_LEFT_CURVE_VERY_SMALL].type = WindowWidgetType::FlatBtn;
window_ride_construction_widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type = WindowWidgetType::FlatBtn;
@ -2893,16 +2889,16 @@ static void window_ride_construction_update_widgets(rct_window* w)
window_ride_construction_widgets[WIDX_LEVEL].type = WindowWidgetType::FlatBtn;
window_ride_construction_widgets[WIDX_SLOPE_UP].type = WindowWidgetType::FlatBtn;
}
if (is_track_enabled(TRACK_SLOPE) || is_track_enabled(TRACK_SLOPE_STEEP))
if (IsTrackEnabled(TRACK_SLOPE) || IsTrackEnabled(TRACK_SLOPE_STEEP))
{
window_ride_construction_widgets[WIDX_LEVEL].type = WindowWidgetType::FlatBtn;
}
if (is_track_enabled(TRACK_SLOPE))
if (IsTrackEnabled(TRACK_SLOPE))
{
window_ride_construction_widgets[WIDX_SLOPE_DOWN].type = WindowWidgetType::FlatBtn;
window_ride_construction_widgets[WIDX_SLOPE_UP].type = WindowWidgetType::FlatBtn;
}
if (is_track_enabled(TRACK_HELIX_SMALL) && _currentTrackBankEnd != TRACK_BANK_NONE
if (IsTrackEnabled(TRACK_HELIX_SMALL) && _currentTrackBankEnd != TRACK_BANK_NONE
&& _currentTrackSlopeEnd == TRACK_SLOPE_NONE)
{
if (_currentTrackCurve >= TRACK_CURVE_LEFT && _currentTrackCurve <= TRACK_CURVE_RIGHT_SMALL)
@ -2914,7 +2910,7 @@ static void window_ride_construction_update_widgets(rct_window* w)
}
}
if (is_track_enabled(TRACK_SLOPE_STEEP))
if (IsTrackEnabled(TRACK_SLOPE_STEEP))
{
window_ride_construction_widgets[WIDX_SLOPE_DOWN_STEEP].type = WindowWidgetType::FlatBtn;
if (rideType != RIDE_TYPE_SPLASH_BOATS && rideType != RIDE_TYPE_RIVER_RAFTS)
@ -2922,7 +2918,7 @@ static void window_ride_construction_update_widgets(rct_window* w)
}
int32_t x;
if ((is_track_enabled(TRACK_LIFT_HILL) && (_currentTrackCurve & RideConstructionSpecialPieceSelected) == 0)
if ((IsTrackEnabled(TRACK_LIFT_HILL) && (_currentTrackCurve & RideConstructionSpecialPieceSelected) == 0)
|| (gCheatsEnableChainLiftOnAllTrack && ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_HAS_TRACK)))
{
window_ride_construction_widgets[WIDX_CHAIN_LIFT].type = WindowWidgetType::FlatBtn;
@ -2945,7 +2941,7 @@ static void window_ride_construction_update_widgets(rct_window* w)
window_ride_construction_widgets[WIDX_SLOPE_UP_STEEP].tooltip = STR_RIDE_CONSTRUCTION_STEEP_SLOPE_UP_TIP;
window_ride_construction_widgets[WIDX_SLOPE_DOWN_STEEP].image = SPR_RIDE_CONSTRUCTION_SLOPE_DOWN_STEEP;
window_ride_construction_widgets[WIDX_SLOPE_DOWN_STEEP].tooltip = STR_RIDE_CONSTRUCTION_STEEP_SLOPE_DOWN_TIP;
if (is_track_enabled(TRACK_SLOPE_VERTICAL))
if (IsTrackEnabled(TRACK_SLOPE_VERTICAL))
{
if (_previousTrackSlopeEnd == TRACK_SLOPE_UP_60 || _previousTrackSlopeEnd == TRACK_SLOPE_UP_90)
{
@ -2977,7 +2973,7 @@ static void window_ride_construction_update_widgets(rct_window* w)
}
}
if (is_track_enabled(TRACK_HELIX_LARGE_UNBANKED) && _currentTrackSlopeEnd == TRACK_SLOPE_NONE
if (IsTrackEnabled(TRACK_HELIX_LARGE_UNBANKED) && _currentTrackSlopeEnd == TRACK_SLOPE_NONE
&& _currentTrackBankEnd == TRACK_BANK_NONE
&& (_currentTrackCurve == TRACK_CURVE_LEFT || _currentTrackCurve == TRACK_CURVE_RIGHT))
{
@ -3003,7 +2999,7 @@ static void window_ride_construction_update_widgets(rct_window* w)
window_ride_construction_widgets[WIDX_SLOPE_UP].right = tmp;
}
if ((is_track_enabled(TRACK_HELIX_LARGE) || is_track_enabled(TRACK_HELIX_SMALL))
if ((IsTrackEnabled(TRACK_HELIX_LARGE) || IsTrackEnabled(TRACK_HELIX_SMALL))
&& (_currentTrackCurve >= TRACK_CURVE_LEFT && _currentTrackCurve <= TRACK_CURVE_RIGHT_SMALL)
&& _currentTrackSlopeEnd == TRACK_SLOPE_NONE && _currentTrackBankEnd != TRACK_BANK_NONE)
{
@ -3061,7 +3057,7 @@ static void window_ride_construction_update_widgets(rct_window* w)
if (!brakesSelected && !boosterTrackSelected)
{
if (is_track_enabled(TRACK_FLAT_ROLL_BANKING))
if (IsTrackEnabled(TRACK_FLAT_ROLL_BANKING))
{
window_ride_construction_widgets[WIDX_BANK_LEFT].type = WindowWidgetType::FlatBtn;
window_ride_construction_widgets[WIDX_BANK_STRAIGHT].type = WindowWidgetType::FlatBtn;
@ -3302,7 +3298,7 @@ static void window_ride_construction_update_widgets(rct_window* w)
w->Invalidate();
}
static void window_ride_construction_select_map_tiles(
static void WindowRideConstructionSelectMapTiles(
Ride* ride, int32_t trackType, int32_t trackDirection, const CoordsXY& tileCoords)
{
// If the scenery tool is active, we do not display our tiles as it
@ -3332,7 +3328,7 @@ static void window_ride_construction_select_map_tiles(
*
* rct2: 0x006C776D
*/
static void window_ride_construction_show_special_track_dropdown(rct_window* w, rct_widget* widget)
static void WindowRideConstructionShowSpecialTrackDropdown(rct_window* w, rct_widget* widget)
{
int32_t defaultIndex = -1;
for (int32_t i = 0; i < _numCurrentPossibleRideConfigurations; i++)
@ -3370,7 +3366,7 @@ static void window_ride_construction_show_special_track_dropdown(rct_window* w,
*
* rct2: 0x006C7630
*/
static void ride_selected_track_set_seat_rotation(int32_t seatRotation)
static void RideSelectedTrackSetSeatRotation(int32_t seatRotation)
{
GetTrackElementOriginAndApplyChanges(
{ _currentTrackBegin, static_cast<Direction>(_currentTrackPieceDirection & 3) }, _currentTrackPieceType, seatRotation,
@ -3406,7 +3402,7 @@ static void UpdateLiftHillSelected(int32_t slope)
*
* rct2: 0x006C76E9
*/
static void ride_construction_set_brakes_speed(int32_t brakesSpeed)
static void RideConstructionSetBrakesSpeed(int32_t brakesSpeed)
{
TileElement* tileElement;
@ -3438,7 +3434,7 @@ void ride_construction_toolupdate_construct(const ScreenCoordsXY& screenCoords)
gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE;
gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_CONSTRUCT;
gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_ARROW;
auto mapCoords = ride_get_place_position_from_screen_position(screenCoords);
auto mapCoords = RideGetPlacePositionFromScreenPosition(screenCoords);
if (!mapCoords)
{
ride_construction_invalidate_current_track();
@ -3475,7 +3471,7 @@ void ride_construction_toolupdate_construct(const ScreenCoordsXY& screenCoords)
// Re-using this other code, very slight difference from original
// - Original code checks for MSB mask instead of 255 on trackPart->var_00
// - Original code checks this first as its already set origin tile, probably just a micro optimisation
window_ride_construction_select_map_tiles(ride, trackType, trackDirection, *mapCoords);
WindowRideConstructionSelectMapTiles(ride, trackType, trackDirection, *mapCoords);
gMapSelectArrowPosition.z = z;
if (_trackPlaceZ == 0)
@ -3711,7 +3707,7 @@ void ride_construction_tooldown_construct(const ScreenCoordsXY& screenCoords)
gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE;
gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_CONSTRUCT;
gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_ARROW;
auto ridePlacePosition = ride_get_place_position_from_screen_position(screenCoords);
auto ridePlacePosition = RideGetPlacePositionFromScreenPosition(screenCoords);
if (!ridePlacePosition)
return;
@ -3874,7 +3870,7 @@ void ride_construction_tooldown_construct(const ScreenCoordsXY& screenCoords)
*
* rct2: 0x006CCA73
*/
static void ride_construction_tooldown_entrance_exit(const ScreenCoordsXY& screenCoords)
static void RideConstructionTooldownEntranceExit(const ScreenCoordsXY& screenCoords)
{
ride_construction_invalidate_current_track();
map_invalidate_selection_rect();
@ -4449,7 +4445,7 @@ void window_ride_construction_keyboard_shortcut_slope_down()
switch (_currentTrackSlopeEnd)
{
case TRACK_SLOPE_DOWN_60:
if (is_track_enabled(TRACK_SLOPE_VERTICAL) && !WidgetIsDisabled(w, WIDX_SLOPE_UP_STEEP)
if (IsTrackEnabled(TRACK_SLOPE_VERTICAL) && !WidgetIsDisabled(w, WIDX_SLOPE_UP_STEEP)
&& window_ride_construction_widgets[WIDX_SLOPE_UP_STEEP].image == SPR_RIDE_CONSTRUCTION_VERTICAL_DROP
&& w->widgets[WIDX_SLOPE_UP_STEEP].type != WindowWidgetType::Empty)
{
@ -4469,7 +4465,7 @@ void window_ride_construction_keyboard_shortcut_slope_down()
window_event_mouse_down_call(w, WIDX_SLOPE_DOWN);
}
else if (
is_track_enabled(TRACK_SLOPE_VERTICAL)
IsTrackEnabled(TRACK_SLOPE_VERTICAL)
&& window_ride_construction_widgets[WIDX_SLOPE_DOWN_STEEP].image == SPR_RIDE_CONSTRUCTION_VERTICAL_RISE)
{
return;
@ -4519,7 +4515,7 @@ void window_ride_construction_keyboard_shortcut_slope_down()
window_event_mouse_down_call(w, WIDX_SLOPE_DOWN);
}
else if (
is_track_enabled(TRACK_SLOPE_VERTICAL)
IsTrackEnabled(TRACK_SLOPE_VERTICAL)
&& window_ride_construction_widgets[WIDX_SLOPE_DOWN_STEEP].image == SPR_RIDE_CONSTRUCTION_VERTICAL_RISE)
{
return;
@ -4536,7 +4532,7 @@ void window_ride_construction_keyboard_shortcut_slope_down()
}
break;
case TRACK_SLOPE_UP_90:
if (is_track_enabled(TRACK_SLOPE_VERTICAL) && !WidgetIsDisabled(w, WIDX_SLOPE_UP_STEEP)
if (IsTrackEnabled(TRACK_SLOPE_VERTICAL) && !WidgetIsDisabled(w, WIDX_SLOPE_UP_STEEP)
&& window_ride_construction_widgets[WIDX_SLOPE_DOWN_STEEP].image == SPR_RIDE_CONSTRUCTION_VERTICAL_RISE
&& w->widgets[WIDX_SLOPE_DOWN_STEEP].type != WindowWidgetType::Empty)
{
@ -4559,7 +4555,7 @@ void window_ride_construction_keyboard_shortcut_slope_up()
switch (_currentTrackSlopeEnd)
{
case TRACK_SLOPE_UP_60:
if (is_track_enabled(TRACK_SLOPE_VERTICAL) && !WidgetIsDisabled(w, WIDX_SLOPE_DOWN_STEEP)
if (IsTrackEnabled(TRACK_SLOPE_VERTICAL) && !WidgetIsDisabled(w, WIDX_SLOPE_DOWN_STEEP)
&& window_ride_construction_widgets[WIDX_SLOPE_DOWN_STEEP].image == SPR_RIDE_CONSTRUCTION_VERTICAL_RISE
&& w->widgets[WIDX_SLOPE_DOWN_STEEP].type != WindowWidgetType::Empty)
{
@ -4578,7 +4574,7 @@ void window_ride_construction_keyboard_shortcut_slope_up()
window_event_mouse_down_call(w, WIDX_SLOPE_UP);
}
else if (
is_track_enabled(TRACK_SLOPE_VERTICAL)
IsTrackEnabled(TRACK_SLOPE_VERTICAL)
&& window_ride_construction_widgets[WIDX_SLOPE_UP_STEEP].image == SPR_RIDE_CONSTRUCTION_VERTICAL_DROP)
{
return;
@ -4626,7 +4622,7 @@ void window_ride_construction_keyboard_shortcut_slope_up()
window_event_mouse_down_call(w, WIDX_SLOPE_UP);
}
else if (
is_track_enabled(TRACK_SLOPE_VERTICAL)
IsTrackEnabled(TRACK_SLOPE_VERTICAL)
&& window_ride_construction_widgets[WIDX_SLOPE_UP_STEEP].image == SPR_RIDE_CONSTRUCTION_VERTICAL_DROP)
{
return;
@ -4642,7 +4638,7 @@ void window_ride_construction_keyboard_shortcut_slope_up()
}
break;
case TRACK_SLOPE_DOWN_90:
if (is_track_enabled(TRACK_SLOPE_VERTICAL) && !WidgetIsDisabled(w, WIDX_SLOPE_DOWN_STEEP)
if (IsTrackEnabled(TRACK_SLOPE_VERTICAL) && !WidgetIsDisabled(w, WIDX_SLOPE_DOWN_STEEP)
&& window_ride_construction_widgets[WIDX_SLOPE_UP_STEEP].image == SPR_RIDE_CONSTRUCTION_VERTICAL_DROP
&& w->widgets[WIDX_SLOPE_DOWN_STEEP].type != WindowWidgetType::Empty)
{
@ -4782,7 +4778,7 @@ void window_ride_construction_keyboard_shortcut_demolish_current()
window_event_mouse_up_call(w, WIDX_DEMOLISH);
}
static bool track_piece_direction_is_diagonal(const uint8_t direction)
static bool TrackPieceDirectionIsDiagonal(const uint8_t direction)
{
return direction >= 4;
}

4
src/openrct2-ui/windows/RideList.cpp
View File

@ -912,7 +912,7 @@ private:
*
* rct2: 0x006B30BC
*/
rct_window* window_ride_list_open()
rct_window* WindowRideListOpen()
{
// Check if window is already open
auto* window = window_bring_to_front_by_class(WC_RIDE_LIST);
@ -923,7 +923,7 @@ rct_window* window_ride_list_open()
return window;
}
void window_ride_list_refresh_list(rct_window* w)
void WindowRideListRefreshList(rct_window* w)
{
dynamic_cast<RideListWindow*>(w)->RefreshListWrapper();
}

26
src/openrct2-ui/windows/SavePrompt.cpp
View File

@ -67,16 +67,16 @@ static constexpr const rct_string_id window_save_prompt_labels[][2] = {
};
static void window_save_prompt_close(rct_window *w);
static void window_save_prompt_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_save_prompt_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_save_prompt_callback(int32_t result, const utf8 * path);
static void WindowSavePromptClose(rct_window *w);
static void WindowSavePromptMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowSavePromptPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowSavePromptCallback(int32_t result, const utf8 * path);
static rct_window_event_list window_save_prompt_events([](auto& events)
{
events.close = &window_save_prompt_close;
events.mouse_up = &window_save_prompt_mouseup;
events.paint = &window_save_prompt_paint;
events.close = &WindowSavePromptClose;
events.mouse_up = &WindowSavePromptMouseup;
events.paint = &WindowSavePromptPaint;
});
// clang-format on
@ -84,7 +84,7 @@ static rct_window_event_list window_save_prompt_events([](auto& events)
*
* rct2: 0x0066DCBE
*/
rct_window* window_save_prompt_open()
rct_window* WindowSavePromptOpen()
{
int32_t width, height;
rct_string_id stringId;
@ -176,7 +176,7 @@ rct_window* window_save_prompt_open()
*
* rct2: 0x0066DF17
*/
static void window_save_prompt_close(rct_window* w)
static void WindowSavePromptClose(rct_window* w)
{
// Unpause the game
if (network_get_mode() == NETWORK_MODE_NONE)
@ -192,7 +192,7 @@ static void window_save_prompt_close(rct_window* w)
*
* rct2: 0x0066DDF2
*/
static void window_save_prompt_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowSavePromptMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
if (gScreenFlags & (SCREEN_FLAGS_TITLE_DEMO | SCREEN_FLAGS_TRACK_DESIGNER | SCREEN_FLAGS_TRACK_MANAGER))
{
@ -226,7 +226,7 @@ static void window_save_prompt_mouseup(rct_window* w, rct_widgetindex widgetInde
intent = static_cast<Intent*>(create_save_game_as_intent());
}
window_close(w);
intent->putExtra(INTENT_EXTRA_CALLBACK, reinterpret_cast<void*>(window_save_prompt_callback));
intent->putExtra(INTENT_EXTRA_CALLBACK, reinterpret_cast<void*>(WindowSavePromptCallback));
context_open_intent(intent);
delete intent;
break;
@ -241,12 +241,12 @@ static void window_save_prompt_mouseup(rct_window* w, rct_widgetindex widgetInde
}
}
static void window_save_prompt_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowSavePromptPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
}
static void window_save_prompt_callback(int32_t result, const utf8* path)
static void WindowSavePromptCallback(int32_t result, const utf8* path)
{
if (result == MODAL_RESULT_OK)
{

102
src/openrct2-ui/windows/ScenarioSelect.cpp
View File

@ -100,17 +100,17 @@ static constexpr const rct_string_id ScenarioOriginStringIds[] = {
STR_SCENARIO_CATEGORY_OTHER_PARKS,
};
static void window_scenarioselect_init_tabs(rct_window *w);
static void WindowScenarioselectInitTabs(rct_window *w);
static void window_scenarioselect_close(rct_window *w);
static void window_scenarioselect_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_scenarioselect_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget);
static void window_scenarioselect_scrollgetsize(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void window_scenarioselect_scrollmousedown(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void window_scenarioselect_scrollmouseover(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void window_scenarioselect_invalidate(rct_window *w);
static void window_scenarioselect_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_scenarioselect_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
static void WindowScenarioselectClose(rct_window *w);
static void WindowScenarioselectMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowScenarioselectMousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowScenarioselectScrollgetsize(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void WindowScenarioselectScrollmousedown(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowScenarioselectScrollmouseover(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowScenarioselectInvalidate(rct_window *w);
static void WindowScenarioselectPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowScenarioselectScrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
static bool ScenarioSelectUseSmallFont()
{
@ -119,23 +119,23 @@ static bool ScenarioSelectUseSmallFont()
static rct_window_event_list window_scenarioselect_events([](auto& events)
{
events.close = &window_scenarioselect_close;
events.mouse_up = &window_scenarioselect_mouseup;
events.mouse_down = &window_scenarioselect_mousedown;
events.get_scroll_size = &window_scenarioselect_scrollgetsize;
events.scroll_mousedown = &window_scenarioselect_scrollmousedown;
events.scroll_mouseover = &window_scenarioselect_scrollmouseover;
events.invalidate = &window_scenarioselect_invalidate;
events.paint = &window_scenarioselect_paint;
events.scroll_paint = &window_scenarioselect_scrollpaint;
events.close = &WindowScenarioselectClose;
events.mouse_up = &WindowScenarioselectMouseup;
events.mouse_down = &WindowScenarioselectMousedown;
events.get_scroll_size = &WindowScenarioselectScrollgetsize;
events.scroll_mousedown = &WindowScenarioselectScrollmousedown;
events.scroll_mouseover = &WindowScenarioselectScrollmouseover;
events.invalidate = &WindowScenarioselectInvalidate;
events.paint = &WindowScenarioselectPaint;
events.scroll_paint = &WindowScenarioselectScrollpaint;
});
// clang-format on
static void draw_category_heading(
static void DrawCategoryHeading(
rct_window* w, rct_drawpixelinfo* dpi, int32_t left, int32_t right, int32_t y, rct_string_id stringId);
static void initialise_list_items(rct_window* w);
static bool is_scenario_visible(rct_window* w, const scenario_index_entry* scenario);
static bool is_locking_enabled(rct_window* w);
static void InitialiseListItems(rct_window* w);
static bool IsScenarioVisible(rct_window* w, const scenario_index_entry* scenario);
static bool IsLockingEnabled(rct_window* w);
static std::function<void(std::string_view)> _callback;
static bool _showLockedInformation = false;
@ -151,7 +151,7 @@ static int32_t ScenarioSelectGetWindowWidth()
return WW;
}
rct_window* window_scenarioselect_open(scenarioselect_callback callback, bool titleEditor)
rct_window* WindowScenarioselectOpen(scenarioselect_callback callback, bool titleEditor)
{
if (_titleEditor != titleEditor)
{
@ -163,7 +163,7 @@ rct_window* window_scenarioselect_open(scenarioselect_callback callback, bool ti
if (window != nullptr)
return window;
return window_scenarioselect_open(
return WindowScenarioselectOpen(
[callback](std::string_view scenario) { callback(std::string(scenario).c_str()); }, titleEditor, titleEditor);
}
@ -171,7 +171,7 @@ rct_window* window_scenarioselect_open(scenarioselect_callback callback, bool ti
*
* rct2: 0x006781B5
*/
rct_window* window_scenarioselect_open(std::function<void(std::string_view)> callback, bool titleEditor, bool disableLocking)
rct_window* WindowScenarioselectOpen(std::function<void(std::string_view)> callback, bool titleEditor, bool disableLocking)
{
rct_window* window;
int32_t windowWidth;
@ -192,8 +192,8 @@ rct_window* window_scenarioselect_open(std::function<void(std::string_view)> cal
window->enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_TAB1) | (1ULL << WIDX_TAB2) | (1ULL << WIDX_TAB3)
| (1ULL << WIDX_TAB4) | (1ULL << WIDX_TAB5) | (1ULL << WIDX_TAB6) | (1ULL << WIDX_TAB7) | (1ULL << WIDX_TAB8);
window_scenarioselect_init_tabs(window);
initialise_list_items(window);
WindowScenarioselectInitTabs(window);
InitialiseListItems(window);
WindowInitScrollWidgets(window);
window->highlighted_scenario = nullptr;
@ -205,7 +205,7 @@ rct_window* window_scenarioselect_open(std::function<void(std::string_view)> cal
*
* rct2: 0x00677C8A
*/
static void window_scenarioselect_init_tabs(rct_window* w)
static void WindowScenarioselectInitTabs(rct_window* w)
{
int32_t showPages = 0;
size_t numScenarios = scenario_repository_get_count();
@ -259,13 +259,13 @@ static void window_scenarioselect_init_tabs(rct_window* w)
}
}
static void window_scenarioselect_close(rct_window* w)
static void WindowScenarioselectClose(rct_window* w)
{
_listItems.clear();
_listItems.shrink_to_fit();
}
static void window_scenarioselect_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowScenarioselectMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
if (widgetIndex == WIDX_CLOSE)
{
@ -273,7 +273,7 @@ static void window_scenarioselect_mouseup(rct_window* w, rct_widgetindex widgetI
}
}
static void window_scenarioselect_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowScenarioselectMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
if (widgetIndex >= WIDX_TAB1 && widgetIndex <= WIDX_TAB8)
{
@ -281,7 +281,7 @@ static void window_scenarioselect_mousedown(rct_window* w, rct_widgetindex widge
w->highlighted_scenario = nullptr;
gConfigInterface.scenarioselect_last_tab = w->selected_tab;
config_save_default();
initialise_list_items(w);
InitialiseListItems(w);
w->Invalidate();
window_event_resize_call(w);
window_event_invalidate_call(w);
@ -290,7 +290,7 @@ static void window_scenarioselect_mousedown(rct_window* w, rct_widgetindex widge
}
}
static int32_t get_scenario_list_item_size()
static int32_t GetScenarioListItemSize()
{
if (!LocalisationService_UseTrueTypeFont())
return 24;
@ -304,9 +304,9 @@ static int32_t get_scenario_list_item_size()
return lineHeight;
}
static void window_scenarioselect_scrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
static void WindowScenarioselectScrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
{
const int32_t scenarioItemHeight = get_scenario_list_item_size();
const int32_t scenarioItemHeight = GetScenarioListItemSize();
int32_t y = 0;
for (const auto& listItem : _listItems)
@ -328,9 +328,9 @@ static void window_scenarioselect_scrollgetsize(rct_window* w, int32_t scrollInd
*
* rct2: 0x6780FE
*/
static void window_scenarioselect_scrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
static void WindowScenarioselectScrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
{
const int32_t scenarioItemHeight = get_scenario_list_item_size();
const int32_t scenarioItemHeight = GetScenarioListItemSize();
auto mutableScreenCoords = screenCoords;
for (const auto& listItem : _listItems)
@ -365,9 +365,9 @@ static void window_scenarioselect_scrollmousedown(rct_window* w, int32_t scrollI
*
* rct2: 0x678162
*/
static void window_scenarioselect_scrollmouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
static void WindowScenarioselectScrollmouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
{
const int32_t scenarioItemHeight = get_scenario_list_item_size();
const int32_t scenarioItemHeight = GetScenarioListItemSize();
bool originalShowLockedInformation = _showLockedInformation;
_showLockedInformation = false;
@ -412,7 +412,7 @@ static void window_scenarioselect_scrollmouseover(rct_window* w, int32_t scrollI
}
}
static void window_scenarioselect_invalidate(rct_window* w)
static void WindowScenarioselectInvalidate(rct_window* w)
{
w->pressed_widgets &= ~(
(1ULL << WIDX_CLOSE) | (1ULL << WIDX_TAB1) | (1ULL << WIDX_TAB2) | (1ULL << WIDX_TAB3) | (1ULL << WIDX_TAB4)
@ -436,7 +436,7 @@ static void window_scenarioselect_invalidate(rct_window* w)
window_scenarioselect_widgets[WIDX_SCENARIOLIST].bottom = windowHeight - bottomMargin;
}
static void window_scenarioselect_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowScenarioselectPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
int32_t format;
const scenario_index_entry* scenario;
@ -555,7 +555,7 @@ static void window_scenarioselect_paint(rct_window* w, rct_drawpixelinfo* dpi)
}
}
static void window_scenarioselect_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
static void WindowScenarioselectScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
{
uint8_t paletteIndex = ColourMapA[w->colours[1]].mid_light;
gfx_clear(dpi, paletteIndex);
@ -566,7 +566,7 @@ static void window_scenarioselect_scrollpaint(rct_window* w, rct_drawpixelinfo*
const auto& listWidget = w->widgets[WIDX_SCENARIOLIST];
int32_t listWidth = listWidget.width() - 12;
const int32_t scenarioItemHeight = get_scenario_list_item_size();
const int32_t scenarioItemHeight = GetScenarioListItemSize();
// Scenario title
int32_t scenarioTitleHeight = font_get_line_height(FontSpriteBase::MEDIUM);
@ -584,7 +584,7 @@ static void window_scenarioselect_scrollpaint(rct_window* w, rct_drawpixelinfo*
case LIST_ITEM_TYPE::HEADING:
{
const int32_t horizontalRuleMargin = 4;
draw_category_heading(
DrawCategoryHeading(
w, dpi, horizontalRuleMargin, listWidth - horizontalRuleMargin, y + 2, listItem.heading.string_id);
y += 18;
break;
@ -647,7 +647,7 @@ static void window_scenarioselect_scrollpaint(rct_window* w, rct_drawpixelinfo*
}
}
static void draw_category_heading(
static void DrawCategoryHeading(
rct_window* w, rct_drawpixelinfo* dpi, int32_t left, int32_t right, int32_t y, rct_string_id stringId)
{
colour_t baseColour = w->colours[1];
@ -686,7 +686,7 @@ static void draw_category_heading(
gfx_draw_line(dpi, { darkLineLeftTop2, darkLineRightBottom2 }, darkColour);
}
static void initialise_list_items(rct_window* w)
static void InitialiseListItems(rct_window* w)
{
size_t numScenarios = scenario_repository_get_count();
_listItems.clear();
@ -702,7 +702,7 @@ static void initialise_list_items(rct_window* w)
{
const scenario_index_entry* scenario = scenario_repository_get_by_index(i);
if (!is_scenario_visible(w, scenario))
if (!IsScenarioVisible(w, scenario))
continue;
if (_titleEditor && scenario->source_game == ScenarioSource::Other)
continue;
@ -754,7 +754,7 @@ static void initialise_list_items(rct_window* w)
sc_list_item scenarioItem;
scenarioItem.type = LIST_ITEM_TYPE::SCENARIO;
scenarioItem.scenario.scenario = scenario;
if (is_locking_enabled(w))
if (IsLockingEnabled(w))
{
scenarioItem.scenario.is_locked = numUnlocks <= 0;
if (scenario->highscore == nullptr)
@ -810,7 +810,7 @@ static void initialise_list_items(rct_window* w)
}
}
static bool is_scenario_visible(rct_window* w, const scenario_index_entry* scenario)
static bool IsScenarioVisible(rct_window* w, const scenario_index_entry* scenario)
{
if (gConfigGeneral.scenario_select_mode == SCENARIO_SELECT_MODE_ORIGIN || _titleEditor)
{
@ -834,7 +834,7 @@ static bool is_scenario_visible(rct_window* w, const scenario_index_entry* scena
return true;
}
static bool is_locking_enabled(rct_window* w)
static bool IsLockingEnabled(rct_window* w)
{
if (gConfigGeneral.scenario_select_mode != SCENARIO_SELECT_MODE_ORIGIN)
return false;

196
src/openrct2-ui/windows/Scenery.cpp
View File

@ -33,37 +33,37 @@ constexpr int32_t SCENERY_BUTTON_WIDTH = 66;
constexpr int32_t SCENERY_BUTTON_HEIGHT = 80;
// clang-format off
static void window_scenery_close(rct_window *w);
static void window_scenery_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_scenery_resize(rct_window *w);
static void window_scenery_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget);
static void window_scenery_dropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void window_scenery_update(rct_window *w);
static void window_scenery_periodic_update(rct_window *w);
static void window_scenery_scrollgetsize(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void window_scenery_scrollmousedown(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void window_scenery_scrollmouseover(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static OpenRCT2String window_scenery_tooltip(rct_window* w, const rct_widgetindex widgetIndex, const rct_string_id fallback);
static void window_scenery_invalidate(rct_window *w);
static void window_scenery_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_scenery_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
static void WindowSceneryClose(rct_window *w);
static void WindowSceneryMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowSceneryResize(rct_window *w);
static void WindowSceneryMousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowSceneryDropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowSceneryUpdate(rct_window *w);
static void WindowSceneryPeriodicUpdate(rct_window *w);
static void WindowSceneryScrollgetsize(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void WindowSceneryScrollmousedown(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowSceneryScrollmouseover(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static OpenRCT2String WindowSceneryTooltip(rct_window* w, const rct_widgetindex widgetIndex, const rct_string_id fallback);
static void WindowSceneryInvalidate(rct_window *w);
static void WindowSceneryPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowSceneryScrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
static rct_window_event_list window_scenery_events([](auto& events)
{
events.close = &window_scenery_close;
events.mouse_up = &window_scenery_mouseup;
events.resize = &window_scenery_resize;
events.mouse_down = &window_scenery_mousedown;
events.dropdown = &window_scenery_dropdown;
events.update = &window_scenery_update;
events.periodic_update = &window_scenery_periodic_update;
events.get_scroll_size = &window_scenery_scrollgetsize;
events.scroll_mousedown = &window_scenery_scrollmousedown;
events.scroll_mouseover = &window_scenery_scrollmouseover;
events.tooltip = &window_scenery_tooltip;
events.invalidate = &window_scenery_invalidate;
events.paint = &window_scenery_paint;
events.scroll_paint = &window_scenery_scrollpaint;
events.close = &WindowSceneryClose;
events.mouse_up = &WindowSceneryMouseup;
events.resize = &WindowSceneryResize;
events.mouse_down = &WindowSceneryMousedown;
events.dropdown = &WindowSceneryDropdown;
events.update = &WindowSceneryUpdate;
events.periodic_update = &WindowSceneryPeriodicUpdate;
events.get_scroll_size = &WindowSceneryScrollgetsize;
events.scroll_mousedown = &WindowSceneryScrollmousedown;
events.scroll_mouseover = &WindowSceneryScrollmouseover;
events.tooltip = &WindowSceneryTooltip;
events.invalidate = &WindowSceneryInvalidate;
events.paint = &WindowSceneryPaint;
events.scroll_paint = &WindowSceneryScrollpaint;
});
@ -102,7 +102,7 @@ static rct_widget WindowSceneryBaseWidgets[] = {
};
// clang-format on
void window_scenery_update_scroll(rct_window* w);
void WindowSceneryUpdateScroll(rct_window* w);
struct SceneryTabInfo
{
@ -181,7 +181,7 @@ static SceneryTabInfo* GetSceneryTabInfoForGroup(const ObjectEntryIndex sceneryG
return nullptr;
}
static std::optional<size_t> window_scenery_find_tab_with_scenery(const ScenerySelection& scenery)
static std::optional<size_t> WindowSceneryFindTabWithScenery(const ScenerySelection& scenery)
{
for (size_t i = 0; i < _tabEntries.size(); i++)
{
@ -194,14 +194,14 @@ static std::optional<size_t> window_scenery_find_tab_with_scenery(const SceneryS
return std::nullopt;
}
static void init_scenery_entry(const ScenerySelection& selection, const ObjectEntryIndex sceneryGroupIndex)
static void InitSceneryEntry(const ScenerySelection& selection, const ObjectEntryIndex sceneryGroupIndex)
{
Guard::ArgumentInRange<int32_t>(selection.EntryIndex, 0, OBJECT_ENTRY_INDEX_NULL);
if (IsSceneryAvailableToBuild(selection))
{
// Get current tab
const auto tabIndex = window_scenery_find_tab_with_scenery(selection);
const auto tabIndex = WindowSceneryFindTabWithScenery(selection);
// Add scenery to primary group (usually trees or path additions)
if (sceneryGroupIndex != OBJECT_ENTRY_INDEX_NULL)
@ -226,7 +226,7 @@ static void init_scenery_entry(const ScenerySelection& selection, const ObjectEn
}
}
static void window_scenery_sort_tabs()
static void WindowScenerySortTabs()
{
std::sort(_tabEntries.begin(), _tabEntries.end(), [](const SceneryTabInfo& a, const SceneryTabInfo& b) {
if (a.SceneryGroupIndex == b.SceneryGroupIndex)
@ -243,7 +243,7 @@ static void window_scenery_sort_tabs()
});
}
static void window_scenery_prepare_widgets(rct_window* w)
static void WindowSceneryPrepareWidgets(rct_window* w)
{
// Add the base widgets
_widgets.clear();
@ -297,7 +297,7 @@ static void window_scenery_prepare_widgets(rct_window* w)
*
* rct2: 0x006DFA00
*/
static void window_scenery_init(rct_window* w)
static void WindowSceneryInit(rct_window* w)
{
_tabEntries.clear();
@ -333,7 +333,7 @@ static void window_scenery_init(rct_window* w)
const auto* sceneryEntry = get_small_scenery_entry(sceneryId);
if (sceneryEntry != nullptr)
{
init_scenery_entry({ SCENERY_TYPE_SMALL, sceneryId }, sceneryEntry->scenery_tab_id);
InitSceneryEntry({ SCENERY_TYPE_SMALL, sceneryId }, sceneryEntry->scenery_tab_id);
}
}
@ -343,7 +343,7 @@ static void window_scenery_init(rct_window* w)
const auto* sceneryEntry = get_large_scenery_entry(sceneryId);
if (sceneryEntry != nullptr)
{
init_scenery_entry({ SCENERY_TYPE_LARGE, sceneryId }, sceneryEntry->scenery_tab_id);
InitSceneryEntry({ SCENERY_TYPE_LARGE, sceneryId }, sceneryEntry->scenery_tab_id);
}
}
@ -353,7 +353,7 @@ static void window_scenery_init(rct_window* w)
const auto* sceneryEntry = get_wall_entry(sceneryId);
if (sceneryEntry != nullptr)
{
init_scenery_entry({ SCENERY_TYPE_WALL, sceneryId }, sceneryEntry->scenery_tab_id);
InitSceneryEntry({ SCENERY_TYPE_WALL, sceneryId }, sceneryEntry->scenery_tab_id);
}
}
@ -363,7 +363,7 @@ static void window_scenery_init(rct_window* w)
const auto* sceneryEntry = get_banner_entry(sceneryId);
if (sceneryEntry != nullptr)
{
init_scenery_entry({ SCENERY_TYPE_BANNER, sceneryId }, sceneryEntry->scenery_tab_id);
InitSceneryEntry({ SCENERY_TYPE_BANNER, sceneryId }, sceneryEntry->scenery_tab_id);
}
}
@ -373,7 +373,7 @@ static void window_scenery_init(rct_window* w)
const auto* sceneryEntry = get_footpath_item_entry(sceneryId);
if (sceneryEntry != nullptr)
{
init_scenery_entry({ SCENERY_TYPE_PATH_ITEM, sceneryId }, sceneryEntry->scenery_tab_id);
InitSceneryEntry({ SCENERY_TYPE_PATH_ITEM, sceneryId }, sceneryEntry->scenery_tab_id);
}
}
@ -383,17 +383,17 @@ static void window_scenery_init(rct_window* w)
_tabEntries.pop_back();
}
window_scenery_sort_tabs();
window_scenery_prepare_widgets(w);
WindowScenerySortTabs();
WindowSceneryPrepareWidgets(w);
window_invalidate_by_class(WC_SCENERY);
}
void window_scenery_init()
void WindowSceneryInit()
{
auto* w = window_find_by_class(WC_SCENERY);
if (w != nullptr)
{
window_scenery_init(w);
WindowSceneryInit(w);
}
}
@ -401,14 +401,14 @@ void window_scenery_init()
*
* rct2: 0x006DFEE4
*/
void window_scenery_set_default_placement_configuration()
void WindowScenerySetDefaultPlacementConfiguration()
{
gWindowSceneryRotation = 3;
gWindowSceneryPrimaryColour = COLOUR_BORDEAUX_RED;
gWindowScenerySecondaryColour = COLOUR_YELLOW;
gWindowSceneryTertiaryColour = COLOUR_DARK_BROWN;
window_scenery_init();
WindowSceneryInit();
gWindowSceneryTabSelections.clear();
gWindowSceneryActiveTabIndex = 0;
@ -418,7 +418,7 @@ void window_scenery_set_default_placement_configuration()
*
* rct2: 0x006E0FEF
*/
rct_window* window_scenery_open()
rct_window* WindowSceneryOpen()
{
// Check if window is already open
auto* window = window_bring_to_front_by_class(WC_SCENERY);
@ -429,10 +429,10 @@ rct_window* window_scenery_open()
ScreenCoordsXY(context_get_width() - WINDOW_SCENERY_WIDTH, 0x1D), WINDOW_SCENERY_WIDTH, WINDOW_SCENERY_HEIGHT,
&window_scenery_events, WC_SCENERY, WF_NO_SCROLLING);
window_scenery_init(window);
WindowSceneryInit(window);
WindowInitScrollWidgets(window);
window_scenery_update_scroll(window);
WindowSceneryUpdateScroll(window);
show_gridlines();
gWindowSceneryRotation = 3;
gSceneryCtrlPressed = false;
@ -454,7 +454,7 @@ rct_window* window_scenery_open()
return window;
}
static int32_t window_scenery_get_num_columns(const rct_window* w)
static int32_t WindowSceneryGetNumColumns(const rct_window* w)
{
const auto* listWidget = &w->widgets[WIDX_SCENERY_LIST];
const auto contentWidth = listWidget->width() - SCROLLBAR_WIDTH;
@ -465,7 +465,7 @@ static int32_t window_scenery_get_num_columns(const rct_window* w)
*
* rct2: 0x006E1A73
*/
void window_scenery_close(rct_window* w)
void WindowSceneryClose(rct_window* w)
{
scenery_remove_ghost_tool_placement();
hide_gridlines();
@ -478,13 +478,13 @@ void window_scenery_close(rct_window* w)
tool_cancel();
}
template<typename T> constexpr static T window_scenery_count_rows(const rct_window* w, T items)
template<typename T> constexpr static T WindowSceneryCountRows(const rct_window* w, T items)
{
const auto rows = items / window_scenery_get_num_columns(w);
const auto rows = items / WindowSceneryGetNumColumns(w);
return rows;
}
static size_t window_scenery_count_rows(const rct_window* w)
static size_t WindowSceneryCountRows(const rct_window* w)
{
const auto tabIndex = gWindowSceneryActiveTabIndex;
if (tabIndex >= _tabEntries.size())
@ -493,8 +493,8 @@ static size_t window_scenery_count_rows(const rct_window* w)
}
const auto totalItems = _tabEntries[tabIndex].Entries.size();
const auto numColumns = window_scenery_get_num_columns(w);
const auto rows = window_scenery_count_rows(w, totalItems + numColumns - 1);
const auto numColumns = WindowSceneryGetNumColumns(w);
const auto rows = WindowSceneryCountRows(w, totalItems + numColumns - 1);
return rows;
}
@ -505,7 +505,7 @@ struct scenery_item
ScenerySelection scenerySelection;
};
static scenery_item window_scenery_count_rows_with_selected_item(rct_window* w, const size_t tabIndex)
static scenery_item WindowSceneryCountRowsWithSelectedItem(rct_window* w, const size_t tabIndex)
{
scenery_item sceneryItem = { 0, 0, ScenerySelection() };
const auto scenerySelection = GetSelectedScenery(tabIndex);
@ -519,11 +519,11 @@ static scenery_item window_scenery_count_rows_with_selected_item(rct_window* w,
sceneryItem.scenerySelection = scenerySelection;
}
}
sceneryItem.allRows = static_cast<int32_t>(window_scenery_count_rows(w, tabInfo.Entries.size() + 8));
sceneryItem.allRows = static_cast<int32_t>(WindowSceneryCountRows(w, tabInfo.Entries.size() + 8));
return sceneryItem;
}
static int32_t window_scenery_rows_height(const size_t rows)
static int32_t WindowSceneryRowsHeight(const size_t rows)
{
return static_cast<int32_t>(rows * SCENERY_BUTTON_HEIGHT);
}
@ -532,7 +532,7 @@ static int32_t window_scenery_rows_height(const size_t rows)
*
* rct2: 0x006BD94C
*/
static void window_scenery_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowSceneryMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -571,7 +571,7 @@ static void window_scenery_mouseup(rct_window* w, rct_widgetindex widgetIndex)
network_get_mode() != NETWORK_MODE_CLIENT
|| network_can_perform_command(network_get_current_player_group_index(), -2))
{
window_scenery_scatter_open();
WindowSceneryScatterOpen();
}
else
{
@ -586,7 +586,7 @@ static void window_scenery_mouseup(rct_window* w, rct_widgetindex widgetIndex)
*
* rct2: 0x006E1EB4
*/
void window_scenery_update_scroll(rct_window* w)
void WindowSceneryUpdateScroll(rct_window* w)
{
const auto tabIndex = gWindowSceneryActiveTabIndex;
if (tabIndex >= _tabEntries.size())
@ -596,11 +596,11 @@ void window_scenery_update_scroll(rct_window* w)
const int32_t listHeight = w->height - 14 - w->widgets[WIDX_SCENERY_LIST].top - 1;
const auto sceneryItem = window_scenery_count_rows_with_selected_item(w, tabIndex);
w->scrolls[0].v_bottom = window_scenery_rows_height(sceneryItem.allRows) + 1;
const auto sceneryItem = WindowSceneryCountRowsWithSelectedItem(w, tabIndex);
w->scrolls[0].v_bottom = WindowSceneryRowsHeight(sceneryItem.allRows) + 1;
const int32_t maxTop = std::max(0, w->scrolls[0].v_bottom - listHeight);
auto rowSelected = window_scenery_count_rows(w, sceneryItem.selected_item);
auto rowSelected = WindowSceneryCountRows(w, sceneryItem.selected_item);
if (sceneryItem.scenerySelection.IsUndefined())
{
rowSelected = 0;
@ -611,7 +611,7 @@ void window_scenery_update_scroll(rct_window* w)
}
}
w->scrolls[0].v_top = window_scenery_rows_height(rowSelected);
w->scrolls[0].v_top = WindowSceneryRowsHeight(rowSelected);
w->scrolls[0].v_top = std::min<int32_t>(maxTop, w->scrolls[0].v_top);
WidgetScrollUpdateThumbs(w, WIDX_SCENERY_LIST);
@ -621,7 +621,7 @@ void window_scenery_update_scroll(rct_window* w)
*
* rct2: 0x006E1E48
*/
static void window_scenery_resize(rct_window* w)
static void WindowSceneryResize(rct_window* w)
{
if (w->width < w->min_width)
{
@ -644,7 +644,7 @@ static void window_scenery_resize(rct_window* w)
w->Invalidate();
// HACK: For some reason invalidate has not been called
window_event_invalidate_call(w);
window_scenery_update_scroll(w);
WindowSceneryUpdateScroll(w);
}
if (w->height > w->max_height)
@ -654,7 +654,7 @@ static void window_scenery_resize(rct_window* w)
w->Invalidate();
// HACK: For some reason invalidate has not been called
window_event_invalidate_call(w);
window_scenery_update_scroll(w);
WindowSceneryUpdateScroll(w);
}
}
@ -662,7 +662,7 @@ static void window_scenery_resize(rct_window* w)
*
* rct2: 0x006E1A25
*/
static void window_scenery_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowSceneryMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
switch (widgetIndex)
{
@ -683,7 +683,7 @@ static void window_scenery_mousedown(rct_window* w, rct_widgetindex widgetIndex,
w->Invalidate();
gSceneryPlaceCost = MONEY32_UNDEFINED;
window_scenery_update_scroll(w);
WindowSceneryUpdateScroll(w);
}
}
@ -691,7 +691,7 @@ static void window_scenery_mousedown(rct_window* w, rct_widgetindex widgetIndex,
*
* rct2: 0x006E1A54
*/
static void window_scenery_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowSceneryDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
{
if (dropdownIndex == -1)
return;
@ -712,13 +712,13 @@ static void window_scenery_dropdown(rct_window* w, rct_widgetindex widgetIndex,
w->Invalidate();
}
static ScenerySelection get_scenery_id_by_cursor_pos(rct_window* w, const ScreenCoordsXY& screenCoords);
static ScenerySelection GetSceneryIdByCursorPos(rct_window* w, const ScreenCoordsXY& screenCoords);
/**
*
* rct2: 0x006E1B9F
*/
static void window_scenery_periodic_update(rct_window* w)
static void WindowSceneryPeriodicUpdate(rct_window* w)
{
if (!_selectedScenery.IsUndefined())
{
@ -733,7 +733,7 @@ static void window_scenery_periodic_update(rct_window* w)
WidgetScrollGetPart(w, &w->widgets[WIDX_SCENERY_LIST], state->position, scrollPos, &scrollArea, &scrollId);
if (scrollArea == SCROLL_PART_VIEW)
{
const ScenerySelection scenery = get_scenery_id_by_cursor_pos(w, scrollPos);
const ScenerySelection scenery = GetSceneryIdByCursorPos(w, scrollPos);
if (scenery == _selectedScenery)
{
return;
@ -752,7 +752,7 @@ static void window_scenery_periodic_update(rct_window* w)
*
* rct2: 0x006E1CD3
*/
static void window_scenery_update(rct_window* w)
static void WindowSceneryUpdate(rct_window* w)
{
const CursorState* state = context_get_cursor_state();
rct_window* other = window_find_from_point(state->position);
@ -781,7 +781,7 @@ static void window_scenery_update(rct_window* w)
const auto& listWidget = w->widgets[WIDX_SCENERY_LIST];
const auto nonListHeight = w->height - listWidget.height() + 2;
const auto numRows = static_cast<int32_t>(window_scenery_count_rows(w));
const auto numRows = static_cast<int32_t>(WindowSceneryCountRows(w));
const auto maxContentHeight = numRows * SCENERY_BUTTON_HEIGHT;
const auto maxWindowHeight = maxContentHeight + nonListHeight;
const auto windowHeight = std::clamp(maxWindowHeight, WINDOW_SCENERY_HEIGHT, 463);
@ -856,17 +856,17 @@ static void window_scenery_update(rct_window* w)
*
* rct2: 0x006E1A91
*/
void window_scenery_scrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
void WindowSceneryScrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
{
auto rows = window_scenery_count_rows(w);
*height = window_scenery_rows_height(rows);
auto rows = WindowSceneryCountRows(w);
*height = WindowSceneryRowsHeight(rows);
}
static ScenerySelection get_scenery_id_by_cursor_pos(rct_window* w, const ScreenCoordsXY& screenCoords)
static ScenerySelection GetSceneryIdByCursorPos(rct_window* w, const ScreenCoordsXY& screenCoords)
{
ScenerySelection scenery{};
const auto numColumns = window_scenery_get_num_columns(w);
const auto numColumns = WindowSceneryGetNumColumns(w);
const auto colIndex = screenCoords.x / SCENERY_BUTTON_WIDTH;
const auto rowIndex = screenCoords.y / SCENERY_BUTTON_HEIGHT;
if (colIndex >= 0 && colIndex < numColumns && rowIndex >= 0)
@ -889,9 +889,9 @@ static ScenerySelection get_scenery_id_by_cursor_pos(rct_window* w, const Screen
*
* rct2: 0x006E1C4A
*/
void window_scenery_scrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
void WindowSceneryScrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
{
const auto scenery = get_scenery_id_by_cursor_pos(w, screenCoords);
const auto scenery = GetSceneryIdByCursorPos(w, screenCoords);
if (scenery.IsUndefined())
return;
@ -909,9 +909,9 @@ void window_scenery_scrollmousedown(rct_window* w, int32_t scrollIndex, const Sc
*
* rct2: 0x006E1BB8
*/
void window_scenery_scrollmouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
void WindowSceneryScrollmouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
{
ScenerySelection scenery = get_scenery_id_by_cursor_pos(w, screenCoords);
ScenerySelection scenery = GetSceneryIdByCursorPos(w, screenCoords);
if (!scenery.IsUndefined())
{
_selectedScenery = scenery;
@ -923,7 +923,7 @@ void window_scenery_scrollmouseover(rct_window* w, int32_t scrollIndex, const Sc
*
* rct2: 0x006E1C05
*/
OpenRCT2String window_scenery_tooltip(rct_window* w, const rct_widgetindex widgetIndex, const rct_string_id fallback)
OpenRCT2String WindowSceneryTooltip(rct_window* w, const rct_widgetindex widgetIndex, const rct_string_id fallback)
{
if (widgetIndex >= WIDX_SCENERY_TAB_1)
{
@ -954,7 +954,7 @@ OpenRCT2String window_scenery_tooltip(rct_window* w, const rct_widgetindex widge
*
* rct2: 0x006E118B
*/
void window_scenery_invalidate(rct_window* w)
void WindowSceneryInvalidate(rct_window* w)
{
// Set the window title
rct_string_id titleStringId = STR_MISCELLANEOUS;
@ -1116,7 +1116,7 @@ void window_scenery_invalidate(rct_window* w)
w->widgets[WIDX_SCENERY_TERTIARY_COLOUR_BUTTON].right = windowWidth - 8;
}
static std::pair<rct_string_id, money32> window_scenery_get_name_and_price(ScenerySelection selectedScenery)
static std::pair<rct_string_id, money32> WindowSceneryGetNameAndPrice(ScenerySelection selectedScenery)
{
rct_string_id name = STR_UNKNOWN_OBJECT_TYPE;
money32 price = MONEY32_UNDEFINED;
@ -1187,7 +1187,7 @@ static std::pair<rct_string_id, money32> window_scenery_get_name_and_price(Scene
*
* rct2: 0x006E1462
*/
void window_scenery_paint(rct_window* w, rct_drawpixelinfo* dpi)
void WindowSceneryPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
@ -1215,7 +1215,7 @@ void window_scenery_paint(rct_window* w, rct_drawpixelinfo* dpi)
return;
}
auto [name, price] = window_scenery_get_name_and_price(selectedSceneryEntry);
auto [name, price] = WindowSceneryGetNameAndPrice(selectedSceneryEntry);
if (price != MONEY32_UNDEFINED && !(gParkFlags & PARK_FLAGS_NO_MONEY))
{
auto ft = Formatter();
@ -1232,7 +1232,7 @@ void window_scenery_paint(rct_window* w, rct_drawpixelinfo* dpi)
DrawTextEllipsised(dpi, { w->windowPos.x + 3, w->windowPos.y + w->height - 13 }, w->width - 19, STR_BLACK_STRING, ft);
}
static void window_scenery_scrollpaint_item(rct_window* w, rct_drawpixelinfo* dpi, ScenerySelection scenerySelection)
static void WindowSceneryScrollpaintItem(rct_window* w, rct_drawpixelinfo* dpi, ScenerySelection scenerySelection)
{
if (scenerySelection.SceneryType == SCENERY_TYPE_BANNER)
{
@ -1341,11 +1341,11 @@ static void window_scenery_scrollpaint_item(rct_window* w, rct_drawpixelinfo* dp
}
}
void window_scenery_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
void WindowSceneryScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
{
gfx_clear(dpi, ColourMapA[w->colours[1]].mid_light);
auto numColumns = window_scenery_get_num_columns(w);
auto numColumns = WindowSceneryGetNumColumns(w);
auto tabIndex = gWindowSceneryActiveTabIndex;
if (tabIndex > _tabEntries.size())
{
@ -1388,7 +1388,7 @@ void window_scenery_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t s
if (clip_drawpixelinfo(
&clipdpi, dpi, topLeft + ScreenCoordsXY{ 1, 1 }, SCENERY_BUTTON_WIDTH - 2, SCENERY_BUTTON_HEIGHT - 2))
{
window_scenery_scrollpaint_item(w, &clipdpi, currentSceneryGlobal);
WindowSceneryScrollpaintItem(w, &clipdpi, currentSceneryGlobal);
}
topLeft.x += SCENERY_BUTTON_WIDTH;
@ -1400,13 +1400,13 @@ void window_scenery_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t s
}
}
bool window_scenery_set_selected_item(const ScenerySelection& scenery)
bool WindowScenerySetSelectedItem(const ScenerySelection& scenery)
{
bool result = false;
rct_window* w = window_bring_to_front_by_class(WC_SCENERY);
if (w != nullptr)
{
auto tabIndex = window_scenery_find_tab_with_scenery(scenery);
auto tabIndex = WindowSceneryFindTabWithScenery(scenery);
if (tabIndex)
{
gWindowSceneryActiveTabIndex = *tabIndex;
@ -1423,7 +1423,7 @@ bool window_scenery_set_selected_item(const ScenerySelection& scenery)
}
// Used after removing objects, in order to avoid crashes.
void window_scenery_reset_selected_scenery_items()
void WindowSceneryResetSelectedSceneryItems()
{
gWindowSceneryTabSelections.clear();
}

46
src/openrct2-ui/windows/SceneryScatter.cpp
View File

@ -51,27 +51,27 @@ static rct_widget window_scenery_scatter_widgets[] = {
};
// clang-format on
static void window_scenery_scatter_close(rct_window* w);
static void window_scenery_scatter_mouseup(rct_window* w, rct_widgetindex widgetIndex);
static void window_scenery_scatter_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void window_scenery_scatter_invalidate(rct_window* w);
static void window_scenery_scatter_paint(rct_window* w, rct_drawpixelinfo* dpi);
static void window_scenery_scatter_textinput(rct_window* w, rct_widgetindex widgetIndex, char* text);
static void window_scenery_scatter_inputsize(rct_window* w, rct_widgetindex widgetindex);
static void WindowSceneryScatterClose(rct_window* w);
static void WindowSceneryScatterMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowSceneryScatterMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowSceneryScatterInvalidate(rct_window* w);
static void WindowSceneryScatterPaint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowSceneryScatterTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text);
static void WindowSceneryScatterInputsize(rct_window* w, rct_widgetindex widgetindex);
// clang-format off
static rct_window_event_list window_clear_scenery_events([](auto& events)
{
events.close = &window_scenery_scatter_close;
events.mouse_up = &window_scenery_scatter_mouseup;
events.mouse_down = &window_scenery_scatter_mousedown;
events.text_input = &window_scenery_scatter_textinput;
events.invalidate = &window_scenery_scatter_invalidate;
events.paint = &window_scenery_scatter_paint;
events.close = &WindowSceneryScatterClose;
events.mouse_up = &WindowSceneryScatterMouseup;
events.mouse_down = &WindowSceneryScatterMousedown;
events.text_input = &WindowSceneryScatterTextinput;
events.invalidate = &WindowSceneryScatterInvalidate;
events.paint = &WindowSceneryScatterPaint;
});
// clang-format on
rct_window* window_scenery_scatter_open()
rct_window* WindowSceneryScatterOpen()
{
rct_window* window;
@ -96,12 +96,12 @@ rct_window* window_scenery_scatter_open()
return window;
}
static void window_scenery_scatter_close([[maybe_unused]] rct_window* w)
static void WindowSceneryScatterClose([[maybe_unused]] rct_window* w)
{
gWindowSceneryScatterEnabled = false;
}
static void window_scenery_scatter_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowSceneryScatterMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -110,7 +110,7 @@ static void window_scenery_scatter_mouseup(rct_window* w, rct_widgetindex widget
break;
case WIDX_PREVIEW:
window_scenery_scatter_inputsize(w, widgetIndex);
WindowSceneryScatterInputsize(w, widgetIndex);
break;
case WIDX_DENSITY_LOW:
@ -127,7 +127,7 @@ static void window_scenery_scatter_mouseup(rct_window* w, rct_widgetindex widget
}
}
static void window_scenery_scatter_mousedown(rct_window* w, rct_widgetindex widgetIndex, [[maybe_unused]] rct_widget* widget)
static void WindowSceneryScatterMousedown(rct_window* w, rct_widgetindex widgetIndex, [[maybe_unused]] rct_widget* widget)
{
switch (widgetIndex)
{
@ -145,7 +145,7 @@ static void window_scenery_scatter_mousedown(rct_window* w, rct_widgetindex widg
}
}
static void window_scenery_scatter_textinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
static void WindowSceneryScatterTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
{
int32_t size;
char* end;
@ -168,7 +168,7 @@ static void window_scenery_scatter_textinput(rct_window* w, rct_widgetindex widg
}
}
static void window_scenery_scatter_inputsize(rct_window* w, rct_widgetindex widgetindex)
static void WindowSceneryScatterInputsize(rct_window* w, rct_widgetindex widgetindex)
{
uint8_t maxlen = 0;
Formatter ft;
@ -181,10 +181,10 @@ static void window_scenery_scatter_inputsize(rct_window* w, rct_widgetindex widg
maxlen = 3;
break;
}
window_text_input_open(w, widgetindex, STR_SELECTION_SIZE, STR_ENTER_SELECTION_SIZE, ft, STR_NONE, STR_NONE, maxlen);
WindowTextInputOpen(w, widgetindex, STR_SELECTION_SIZE, STR_ENTER_SELECTION_SIZE, ft, STR_NONE, STR_NONE, maxlen);
}
static void window_scenery_scatter_invalidate(rct_window* w)
static void WindowSceneryScatterInvalidate(rct_window* w)
{
// Set the preview image button to be pressed down
w->pressed_widgets = (1ULL << WIDX_PREVIEW);
@ -209,7 +209,7 @@ static void window_scenery_scatter_invalidate(rct_window* w)
window_scenery_scatter_widgets[WIDX_PREVIEW].image = LandTool::SizeToSpriteIndex(gWindowSceneryScatterSize);
}
static void window_scenery_scatter_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowSceneryScatterPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);

107
src/openrct2-ui/windows/ServerList.cpp
View File

@ -72,35 +72,34 @@ static rct_widget window_server_list_widgets[] = {
};
// clang-format on
static void window_server_list_close(rct_window* w);
static void window_server_list_mouseup(rct_window* w, rct_widgetindex widgetIndex);
static void window_server_list_resize(rct_window* w);
static void window_server_list_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void window_server_list_update(rct_window* w);
static void window_server_list_scroll_getsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height);
static void window_server_list_scroll_mousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void window_server_list_scroll_mouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void window_server_list_textinput(rct_window* w, rct_widgetindex widgetIndex, char* text);
static OpenRCT2String window_server_list_tooltip(
rct_window* const w, const rct_widgetindex widgetIndex, rct_string_id fallback);
static void window_server_list_invalidate(rct_window* w);
static void window_server_list_paint(rct_window* w, rct_drawpixelinfo* dpi);
static void window_server_list_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex);
static void WindowServerListClose(rct_window* w);
static void WindowServerListMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowServerListResize(rct_window* w);
static void WindowServerListDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowServerListUpdate(rct_window* w);
static void WindowServerListScrollGetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height);
static void WindowServerListScrollMousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowServerListScrollMouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowServerListTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text);
static OpenRCT2String WindowServerListTooltip(rct_window* const w, const rct_widgetindex widgetIndex, rct_string_id fallback);
static void WindowServerListInvalidate(rct_window* w);
static void WindowServerListPaint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowServerListScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex);
static rct_window_event_list window_server_list_events([](auto& events) {
events.close = &window_server_list_close;
events.mouse_up = &window_server_list_mouseup;
events.resize = &window_server_list_resize;
events.dropdown = &window_server_list_dropdown;
events.update = &window_server_list_update;
events.get_scroll_size = &window_server_list_scroll_getsize;
events.scroll_mousedown = &window_server_list_scroll_mousedown;
events.scroll_mouseover = &window_server_list_scroll_mouseover;
events.text_input = &window_server_list_textinput;
events.tooltip = &window_server_list_tooltip;
events.invalidate = &window_server_list_invalidate;
events.paint = &window_server_list_paint;
events.scroll_paint = &window_server_list_scrollpaint;
events.close = &WindowServerListClose;
events.mouse_up = &WindowServerListMouseup;
events.resize = &WindowServerListResize;
events.dropdown = &WindowServerListDropdown;
events.update = &WindowServerListUpdate;
events.get_scroll_size = &WindowServerListScrollGetsize;
events.scroll_mousedown = &WindowServerListScrollMousedown;
events.scroll_mouseover = &WindowServerListScrollMouseover;
events.text_input = &WindowServerListTextinput;
events.tooltip = &WindowServerListTooltip;
events.invalidate = &WindowServerListInvalidate;
events.paint = &WindowServerListPaint;
events.scroll_paint = &WindowServerListScrollpaint;
});
enum
@ -112,11 +111,11 @@ enum
static bool _showNetworkVersionTooltip = false;
static std::string _version;
static void join_server(std::string address);
static void server_list_fetch_servers_begin();
static void server_list_fetch_servers_check(rct_window* w);
static void JoinServer(std::string address);
static void ServerListFetchServersBegin();
static void ServerListFetchServersCheck(rct_window* w);
rct_window* window_server_list_open()
rct_window* WindowServerListOpen()
{
rct_window* window;
@ -151,18 +150,18 @@ rct_window* window_server_list_open()
_serverList.ReadAndAddFavourites();
window->no_list_items = static_cast<uint16_t>(_serverList.GetCount());
server_list_fetch_servers_begin();
ServerListFetchServersBegin();
return window;
}
static void window_server_list_close(rct_window* w)
static void WindowServerListClose(rct_window* w)
{
_serverList = {};
_fetchFuture = {};
}
static void window_server_list_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowServerListMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -180,7 +179,7 @@ static void window_server_list_mouseup(rct_window* w, rct_widgetindex widgetInde
const auto& server = _serverList.GetServer(serverIndex);
if (server.IsVersionValid())
{
join_server(server.Address);
JoinServer(server.Address);
}
else
{
@ -192,10 +191,10 @@ static void window_server_list_mouseup(rct_window* w, rct_widgetindex widgetInde
break;
}
case WIDX_FETCH_SERVERS:
server_list_fetch_servers_begin();
ServerListFetchServersBegin();
break;
case WIDX_ADD_SERVER:
window_text_input_open(w, widgetIndex, STR_ADD_SERVER, STR_ENTER_HOSTNAME_OR_IP_ADDRESS, {}, STR_NONE, 0, 128);
WindowTextInputOpen(w, widgetIndex, STR_ADD_SERVER, STR_ENTER_HOSTNAME_OR_IP_ADDRESS, {}, STR_NONE, 0, 128);
break;
case WIDX_START_SERVER:
context_open_window(WC_SERVER_START);
@ -203,12 +202,12 @@ static void window_server_list_mouseup(rct_window* w, rct_widgetindex widgetInde
}
}
static void window_server_list_resize(rct_window* w)
static void WindowServerListResize(rct_window* w)
{
window_set_resize(w, WWIDTH_MIN, WHEIGHT_MIN, WWIDTH_MAX, WHEIGHT_MAX);
}
static void window_server_list_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowServerListDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
{
auto serverIndex = w->selected_list_item;
if (serverIndex >= 0 && serverIndex < static_cast<int32_t>(_serverList.GetCount()))
@ -219,7 +218,7 @@ static void window_server_list_dropdown(rct_window* w, rct_widgetindex widgetInd
case DDIDX_JOIN:
if (server.IsVersionValid())
{
join_server(server.Address);
JoinServer(server.Address);
}
else
{
@ -238,23 +237,23 @@ static void window_server_list_dropdown(rct_window* w, rct_widgetindex widgetInd
}
}
static void window_server_list_update(rct_window* w)
static void WindowServerListUpdate(rct_window* w)
{
if (gCurrentTextBox.window.classification == w->classification && gCurrentTextBox.window.number == w->number)
{
window_update_textbox_caret();
widget_invalidate(w, WIDX_PLAYER_NAME_INPUT);
}
server_list_fetch_servers_check(w);
ServerListFetchServersCheck(w);
}
static void window_server_list_scroll_getsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
static void WindowServerListScrollGetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
{
*width = 0;
*height = w->no_list_items * ITEM_HEIGHT;
}
static void window_server_list_scroll_mousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
static void WindowServerListScrollMousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
{
int32_t serverIndex = w->selected_list_item;
if (serverIndex >= 0 && serverIndex < static_cast<int32_t>(_serverList.GetCount()))
@ -278,7 +277,7 @@ static void window_server_list_scroll_mousedown(rct_window* w, int32_t scrollInd
}
}
static void window_server_list_scroll_mouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
static void WindowServerListScrollMouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
{
auto& listWidget = w->widgets[WIDX_LIST];
@ -300,13 +299,13 @@ static void window_server_list_scroll_mouseover(rct_window* w, int32_t scrollInd
_showNetworkVersionTooltip = showNetworkVersionTooltip;
listWidget.tooltip = showNetworkVersionTooltip ? static_cast<rct_string_id>(STR_NETWORK_VERSION_TIP) : STR_NONE;
window_tooltip_close();
WindowTooltipClose();
w->Invalidate();
}
}
static void window_server_list_textinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
static void WindowServerListTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
{
if (text == nullptr || text[0] == 0)
return;
@ -346,14 +345,14 @@ static void window_server_list_textinput(rct_window* w, rct_widgetindex widgetIn
}
}
static OpenRCT2String window_server_list_tooltip(rct_window* const w, const rct_widgetindex widgetIndex, rct_string_id fallback)
static OpenRCT2String WindowServerListTooltip(rct_window* const w, const rct_widgetindex widgetIndex, rct_string_id fallback)
{
auto ft = Formatter();
ft.Add<char*>(_version.c_str());
return { fallback, ft };
}
static void window_server_list_invalidate(rct_window* w)
static void WindowServerListInvalidate(rct_window* w)
{
window_server_list_widgets[WIDX_BACKGROUND].right = w->width - 1;
window_server_list_widgets[WIDX_BACKGROUND].bottom = w->height - 1;
@ -381,7 +380,7 @@ static void window_server_list_invalidate(rct_window* w)
w->no_list_items = static_cast<uint16_t>(_serverList.GetCount());
}
static void window_server_list_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowServerListPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
@ -401,7 +400,7 @@ static void window_server_list_paint(rct_window* w, rct_drawpixelinfo* dpi)
DrawTextBasic(dpi, w->windowPos + ScreenCoordsXY{ 8, w->height - 15 }, _statusText, ft, { COLOUR_WHITE });
}
static void window_server_list_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
static void WindowServerListScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
{
uint8_t paletteIndex = ColourMapA[w->colours[1]].mid_light;
gfx_clear(dpi, paletteIndex);
@ -496,7 +495,7 @@ static void window_server_list_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi
}
}
static void join_server(std::string address)
static void JoinServer(std::string address)
{
int32_t port = NETWORK_DEFAULT_PORT;
auto beginBracketIndex = address.find('[');
@ -527,7 +526,7 @@ static void join_server(std::string address)
}
}
static void server_list_fetch_servers_begin()
static void ServerListFetchServersBegin()
{
if (_fetchFuture.valid())
{
@ -573,7 +572,7 @@ static void server_list_fetch_servers_begin()
});
}
static void server_list_fetch_servers_check(rct_window* w)
static void ServerListFetchServersCheck(rct_window* w)
{
if (_fetchFuture.valid())
{

46
src/openrct2-ui/windows/ServerStart.cpp
View File

@ -65,25 +65,25 @@ static rct_widget window_server_start_widgets[] = {
WIDGETS_END,
};
static void window_server_start_close(rct_window *w);
static void window_server_start_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_server_start_update(rct_window *w);
static void window_server_start_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void window_server_start_invalidate(rct_window *w);
static void window_server_start_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowServerStartClose(rct_window *w);
static void WindowServerStartMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowServerStartUpdate(rct_window *w);
static void WindowServerStartTextinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void WindowServerStartInvalidate(rct_window *w);
static void WindowServerStartPaint(rct_window *w, rct_drawpixelinfo *dpi);
static rct_window_event_list window_server_start_events([](auto& events)
{
events.close = &window_server_start_close;
events.mouse_up = &window_server_start_mouseup;
events.update = &window_server_start_update;
events.text_input = &window_server_start_textinput;
events.invalidate = &window_server_start_invalidate;
events.paint = &window_server_start_paint;
events.close = &WindowServerStartClose;
events.mouse_up = &WindowServerStartMouseup;
events.update = &WindowServerStartUpdate;
events.text_input = &WindowServerStartTextinput;
events.invalidate = &WindowServerStartInvalidate;
events.paint = &WindowServerStartPaint;
});
// clang-format on
rct_window* window_server_start_open()
rct_window* WindowServerStartOpen()
{
rct_window* window;
@ -125,11 +125,11 @@ rct_window* window_server_start_open()
return window;
}
static void window_server_start_close(rct_window* w)
static void WindowServerStartClose(rct_window* w)
{
}
static void window_server_start_scenarioselect_callback(const utf8* path)
static void WindowServerStartScenarioselectCallback(const utf8* path)
{
network_set_password(_password);
if (context_load_park_from_file(path))
@ -138,7 +138,7 @@ static void window_server_start_scenarioselect_callback(const utf8* path)
}
}
static void window_server_start_loadsave_callback(int32_t result, const utf8* path)
static void WindowServerStartLoadsaveCallback(int32_t result, const utf8* path)
{
if (result == MODAL_RESULT_OK && context_load_park_from_file(path))
{
@ -146,7 +146,7 @@ static void window_server_start_loadsave_callback(int32_t result, const utf8* pa
}
}
static void window_server_start_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowServerStartMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -190,19 +190,19 @@ static void window_server_start_mouseup(rct_window* w, rct_widgetindex widgetInd
w->Invalidate();
break;
case WIDX_START_SERVER:
window_scenarioselect_open(window_server_start_scenarioselect_callback, false);
WindowScenarioselectOpen(WindowServerStartScenarioselectCallback, false);
break;
case WIDX_LOAD_SERVER:
network_set_password(_password);
auto intent = Intent(WC_LOADSAVE);
intent.putExtra(INTENT_EXTRA_LOADSAVE_TYPE, LOADSAVETYPE_LOAD | LOADSAVETYPE_GAME);
intent.putExtra(INTENT_EXTRA_CALLBACK, reinterpret_cast<void*>(window_server_start_loadsave_callback));
intent.putExtra(INTENT_EXTRA_CALLBACK, reinterpret_cast<void*>(WindowServerStartLoadsaveCallback));
context_open_intent(&intent);
break;
}
}
static void window_server_start_update(rct_window* w)
static void WindowServerStartUpdate(rct_window* w)
{
if (gCurrentTextBox.window.classification == w->classification && gCurrentTextBox.window.number == w->number)
{
@ -214,7 +214,7 @@ static void window_server_start_update(rct_window* w)
}
}
static void window_server_start_textinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
static void WindowServerStartTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
{
if (text == nullptr)
return;
@ -305,7 +305,7 @@ static void window_server_start_textinput(rct_window* w, rct_widgetindex widgetI
}
}
static void window_server_start_invalidate(rct_window* w)
static void WindowServerStartInvalidate(rct_window* w)
{
ColourSchemeUpdateByClass(w, WC_SERVER_LIST);
@ -315,7 +315,7 @@ static void window_server_start_invalidate(rct_window* w)
ft.Add<uint16_t>(gConfigNetwork.maxplayers);
}
static void window_server_start_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowServerStartPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);

2
src/openrct2-ui/windows/ShortcutKeys.cpp
View File

@ -545,7 +545,7 @@ void ChangeShortcutWindow::NotifyShortcutKeysWindow()
}
}
rct_window* window_shortcut_keys_open()
rct_window* WindowShortcutKeysOpen()
{
auto w = window_bring_to_front_by_class(WC_KEYBOARD_SHORTCUT_LIST);
if (w == nullptr)

7
src/openrct2-ui/windows/Sign.cpp
View File

@ -65,8 +65,7 @@ private:
if (banner != nullptr)
{
auto bannerText = banner->GetText();
window_text_input_raw_open(
this, WIDX_SIGN_TEXT, STR_SIGN_TEXT_TITLE, STR_SIGN_TEXT_PROMPT, {}, bannerText.c_str(), 32);
WindowTextInputRawOpen(this, WIDX_SIGN_TEXT, STR_SIGN_TEXT_TITLE, STR_SIGN_TEXT_PROMPT, {}, bannerText.c_str(), 32);
}
}
@ -312,7 +311,7 @@ public:
*
* rct2: 0x006BA305
*/
rct_window* window_sign_open(rct_windownumber number)
rct_window* WindowSignOpen(rct_windownumber number)
{
auto* w = static_cast<SignWindow*>(window_bring_to_front_by_number(WC_BANNER, number));
@ -335,7 +334,7 @@ rct_window* window_sign_open(rct_windownumber number)
*
* rct2: 0x6E5F52
*/
rct_window* window_sign_small_open(rct_windownumber number)
rct_window* WindowSignSmallOpen(rct_windownumber number)
{
auto* w = static_cast<SignWindow*>(window_bring_to_front_by_number(WC_BANNER, number));

250
src/openrct2-ui/windows/Staff.cpp
View File

@ -116,86 +116,86 @@ static rct_widget* window_staff_page_widgets[] = {
window_staff_stats_widgets,
};
static void window_staff_set_page(rct_window* w, int32_t page);
static void window_staff_disable_widgets(rct_window* w);
static void window_staff_unknown_05(rct_window* w);
static void window_staff_viewport_init(rct_window* w);
static void WindowStaffSetPage(rct_window* w, int32_t page);
static void WindowStaffDisableWidgets(rct_window* w);
static void WindowStaffUnknown05(rct_window* w);
static void WindowStaffViewportInit(rct_window* w);
static void window_staff_overview_close(rct_window* w);
static void window_staff_overview_mouseup(rct_window* w, rct_widgetindex widgetIndex);
static void window_staff_overview_resize(rct_window* w);
static void window_staff_overview_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void window_staff_overview_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void window_staff_overview_update(rct_window* w);
static void window_staff_overview_invalidate(rct_window* w);
static void window_staff_overview_paint(rct_window* w, rct_drawpixelinfo* dpi);
static void window_staff_overview_tab_paint(rct_window* w, rct_drawpixelinfo* dpi);
static void window_staff_overview_tool_update(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void window_staff_overview_tool_down(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void window_staff_overview_tool_drag(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void window_staff_overview_tool_up(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void window_staff_overview_tool_abort(rct_window* w, rct_widgetindex widgetIndex);
static void window_staff_overview_text_input(rct_window* w, rct_widgetindex widgetIndex, char* text);
static void window_staff_overview_viewport_rotate(rct_window* w);
static void window_staff_follow(rct_window* w);
static void window_staff_show_locate_dropdown(rct_window* w, rct_widget* widget);
static void WindowStaffOverviewClose(rct_window* w);
static void WindowStaffOverviewMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowStaffOverviewResize(rct_window* w);
static void WindowStaffOverviewMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowStaffOverviewDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowStaffOverviewUpdate(rct_window* w);
static void WindowStaffOverviewInvalidate(rct_window* w);
static void WindowStaffOverviewPaint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowStaffOverviewTabPaint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowStaffOverviewToolUpdate(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowStaffOverviewToolDown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowStaffOverviewToolDrag(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowStaffOverviewToolUp(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowStaffOverviewToolAbort(rct_window* w, rct_widgetindex widgetIndex);
static void WindowStaffOverviewTextInput(rct_window* w, rct_widgetindex widgetIndex, char* text);
static void WindowStaffOverviewViewportRotate(rct_window* w);
static void WindowStaffFollow(rct_window* w);
static void WindowStaffShowLocateDropdown(rct_window* w, rct_widget* widget);
static void window_staff_options_mouseup(rct_window* w, rct_widgetindex widgetIndex);
static void window_staff_options_update(rct_window* w);
static void window_staff_options_invalidate(rct_window* w);
static void window_staff_options_paint(rct_window* w, rct_drawpixelinfo* dpi);
static void window_staff_options_tab_paint(rct_window* w, rct_drawpixelinfo* dpi);
static void window_staff_options_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void window_staff_options_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowStaffOptionsMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowStaffOptionsUpdate(rct_window* w);
static void WindowStaffOptionsInvalidate(rct_window* w);
static void WindowStaffOptionsPaint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowStaffOptionsTabPaint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowStaffOptionsMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowStaffOptionsDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void window_staff_stats_mouseup(rct_window* w, rct_widgetindex widgetIndex);
static void window_staff_stats_resize(rct_window* w);
static void window_staff_stats_update(rct_window* w);
static void window_staff_stats_invalidate(rct_window* w);
static void window_staff_stats_paint(rct_window* w, rct_drawpixelinfo* dpi);
static void window_staff_stats_tab_paint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowStaffStatsMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowStaffStatsResize(rct_window* w);
static void WindowStaffStatsUpdate(rct_window* w);
static void WindowStaffStatsInvalidate(rct_window* w);
static void WindowStaffStatsPaint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowStaffStatsTabPaint(rct_window* w, rct_drawpixelinfo* dpi);
void window_staff_set_colours();
void WindowStaffSetColours();
// 0x992AEC
static rct_window_event_list window_staff_overview_events([](auto& events) {
events.close = &window_staff_overview_close;
events.mouse_up = &window_staff_overview_mouseup;
events.resize = &window_staff_overview_resize;
events.mouse_down = &window_staff_overview_mousedown;
events.dropdown = &window_staff_overview_dropdown;
events.update = &window_staff_overview_update;
events.tool_update = &window_staff_overview_tool_update;
events.tool_down = &window_staff_overview_tool_down;
events.tool_drag = &window_staff_overview_tool_drag;
events.tool_up = &window_staff_overview_tool_up;
events.tool_abort = &window_staff_overview_tool_abort;
events.text_input = &window_staff_overview_text_input;
events.viewport_rotate = &window_staff_overview_viewport_rotate;
events.invalidate = &window_staff_overview_invalidate;
events.paint = &window_staff_overview_paint;
events.close = &WindowStaffOverviewClose;
events.mouse_up = &WindowStaffOverviewMouseup;
events.resize = &WindowStaffOverviewResize;
events.mouse_down = &WindowStaffOverviewMousedown;
events.dropdown = &WindowStaffOverviewDropdown;
events.update = &WindowStaffOverviewUpdate;
events.tool_update = &WindowStaffOverviewToolUpdate;
events.tool_down = &WindowStaffOverviewToolDown;
events.tool_drag = &WindowStaffOverviewToolDrag;
events.tool_up = &WindowStaffOverviewToolUp;
events.tool_abort = &WindowStaffOverviewToolAbort;
events.text_input = &WindowStaffOverviewTextInput;
events.viewport_rotate = &WindowStaffOverviewViewportRotate;
events.invalidate = &WindowStaffOverviewInvalidate;
events.paint = &WindowStaffOverviewPaint;
});
// 0x992B5C
static rct_window_event_list window_staff_options_events([](auto& events) {
events.mouse_up = &window_staff_options_mouseup;
events.resize = &window_staff_stats_resize;
events.mouse_down = &window_staff_options_mousedown;
events.dropdown = &window_staff_options_dropdown;
events.unknown_05 = &window_staff_unknown_05;
events.update = &window_staff_options_update;
events.invalidate = &window_staff_options_invalidate;
events.paint = &window_staff_options_paint;
events.mouse_up = &WindowStaffOptionsMouseup;
events.resize = &WindowStaffStatsResize;
events.mouse_down = &WindowStaffOptionsMousedown;
events.dropdown = &WindowStaffOptionsDropdown;
events.unknown_05 = &WindowStaffUnknown05;
events.update = &WindowStaffOptionsUpdate;
events.invalidate = &WindowStaffOptionsInvalidate;
events.paint = &WindowStaffOptionsPaint;
});
// 0x992BCC
static rct_window_event_list window_staff_stats_events([](auto& events) {
events.mouse_up = &window_staff_stats_mouseup;
events.resize = &window_staff_stats_resize;
events.unknown_05 = &window_staff_unknown_05;
events.update = &window_staff_stats_update;
events.invalidate = &window_staff_stats_invalidate;
events.paint = &window_staff_stats_paint;
events.mouse_up = &WindowStaffStatsMouseup;
events.resize = &WindowStaffStatsResize;
events.unknown_05 = &WindowStaffUnknown05;
events.update = &WindowStaffStatsUpdate;
events.invalidate = &WindowStaffStatsInvalidate;
events.paint = &WindowStaffStatsPaint;
});
static rct_window_event_list* window_staff_page_events[] = {
@ -259,7 +259,7 @@ static Staff* GetStaff(rct_window* w)
*
* rct2: 0x006BEE98
*/
rct_window* window_staff_open(Peep* peep)
rct_window* WindowStaffOpen(Peep* peep)
{
rct_window* w = window_bring_to_front_by_number(WC_PEEP, peep->sprite_index);
if (w == nullptr)
@ -271,7 +271,7 @@ rct_window* window_staff_open(Peep* peep)
w->frame_no = 0;
w->highlighted_item = 0;
window_staff_disable_widgets(w);
WindowStaffDisableWidgets(w);
w->min_width = WW;
w->min_height = WH;
@ -286,9 +286,9 @@ rct_window* window_staff_open(Peep* peep)
w->hold_down_widgets = 0;
w->event_handlers = window_staff_page_events[0];
w->pressed_widgets = 0;
window_staff_disable_widgets(w);
WindowStaffDisableWidgets(w);
WindowInitScrollWidgets(w);
window_staff_viewport_init(w);
WindowStaffViewportInit(w);
if (peep->State == PeepState::Picked)
window_event_mouse_up_call(w, WIDX_CHECKBOX_3);
@ -300,7 +300,7 @@ rct_window* window_staff_open(Peep* peep)
* rct2: 0x006BED21
* Disable the staff pickup if not in pickup state.
*/
void window_staff_disable_widgets(rct_window* w)
void WindowStaffDisableWidgets(rct_window* w)
{
const auto peep = GetStaff(w);
if (peep == nullptr)
@ -336,7 +336,7 @@ void window_staff_disable_widgets(rct_window* w)
* Same as window_peep_overview_close.
* rct2: 0x006BDFF8
*/
void window_staff_overview_close(rct_window* w)
void WindowStaffOverviewClose(rct_window* w)
{
if (input_test_flag(INPUT_FLAG_TOOL_ACTIVE))
{
@ -349,7 +349,7 @@ void window_staff_overview_close(rct_window* w)
* Mostly similar to window_peep_set_page.
* rct2: 0x006BE023
*/
void window_staff_set_page(rct_window* w, int32_t page)
void WindowStaffSetPage(rct_window* w, int32_t page)
{
if (input_test_flag(INPUT_FLAG_TOOL_ACTIVE))
{
@ -375,7 +375,7 @@ void window_staff_set_page(rct_window* w, int32_t page)
w->pressed_widgets = 0;
w->widgets = window_staff_page_widgets[page];
window_staff_disable_widgets(w);
WindowStaffDisableWidgets(w);
w->Invalidate();
window_event_resize_call(w);
@ -392,7 +392,7 @@ void window_staff_set_page(rct_window* w, int32_t page)
*
* rct2: 0x006BDF55
*/
void window_staff_overview_mouseup(rct_window* w, rct_widgetindex widgetIndex)
void WindowStaffOverviewMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
const auto peep = GetStaff(w);
if (peep == nullptr)
@ -408,7 +408,7 @@ void window_staff_overview_mouseup(rct_window* w, rct_widgetindex widgetIndex)
case WIDX_TAB_1:
case WIDX_TAB_2:
case WIDX_TAB_3:
window_staff_set_page(w, widgetIndex - WIDX_TAB_1);
WindowStaffSetPage(w, widgetIndex - WIDX_TAB_1);
break;
case WIDX_PICKUP:
{
@ -438,7 +438,7 @@ void window_staff_overview_mouseup(rct_window* w, rct_widgetindex widgetIndex)
case WIDX_RENAME:
{
auto peepName = peep->GetName();
window_text_input_raw_open(
WindowTextInputRawOpen(
w, widgetIndex, STR_STAFF_TITLE_STAFF_MEMBER_NAME, STR_STAFF_PROMPT_ENTER_NAME, {}, peepName.c_str(), 32);
break;
}
@ -449,9 +449,9 @@ void window_staff_overview_mouseup(rct_window* w, rct_widgetindex widgetIndex)
*
* rct2: 0x006BE558
*/
void window_staff_overview_resize(rct_window* w)
void WindowStaffOverviewResize(rct_window* w)
{
window_staff_disable_widgets(w);
WindowStaffDisableWidgets(w);
w->min_width = WW;
w->max_width = 500;
@ -498,19 +498,19 @@ void window_staff_overview_resize(rct_window* w)
}
}
window_staff_viewport_init(w);
WindowStaffViewportInit(w);
}
/**
* Handle the dropdown of patrol button.
* rct2: 0x006BDF98
*/
void window_staff_overview_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
void WindowStaffOverviewMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
switch (widgetIndex)
{
case WIDX_LOCATE:
window_staff_show_locate_dropdown(w, widget);
WindowStaffShowLocateDropdown(w, widget);
break;
case WIDX_PATROL:
{
@ -542,7 +542,7 @@ void window_staff_overview_mousedown(rct_window* w, rct_widgetindex widgetIndex,
*
* rct2: 0x006BDFA3
*/
void window_staff_overview_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
void WindowStaffOverviewDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
{
switch (widgetIndex)
{
@ -554,7 +554,7 @@ void window_staff_overview_dropdown(rct_window* w, rct_widgetindex widgetIndex,
}
else if (dropdownIndex == 1)
{
window_staff_follow(w);
WindowStaffFollow(w);
}
break;
}
@ -587,7 +587,7 @@ void window_staff_overview_dropdown(rct_window* w, rct_widgetindex widgetIndex,
}
}
static void window_staff_show_locate_dropdown(rct_window* w, rct_widget* widget)
static void WindowStaffShowLocateDropdown(rct_window* w, rct_widget* widget)
{
gDropdownItemsFormat[0] = STR_LOCATE_SUBJECT_TIP;
gDropdownItemsFormat[1] = STR_FOLLOW_SUBJECT_TIP;
@ -597,7 +597,7 @@ static void window_staff_show_locate_dropdown(rct_window* w, rct_widget* widget)
gDropdownDefaultIndex = 0;
}
static void window_staff_follow(rct_window* w)
static void WindowStaffFollow(rct_window* w)
{
rct_window* w_main = window_get_main();
window_follow_sprite(w_main, w->number);
@ -607,7 +607,7 @@ static void window_staff_follow(rct_window* w)
* Update the animation frame of the tab icon.
* rct2: 0x6BE602
*/
void window_staff_overview_update(rct_window* w)
void WindowStaffOverviewUpdate(rct_window* w)
{
int32_t newAnimationFrame = w->var_496;
newAnimationFrame++;
@ -623,7 +623,7 @@ void window_staff_overview_update(rct_window* w)
*
* rct2: 0x006BE814
*/
static void window_staff_set_order(rct_window* w, int32_t order_id)
static void WindowStaffSetOrder(rct_window* w, int32_t order_id)
{
const auto peep = GetStaff(w);
if (peep == nullptr)
@ -640,7 +640,7 @@ static void window_staff_set_order(rct_window* w, int32_t order_id)
*
* rct2: 0x006BE7DB
*/
void window_staff_options_mouseup(rct_window* w, rct_widgetindex widgetIndex)
void WindowStaffOptionsMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -650,13 +650,13 @@ void window_staff_options_mouseup(rct_window* w, rct_widgetindex widgetIndex)
case WIDX_TAB_1:
case WIDX_TAB_2:
case WIDX_TAB_3:
window_staff_set_page(w, widgetIndex - WIDX_TAB_1);
WindowStaffSetPage(w, widgetIndex - WIDX_TAB_1);
break;
case WIDX_CHECKBOX_1:
case WIDX_CHECKBOX_2:
case WIDX_CHECKBOX_3:
case WIDX_CHECKBOX_4:
window_staff_set_order(w, widgetIndex - WIDX_CHECKBOX_1);
WindowStaffSetOrder(w, widgetIndex - WIDX_CHECKBOX_1);
break;
}
}
@ -665,7 +665,7 @@ void window_staff_options_mouseup(rct_window* w, rct_widgetindex widgetIndex)
*
* rct2: 0x006BE960
*/
void window_staff_options_update(rct_window* w)
void WindowStaffOptionsUpdate(rct_window* w)
{
w->frame_no++;
widget_invalidate(w, WIDX_TAB_2);
@ -675,7 +675,7 @@ void window_staff_options_update(rct_window* w)
*
* rct2: 0x006BEBCF
*/
void window_staff_stats_mouseup(rct_window* w, rct_widgetindex widgetIndex)
void WindowStaffStatsMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -685,7 +685,7 @@ void window_staff_stats_mouseup(rct_window* w, rct_widgetindex widgetIndex)
case WIDX_TAB_1:
case WIDX_TAB_2:
case WIDX_TAB_3:
window_staff_set_page(w, widgetIndex - WIDX_TAB_1);
WindowStaffSetPage(w, widgetIndex - WIDX_TAB_1);
break;
}
}
@ -694,7 +694,7 @@ void window_staff_stats_mouseup(rct_window* w, rct_widgetindex widgetIndex)
*
* rct2: 0x006BEC1B, 0x006BE975
*/
void window_staff_stats_resize(rct_window* w)
void WindowStaffStatsResize(rct_window* w)
{
w->min_width = 190;
w->max_width = 190;
@ -730,7 +730,7 @@ void window_staff_stats_resize(rct_window* w)
*
* rct2: 0x006BEBEA
*/
void window_staff_stats_update(rct_window* w)
void WindowStaffStatsUpdate(rct_window* w)
{
w->frame_no++;
widget_invalidate(w, WIDX_TAB_3);
@ -751,7 +751,7 @@ void window_staff_stats_update(rct_window* w)
*
* rct2: 0x6BEC80, 0x6BE9DA
*/
void window_staff_unknown_05(rct_window* w)
void WindowStaffUnknown05(rct_window* w)
{
widget_invalidate(w, WIDX_TAB_1);
}
@ -760,7 +760,7 @@ void window_staff_unknown_05(rct_window* w)
*
* rct2: 0x006BE9E9
*/
void window_staff_stats_invalidate(rct_window* w)
void WindowStaffStatsInvalidate(rct_window* w)
{
ColourSchemeUpdateByClass(w, static_cast<rct_windowclass>(WC_STAFF));
@ -799,7 +799,7 @@ void window_staff_stats_invalidate(rct_window* w)
*
* rct2: 0x006BE62B
*/
void window_staff_options_invalidate(rct_window* w)
void WindowStaffOptionsInvalidate(rct_window* w)
{
ColourSchemeUpdateByClass(w, static_cast<rct_windowclass>(WC_STAFF));
@ -881,7 +881,7 @@ void window_staff_options_invalidate(rct_window* w)
*
* rct2: 0x006BDD91
*/
void window_staff_overview_invalidate(rct_window* w)
void WindowStaffOverviewInvalidate(rct_window* w)
{
ColourSchemeUpdateByClass(w, static_cast<rct_windowclass>(WC_STAFF));
@ -941,12 +941,12 @@ void window_staff_overview_invalidate(rct_window* w)
*
* rct2: 0x6BDEAF
*/
void window_staff_overview_paint(rct_window* w, rct_drawpixelinfo* dpi)
void WindowStaffOverviewPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_staff_overview_tab_paint(w, dpi);
window_staff_options_tab_paint(w, dpi);
window_staff_stats_tab_paint(w, dpi);
WindowStaffOverviewTabPaint(w, dpi);
WindowStaffOptionsTabPaint(w, dpi);
WindowStaffStatsTabPaint(w, dpi);
// Draw the viewport no sound sprite
if (w->viewport != nullptr)
@ -977,7 +977,7 @@ void window_staff_overview_paint(rct_window* w, rct_drawpixelinfo* dpi)
*
* rct2: 0x6BEC8F
*/
void window_staff_options_tab_paint(rct_window* w, rct_drawpixelinfo* dpi)
void WindowStaffOptionsTabPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
if (w->disabled_widgets & (1ULL << WIDX_TAB_2))
return;
@ -997,7 +997,7 @@ void window_staff_options_tab_paint(rct_window* w, rct_drawpixelinfo* dpi)
*
* rct2: 0x6BECD3
*/
void window_staff_stats_tab_paint(rct_window* w, rct_drawpixelinfo* dpi)
void WindowStaffStatsTabPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
if (w->disabled_widgets & (1ULL << WIDX_TAB_3))
return;
@ -1016,7 +1016,7 @@ void window_staff_stats_tab_paint(rct_window* w, rct_drawpixelinfo* dpi)
/**
* Based on rct2: 0x6983dd in window_guest to be remerged into one when peep file added.
*/
void window_staff_overview_tab_paint(rct_window* w, rct_drawpixelinfo* dpi)
void WindowStaffOverviewTabPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
if (w->disabled_widgets & (1ULL << WIDX_TAB_1))
return;
@ -1063,24 +1063,24 @@ void window_staff_overview_tab_paint(rct_window* w, rct_drawpixelinfo* dpi)
*
* rct2: 0x6BE7C6
*/
void window_staff_options_paint(rct_window* w, rct_drawpixelinfo* dpi)
void WindowStaffOptionsPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_staff_overview_tab_paint(w, dpi);
window_staff_options_tab_paint(w, dpi);
window_staff_stats_tab_paint(w, dpi);
WindowStaffOverviewTabPaint(w, dpi);
WindowStaffOptionsTabPaint(w, dpi);
WindowStaffStatsTabPaint(w, dpi);
}
/**
*
* rct2: 0x6BEA86
*/
void window_staff_stats_paint(rct_window* w, rct_drawpixelinfo* dpi)
void WindowStaffStatsPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_staff_overview_tab_paint(w, dpi);
window_staff_options_tab_paint(w, dpi);
window_staff_stats_tab_paint(w, dpi);
WindowStaffOverviewTabPaint(w, dpi);
WindowStaffOptionsTabPaint(w, dpi);
WindowStaffStatsTabPaint(w, dpi);
const auto peep = GetStaff(w);
if (peep == nullptr)
@ -1151,7 +1151,7 @@ void window_staff_stats_paint(rct_window* w, rct_drawpixelinfo* dpi)
*
* rct2: 0x006BDFD8
*/
void window_staff_overview_tool_update(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
void WindowStaffOverviewToolUpdate(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
{
if (widgetIndex != WIDX_PICKUP)
return;
@ -1201,7 +1201,7 @@ void window_staff_overview_tool_update(rct_window* w, rct_widgetindex widgetInde
*
* rct2: 0x006BDFC3
*/
void window_staff_overview_tool_down(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
void WindowStaffOverviewToolDown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
{
if (widgetIndex == WIDX_PICKUP)
{
@ -1248,7 +1248,7 @@ void window_staff_overview_tool_down(rct_window* w, rct_widgetindex widgetIndex,
}
}
void window_staff_overview_tool_drag(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
void WindowStaffOverviewToolDrag(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
{
if (widgetIndex != WIDX_PATROL)
return;
@ -1283,7 +1283,7 @@ void window_staff_overview_tool_drag(rct_window* w, rct_widgetindex widgetIndex,
GameActions::Execute(&staffSetPatrolAreaAction);
}
void window_staff_overview_tool_up(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
void WindowStaffOverviewToolUp(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
{
if (widgetIndex != WIDX_PATROL)
return;
@ -1295,7 +1295,7 @@ void window_staff_overview_tool_up(rct_window* w, rct_widgetindex widgetIndex, c
*
* rct2: 0x6BDFAE
*/
void window_staff_overview_tool_abort(rct_window* w, rct_widgetindex widgetIndex)
void WindowStaffOverviewToolAbort(rct_window* w, rct_widgetindex widgetIndex)
{
if (widgetIndex == WIDX_PICKUP)
{
@ -1313,7 +1313,7 @@ void window_staff_overview_tool_abort(rct_window* w, rct_widgetindex widgetIndex
}
/* rct2: 0x6BDFED */
void window_staff_overview_text_input(rct_window* w, rct_widgetindex widgetIndex, char* text)
void WindowStaffOverviewTextInput(rct_window* w, rct_widgetindex widgetIndex, char* text)
{
if (widgetIndex != WIDX_RENAME)
return;
@ -1327,16 +1327,16 @@ void window_staff_overview_text_input(rct_window* w, rct_widgetindex widgetIndex
*
* rct2: 0x006BE5FC
*/
void window_staff_overview_viewport_rotate(rct_window* w)
void WindowStaffOverviewViewportRotate(rct_window* w)
{
window_staff_viewport_init(w);
WindowStaffViewportInit(w);
}
/**
*
* rct2: 0x006BEDA3
*/
void window_staff_viewport_init(rct_window* w)
void WindowStaffViewportInit(rct_window* w)
{
if (w->page != WINDOW_STAFF_OVERVIEW)
return;
@ -1400,7 +1400,7 @@ void window_staff_viewport_init(rct_window* w)
* Handle the costume of staff member.
* rct2: 0x006BE802
*/
void window_staff_options_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
void WindowStaffOptionsMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
if (widgetIndex != WIDX_COSTUME_BTN)
{
@ -1447,7 +1447,7 @@ void window_staff_options_mousedown(rct_window* w, rct_widgetindex widgetIndex,
*
* rct2: 0x6BE809
*/
void window_staff_options_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
void WindowStaffOptionsDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
{
if (widgetIndex != WIDX_COSTUME_BTN)
{

14
src/openrct2-ui/windows/StaffFirePrompt.cpp
View File

@ -38,19 +38,19 @@ static rct_widget window_staff_fire_widgets[] = {
WIDGETS_END,
};
static void window_staff_fire_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_staff_fire_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowStaffFireMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowStaffFirePaint(rct_window *w, rct_drawpixelinfo *dpi);
//0x9A3F7C
static rct_window_event_list window_staff_fire_events([](auto& events)
{
events.mouse_up = &window_staff_fire_mouseup;
events.paint = &window_staff_fire_paint;
events.mouse_up = &WindowStaffFireMouseup;
events.paint = &WindowStaffFirePaint;
});
// clang-format on
/** Based off of rct2: 0x6C0A77 */
rct_window* window_staff_fire_prompt_open(Peep* peep)
rct_window* WindowStaffFirePromptOpen(Peep* peep)
{
rct_window* w;
@ -76,7 +76,7 @@ rct_window* window_staff_fire_prompt_open(Peep* peep)
*
* rct2: 0x006C0B40
*/
static void window_staff_fire_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowStaffFireMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -96,7 +96,7 @@ static void window_staff_fire_mouseup(rct_window* w, rct_widgetindex widgetIndex
*
* rct2: 0x006C0AF2
*/
static void window_staff_fire_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowStaffFirePaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);

4
src/openrct2-ui/windows/StaffList.cpp
View File

@ -456,7 +456,7 @@ public:
if (closestStaffMember != nullptr)
{
tool_cancel();
auto* staffWindow = window_staff_open(closestStaffMember);
auto* staffWindow = WindowStaffOpen(closestStaffMember);
window_event_dropdown_call(staffWindow, WC_PEEP__WIDX_PATROL, 0);
}
else
@ -664,7 +664,7 @@ private:
}
};
rct_window* window_staff_list_open()
rct_window* WindowStaffListOpen()
{
return WindowFocusOrCreate<StaffListWindow>(WC_STAFF_LIST, WW, WH, WF_10 | WF_RESIZABLE);
}

10
src/openrct2-ui/windows/TextInput.cpp
View File

@ -371,7 +371,7 @@ private:
}
};
void window_text_input_raw_open(
void WindowTextInputRawOpen(
rct_window* call_w, rct_widgetindex call_widget, rct_string_id title, rct_string_id description,
const Formatter& descriptionArgs, const_utf8string existing_text, int32_t maxLength)
{
@ -387,7 +387,7 @@ void window_text_input_raw_open(
}
}
void window_text_input_open(
void WindowTextInputOpen(
std::string_view title, std::string_view description, std::string_view initialValue, size_t maxLength,
std::function<void(std::string_view)> callback, std::function<void()> cancelCallback)
{
@ -401,15 +401,15 @@ void window_text_input_open(
}
}
void window_text_input_open(
void WindowTextInputOpen(
rct_window* call_w, rct_widgetindex call_widget, rct_string_id title, rct_string_id description,
const Formatter& descriptionArgs, rct_string_id existing_text, uintptr_t existing_args, int32_t maxLength)
{
auto existingText = format_string(existing_text, &existing_args);
window_text_input_raw_open(call_w, call_widget, title, description, descriptionArgs, existingText.c_str(), maxLength);
WindowTextInputRawOpen(call_w, call_widget, title, description, descriptionArgs, existingText.c_str(), maxLength);
}
void window_text_input_key(rct_window* w, char keychar)
void WindowTextInputKey(rct_window* w, char keychar)
{
const auto wndNumber = w->number;
const auto wndClass = w->classification;

106
src/openrct2-ui/windows/Themes.cpp
View File

@ -35,33 +35,33 @@ enum
WINDOW_THEMES_TAB_COUNT
};
static void window_themes_mouseup(rct_window* w, rct_widgetindex widgetIndex);
static void window_themes_resize(rct_window* w);
static void window_themes_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void window_themes_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void window_themes_update(rct_window* w);
static void window_themes_scrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height);
static void window_themes_scrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void window_themes_scrollmouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void window_themes_textinput(rct_window* w, rct_widgetindex widgetIndex, char* text);
static void window_themes_invalidate(rct_window* w);
static void window_themes_paint(rct_window* w, rct_drawpixelinfo* dpi);
static void window_themes_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex);
static void window_themes_draw_tab_images(rct_drawpixelinfo* dpi, rct_window* w);
static void WindowThemesMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowThemesResize(rct_window* w);
static void WindowThemesMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowThemesDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowThemesUpdate(rct_window* w);
static void WindowThemesScrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height);
static void WindowThemesScrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowThemesScrollmouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowThemesTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text);
static void WindowThemesInvalidate(rct_window* w);
static void WindowThemesPaint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowThemesScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex);
static void WindowThemesDrawTabImages(rct_drawpixelinfo* dpi, rct_window* w);
static rct_window_event_list window_themes_events([](auto& events) {
events.mouse_up = &window_themes_mouseup;
events.resize = &window_themes_resize;
events.mouse_down = &window_themes_mousedown;
events.dropdown = &window_themes_dropdown;
events.update = &window_themes_update;
events.get_scroll_size = &window_themes_scrollgetsize;
events.scroll_mousedown = &window_themes_scrollmousedown;
events.scroll_mouseover = &window_themes_scrollmouseover;
events.text_input = &window_themes_textinput;
events.invalidate = &window_themes_invalidate;
events.paint = &window_themes_paint;
events.scroll_paint = &window_themes_scrollpaint;
events.mouse_up = &WindowThemesMouseup;
events.resize = &WindowThemesResize;
events.mouse_down = &WindowThemesMousedown;
events.dropdown = &WindowThemesDropdown;
events.update = &WindowThemesUpdate;
events.get_scroll_size = &WindowThemesScrollgetsize;
events.scroll_mousedown = &WindowThemesScrollmousedown;
events.scroll_mouseover = &WindowThemesScrollmouseover;
events.text_input = &WindowThemesTextinput;
events.invalidate = &WindowThemesInvalidate;
events.paint = &WindowThemesPaint;
events.scroll_paint = &WindowThemesScrollpaint;
});
enum WINDOW_THEMES_WIDGET_IDX
@ -264,18 +264,18 @@ static constexpr const uint8_t _button_offset_x = 220;
static constexpr const uint8_t _button_offset_y = 3;
static constexpr const uint8_t _check_offset_y = 3 + 12 + 2;
static void window_themes_init_vars()
static void WindowThemesInitVars()
{
_selected_tab = WINDOW_THEMES_TAB_SETTINGS;
}
static rct_windowclass get_window_class_tab_index(int32_t index)
static rct_windowclass GetWindowClassTabIndex(int32_t index)
{
rct_windowclass* classes = window_themes_tab_classes[_selected_tab];
return classes[index];
}
static int32_t get_colour_scheme_tab_count()
static int32_t GetColourSchemeTabCount()
{
switch (_selected_tab)
{
@ -297,7 +297,7 @@ static int32_t get_colour_scheme_tab_count()
return 0;
}
static void window_themes_draw_tab_images(rct_drawpixelinfo* dpi, rct_window* w)
static void WindowThemesDrawTabImages(rct_drawpixelinfo* dpi, rct_window* w)
{
for (int32_t i = 0; i < WINDOW_THEMES_TAB_COUNT; i++)
{
@ -312,7 +312,7 @@ static void window_themes_draw_tab_images(rct_drawpixelinfo* dpi, rct_window* w)
}
}
rct_window* window_themes_open()
rct_window* WindowThemesOpen()
{
rct_window* window;
@ -332,7 +332,7 @@ rct_window* window_themes_open()
| (1ULL << WIDX_THEMES_RCT1_PARK_LIGHTS) | (1ULL << WIDX_THEMES_RCT1_SCENARIO_FONT)
| (1ULL << WIDX_THEMES_RCT1_BOTTOM_TOOLBAR);
window_themes_init_vars();
WindowThemesInitVars();
WindowInitScrollWidgets(window);
window->list_information_type = 0;
@ -346,7 +346,7 @@ rct_window* window_themes_open()
return window;
}
static void window_themes_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowThemesMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
size_t activeAvailableThemeIndex;
const utf8* activeThemeName;
@ -359,7 +359,7 @@ static void window_themes_mouseup(rct_window* w, rct_widgetindex widgetIndex)
case WIDX_THEMES_DUPLICATE_BUTTON:;
activeAvailableThemeIndex = ThemeManagerGetAvailableThemeIndex();
activeThemeName = ThemeManagerGetAvailableThemeName(activeAvailableThemeIndex);
window_text_input_open(
WindowTextInputOpen(
w, widgetIndex, STR_TITLE_EDITOR_ACTION_DUPLICATE, STR_THEMES_PROMPT_ENTER_THEME_NAME, {}, STR_STRING,
reinterpret_cast<uintptr_t>(activeThemeName), 64);
break;
@ -382,7 +382,7 @@ static void window_themes_mouseup(rct_window* w, rct_widgetindex widgetIndex)
{
activeAvailableThemeIndex = ThemeManagerGetAvailableThemeIndex();
activeThemeName = ThemeManagerGetAvailableThemeName(activeAvailableThemeIndex);
window_text_input_open(
WindowTextInputOpen(
w, widgetIndex, STR_TRACK_MANAGE_RENAME, STR_THEMES_PROMPT_ENTER_THEME_NAME, {}, STR_STRING,
reinterpret_cast<uintptr_t>(activeThemeName), 64);
}
@ -390,7 +390,7 @@ static void window_themes_mouseup(rct_window* w, rct_widgetindex widgetIndex)
}
}
static void window_themes_resize(rct_window* w)
static void WindowThemesResize(rct_window* w)
{
if (_selected_tab == WINDOW_THEMES_TAB_SETTINGS)
{
@ -478,7 +478,7 @@ static void window_themes_resize(rct_window* w)
}
}
static void window_themes_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowThemesMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
int16_t newSelectedTab;
int32_t num_items;
@ -570,14 +570,14 @@ static void window_themes_mousedown(rct_window* w, rct_widgetindex widgetIndex,
}
}
static void window_themes_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowThemesDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
{
switch (widgetIndex)
{
case WIDX_THEMES_LIST:
if (dropdownIndex != -1)
{
rct_windowclass wc = get_window_class_tab_index(_colour_index_1);
rct_windowclass wc = GetWindowClassTabIndex(_colour_index_1);
uint8_t colour = ThemeGetColour(wc, _colour_index_2);
colour = (colour & COLOUR_FLAG_TRANSLUCENT) | dropdownIndex;
ThemeSetColour(wc, _colour_index_2, colour);
@ -596,7 +596,7 @@ static void window_themes_dropdown(rct_window* w, rct_widgetindex widgetIndex, i
}
}
void window_themes_update(rct_window* w)
void WindowThemesUpdate(rct_window* w)
{
w->frame_no++;
if (w->frame_no >= window_themes_tab_animation_loops[_selected_tab])
@ -605,12 +605,12 @@ void window_themes_update(rct_window* w)
widget_invalidate(w, WIDX_THEMES_SETTINGS_TAB + _selected_tab);
}
void window_themes_scrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
void WindowThemesScrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
{
if (_selected_tab == WINDOW_THEMES_TAB_SETTINGS || _selected_tab == WINDOW_THEMES_TAB_FEATURES)
return;
int32_t scrollHeight = get_colour_scheme_tab_count() * _row_height;
int32_t scrollHeight = GetColourSchemeTabCount() * _row_height;
int32_t i = scrollHeight - window_themes_widgets[WIDX_THEMES_LIST].bottom + window_themes_widgets[WIDX_THEMES_LIST].top
+ 21;
if (i < 0)
@ -625,15 +625,15 @@ void window_themes_scrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* wi
*height = scrollHeight;
}
void window_themes_scrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
void WindowThemesScrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
{
if (screenCoords.y / _row_height < get_colour_scheme_tab_count())
if (screenCoords.y / _row_height < GetColourSchemeTabCount())
{
int32_t y2 = screenCoords.y % _row_height;
_colour_index_1 = screenCoords.y / _row_height;
_colour_index_2 = ((screenCoords.x - _button_offset_x) / 12);
rct_windowclass wc = get_window_class_tab_index(_colour_index_1);
rct_windowclass wc = GetWindowClassTabIndex(_colour_index_1);
int32_t numColours = ThemeDescGetNumColours(wc);
if (_colour_index_2 < numColours)
{
@ -691,11 +691,11 @@ void window_themes_scrollmousedown(rct_window* w, int32_t scrollIndex, const Scr
}
}
void window_themes_scrollmouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
void WindowThemesScrollmouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
{
}
static void window_themes_textinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
static void WindowThemesTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
{
if (text == nullptr || text[0] == 0)
return;
@ -731,7 +731,7 @@ static void window_themes_textinput(rct_window* w, rct_widgetindex widgetIndex,
}
}
void window_themes_invalidate(rct_window* w)
void WindowThemesInvalidate(rct_window* w)
{
int32_t pressed_widgets = w->pressed_widgets
& ~((1LL << WIDX_THEMES_SETTINGS_TAB) | (1LL << WIDX_THEMES_MAIN_UI_TAB) | (1LL << WIDX_THEMES_PARK_TAB)
@ -813,11 +813,11 @@ void window_themes_invalidate(rct_window* w)
}
}
void window_themes_paint(rct_window* w, rct_drawpixelinfo* dpi)
void WindowThemesPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
// Widgets
WindowDrawWidgets(w, dpi);
window_themes_draw_tab_images(dpi, w);
WindowThemesDrawTabImages(dpi, w);
if (_selected_tab == WINDOW_THEMES_TAB_SETTINGS)
{
@ -844,7 +844,7 @@ void window_themes_paint(rct_window* w, rct_drawpixelinfo* dpi)
*
* rct2: 0x006BD785
*/
void window_themes_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
void WindowThemesScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
{
ScreenCoordsXY screenCoords;
@ -856,7 +856,7 @@ void window_themes_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t sc
// ColourMapA[w->colours[1]].mid_light);
gfx_clear(dpi, ColourMapA[w->colours[1]].mid_light);
screenCoords.y = 0;
for (int32_t i = 0; i < get_colour_scheme_tab_count(); i++)
for (int32_t i = 0; i < GetColourSchemeTabCount(); i++)
{
if (screenCoords.y > dpi->y + dpi->height)
{
@ -864,7 +864,7 @@ void window_themes_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t sc
}
if (screenCoords.y + _row_height >= dpi->y)
{
if (i + 1 < get_colour_scheme_tab_count())
if (i + 1 < GetColourSchemeTabCount())
{
int32_t colour = w->colours[1];
@ -890,7 +890,7 @@ void window_themes_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t sc
}
}
rct_windowclass wc = get_window_class_tab_index(i);
rct_windowclass wc = GetWindowClassTabIndex(i);
int32_t numColours = ThemeDescGetNumColours(wc);
for (uint8_t j = 0; j < numColours; j++)
{

280
src/openrct2-ui/windows/TileInspector.cpp
View File

@ -437,40 +437,40 @@ static bool windowTileInspectorApplyToAll = false;
static bool windowTileInspectorElementCopied = false;
static TileElement tileInspectorCopiedElement;
static void window_tile_inspector_mouseup(rct_window* w, rct_widgetindex widgetIndex);
static void window_tile_inspector_resize(rct_window* w);
static void window_tile_inspector_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void window_tile_inspector_update(rct_window* w);
static void window_tile_inspector_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void window_tile_inspector_tool_update(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void window_tile_inspector_update_selected_tile(rct_window* w, const ScreenCoordsXY& screenCoords);
static void window_tile_inspector_tool_down(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void window_tile_inspector_tool_drag(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void window_tile_inspector_scrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height);
static void window_tile_inspector_scrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void window_tile_inspector_scrollmouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void window_tile_inspector_invalidate(rct_window* w);
static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi);
static void window_tile_inspector_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex);
static void window_tile_inspector_set_page(rct_window* w, const TileInspectorPage page);
static void window_tile_inspector_close(rct_window* w);
static void WindowTileInspectorMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowTileInspectorResize(rct_window* w);
static void WindowTileInspectorMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowTileInspectorUpdate(rct_window* w);
static void WindowTileInspectorDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowTileInspectorToolUpdate(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowTileInspectorUpdateSelectedTile(rct_window* w, const ScreenCoordsXY& screenCoords);
static void WindowTileInspectorToolDown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowTileInspectorToolDrag(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowTileInspectorScrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height);
static void WindowTileInspectorScrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowTileInspectorScrollmouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowTileInspectorInvalidate(rct_window* w);
static void WindowTileInspectorPaint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowTileInspectorScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex);
static void WindowTileInspectorSetPage(rct_window* w, const TileInspectorPage page);
static void WindowTileInspectorClose(rct_window* w);
static rct_window_event_list TileInspectorWindowEvents([](auto& events) {
events.mouse_up = &window_tile_inspector_mouseup;
events.resize = &window_tile_inspector_resize;
events.mouse_down = &window_tile_inspector_mousedown;
events.dropdown = &window_tile_inspector_dropdown;
events.update = &window_tile_inspector_update;
events.tool_update = &window_tile_inspector_tool_update;
events.tool_down = &window_tile_inspector_tool_down;
events.tool_drag = &window_tile_inspector_tool_drag;
events.get_scroll_size = &window_tile_inspector_scrollgetsize;
events.scroll_mousedown = &window_tile_inspector_scrollmousedown;
events.scroll_mouseover = &window_tile_inspector_scrollmouseover;
events.invalidate = &window_tile_inspector_invalidate;
events.paint = &window_tile_inspector_paint;
events.scroll_paint = &window_tile_inspector_scrollpaint;
events.close = &window_tile_inspector_close;
events.mouse_up = &WindowTileInspectorMouseup;
events.resize = &WindowTileInspectorResize;
events.mouse_down = &WindowTileInspectorMousedown;
events.dropdown = &WindowTileInspectorDropdown;
events.update = &WindowTileInspectorUpdate;
events.tool_update = &WindowTileInspectorToolUpdate;
events.tool_down = &WindowTileInspectorToolDown;
events.tool_drag = &WindowTileInspectorToolDrag;
events.get_scroll_size = &WindowTileInspectorScrollgetsize;
events.scroll_mousedown = &WindowTileInspectorScrollmousedown;
events.scroll_mouseover = &WindowTileInspectorScrollmouseover;
events.invalidate = &WindowTileInspectorInvalidate;
events.paint = &WindowTileInspectorPaint;
events.scroll_paint = &WindowTileInspectorScrollpaint;
events.close = &WindowTileInspectorClose;
});
// clang-format off
@ -511,7 +511,7 @@ static uint64_t PageDisabledWidgets[] = {
};
// clang-format on
rct_window* window_tile_inspector_open()
rct_window* WindowTileInspectorOpen()
{
rct_window* window;
@ -522,7 +522,7 @@ rct_window* window_tile_inspector_open()
window = WindowCreate(ScreenCoordsXY(0, 29), WW, WH, &TileInspectorWindowEvents, WC_TILE_INSPECTOR, WF_RESIZABLE);
window_tile_inspector_set_page(window, TileInspectorPage::Default);
WindowTileInspectorSetPage(window, TileInspectorPage::Default);
window->min_width = MIN_WW;
window->min_height = MIN_WH;
window->max_width = MAX_WW;
@ -537,12 +537,12 @@ rct_window* window_tile_inspector_open()
return window;
}
void window_tile_inspector_clear_clipboard()
void WindowTileInspectorClearClipboard()
{
windowTileInspectorElementCopied = false;
}
static TileElement* window_tile_inspector_get_selected_element(rct_window* w)
static TileElement* WindowTileInspectorGetSelectedElement(rct_window* w)
{
openrct2_assert(
windowTileInspectorSelectedIndex >= 0 && windowTileInspectorSelectedIndex < windowTileInspectorElementCount,
@ -550,7 +550,7 @@ static TileElement* window_tile_inspector_get_selected_element(rct_window* w)
return map_get_first_element_at(windowTileInspectorToolMap) + windowTileInspectorSelectedIndex;
}
static void window_tile_inspector_select_element_from_list(rct_window* w, int32_t index)
static void WindowTileInspectorSelectElementFromList(rct_window* w, int32_t index)
{
if (index < 0 || index >= windowTileInspectorElementCount)
{
@ -561,14 +561,14 @@ static void window_tile_inspector_select_element_from_list(rct_window* w, int32_
{
windowTileInspectorSelectedIndex = index;
const TileElement* const tileElement = window_tile_inspector_get_selected_element(w);
const TileElement* const tileElement = WindowTileInspectorGetSelectedElement(w);
OpenRCT2::TileInspector::SetSelectedElement(tileElement);
}
w->Invalidate();
}
static void window_tile_inspector_load_tile(rct_window* w, TileElement* elementToSelect)
static void WindowTileInspectorLoadTile(rct_window* w, TileElement* elementToSelect)
{
windowTileInspectorSelectedIndex = -1;
w->scrolls[0].v_top = 0;
@ -592,14 +592,14 @@ static void window_tile_inspector_load_tile(rct_window* w, TileElement* elementT
w->Invalidate();
}
static void window_tile_inspector_remove_element(int32_t elementIndex)
static void WindowTileInspectorRemoveElement(int32_t elementIndex)
{
openrct2_assert(elementIndex >= 0 && elementIndex < windowTileInspectorElementCount, "elementIndex out of range");
auto modifyTile = TileModifyAction(windowTileInspectorToolMap, TileModifyType::AnyRemove, elementIndex);
GameActions::Execute(&modifyTile);
}
static void window_tile_inspector_rotate_element(int32_t elementIndex)
static void WindowTileInspectorRotateElement(int32_t elementIndex)
{
openrct2_assert(elementIndex >= 0 && elementIndex < windowTileInspectorElementCount, "elementIndex out of range");
auto modifyTile = TileModifyAction(windowTileInspectorToolMap, TileModifyType::AnyRotate, elementIndex);
@ -607,7 +607,7 @@ static void window_tile_inspector_rotate_element(int32_t elementIndex)
}
// Swap element with its parent
static void window_tile_inspector_swap_elements(int16_t first, int16_t second)
static void WindowTileInspectorSwapElements(int16_t first, int16_t second)
{
bool firstInRange = first >= 0 && first < windowTileInspectorElementCount;
bool secondInRange = second >= 0 && second < windowTileInspectorElementCount;
@ -619,65 +619,65 @@ static void window_tile_inspector_swap_elements(int16_t first, int16_t second)
GameActions::Execute(&modifyTile);
}
static void window_tile_inspector_sort_elements()
static void WindowTileInspectorSortElements()
{
openrct2_assert(windowTileInspectorTileSelected, "No tile selected");
auto modifyTile = TileModifyAction(windowTileInspectorToolMap, TileModifyType::AnySort);
GameActions::Execute(&modifyTile);
}
static void window_tile_inspector_copy_element(rct_window* w)
static void WindowTileInspectorCopyElement(rct_window* w)
{
// Copy value, in case the element gets moved
tileInspectorCopiedElement = *window_tile_inspector_get_selected_element(w);
tileInspectorCopiedElement = *WindowTileInspectorGetSelectedElement(w);
windowTileInspectorElementCopied = true;
w->Invalidate();
}
static void window_tile_inspector_paste_element(rct_window* w)
static void WindowTileInspectorPasteElement(rct_window* w)
{
auto modifyTile = TileModifyAction(windowTileInspectorToolMap, TileModifyType::AnyPaste, 0, 0, tileInspectorCopiedElement);
GameActions::Execute(&modifyTile);
}
static void window_tile_inspector_base_height_offset(int16_t elementIndex, int8_t heightOffset)
static void WindowTileInspectorBaseHeightOffset(int16_t elementIndex, int8_t heightOffset)
{
auto modifyTile = TileModifyAction(
windowTileInspectorToolMap, TileModifyType::AnyBaseHeightOffset, elementIndex, heightOffset);
GameActions::Execute(&modifyTile);
}
static void window_tile_inspector_surface_show_park_fences(bool showFences)
static void WindowTileInspectorSurfaceShowParkFences(bool showFences)
{
auto modifyTile = TileModifyAction(windowTileInspectorToolMap, TileModifyType::SurfaceShowParkFences, showFences);
GameActions::Execute(&modifyTile);
}
static void window_tile_inspector_surface_toggle_corner(int32_t cornerIndex)
static void WindowTileInspectorSurfaceToggleCorner(int32_t cornerIndex)
{
auto modifyTile = TileModifyAction(windowTileInspectorToolMap, TileModifyType::SurfaceToggleCorner, cornerIndex);
GameActions::Execute(&modifyTile);
}
static void window_tile_inspector_surface_toggle_diagonal()
static void WindowTileInspectorSurfaceToggleDiagonal()
{
auto modifyTile = TileModifyAction(windowTileInspectorToolMap, TileModifyType::SurfaceToggleDiagonal);
GameActions::Execute(&modifyTile);
}
static void window_tile_inspector_path_set_sloped(int32_t elementIndex, bool sloped)
static void WindowTileInspectorPathSetSloped(int32_t elementIndex, bool sloped)
{
auto modifyTile = TileModifyAction(windowTileInspectorToolMap, TileModifyType::PathSetSlope, elementIndex, sloped);
GameActions::Execute(&modifyTile);
}
static void window_tile_inspector_path_set_broken(int32_t elementIndex, bool broken)
static void WindowTileInspectorPathSetBroken(int32_t elementIndex, bool broken)
{
auto modifyTile = TileModifyAction(windowTileInspectorToolMap, TileModifyType::PathSetBroken, elementIndex, broken);
GameActions::Execute(&modifyTile);
}
static void window_tile_inspector_path_toggle_edge(int32_t elementIndex, int32_t cornerIndex)
static void WindowTileInspectorPathToggleEdge(int32_t elementIndex, int32_t cornerIndex)
{
openrct2_assert(elementIndex >= 0 && elementIndex < windowTileInspectorElementCount, "elementIndex out of range");
openrct2_assert(cornerIndex >= 0 && cornerIndex < 8, "cornerIndex out of range");
@ -685,14 +685,14 @@ static void window_tile_inspector_path_toggle_edge(int32_t elementIndex, int32_t
GameActions::Execute(&modifyTile);
}
static void window_tile_inspector_entrance_make_usable(int32_t elementIndex)
static void WindowTileInspectorEntranceMakeUsable(int32_t elementIndex)
{
Guard::ArgumentInRange(elementIndex, 0, windowTileInspectorElementCount - 1);
auto modifyTile = TileModifyAction(windowTileInspectorToolMap, TileModifyType::EntranceMakeUsable, elementIndex);
GameActions::Execute(&modifyTile);
}
static void window_tile_inspector_wall_set_slope(int32_t elementIndex, int32_t slopeValue)
static void WindowTileInspectorWallSetSlope(int32_t elementIndex, int32_t slopeValue)
{
// Make sure only the correct bits are set
openrct2_assert((slopeValue & 3) == slopeValue, "slopeValue doesn't match its mask");
@ -700,21 +700,21 @@ static void window_tile_inspector_wall_set_slope(int32_t elementIndex, int32_t s
GameActions::Execute(&modifyTile);
}
static void window_tile_inspector_wall_animation_frame_offset(int16_t elementIndex, int8_t animationFrameOffset)
static void WindowTileInspectorWallAnimationFrameOffset(int16_t elementIndex, int8_t animationFrameOffset)
{
auto modifyTile = TileModifyAction(
windowTileInspectorToolMap, TileModifyType::WallSetAnimationFrame, elementIndex, animationFrameOffset);
GameActions::Execute(&modifyTile);
}
static void window_tile_inspector_track_block_height_offset(int32_t elementIndex, int8_t heightOffset)
static void WindowTileInspectorTrackBlockHeightOffset(int32_t elementIndex, int8_t heightOffset)
{
auto modifyTile = TileModifyAction(
windowTileInspectorToolMap, TileModifyType::TrackBaseHeightOffset, elementIndex, heightOffset);
GameActions::Execute(&modifyTile);
}
static void window_tile_inspector_track_block_set_lift(int32_t elementIndex, bool entireTrackBlock, bool chain)
static void WindowTileInspectorTrackBlockSetLift(int32_t elementIndex, bool entireTrackBlock, bool chain)
{
auto modifyTile = TileModifyAction(
windowTileInspectorToolMap, entireTrackBlock ? TileModifyType::TrackSetChainBlock : TileModifyType::TrackSetChain,
@ -722,21 +722,21 @@ static void window_tile_inspector_track_block_set_lift(int32_t elementIndex, boo
GameActions::Execute(&modifyTile);
}
static void window_tile_inspector_track_set_block_brake(int32_t elementIndex, bool blockBrake)
static void WindowTileInspectorTrackSetBlockBrake(int32_t elementIndex, bool blockBrake)
{
auto modifyTile = TileModifyAction(
windowTileInspectorToolMap, TileModifyType::TrackSetBlockBrake, elementIndex, blockBrake);
GameActions::Execute(&modifyTile);
}
static void window_tile_inspector_track_set_indestructible(int32_t elementIndex, bool isIndestructible)
static void WindowTileInspectorTrackSetIndestructible(int32_t elementIndex, bool isIndestructible)
{
auto modifyTile = TileModifyAction(
windowTileInspectorToolMap, TileModifyType::TrackSetIndestructible, elementIndex, isIndestructible);
GameActions::Execute(&modifyTile);
}
static void window_tile_inspector_quarter_tile_set(int32_t elementIndex, const int32_t quarterIndex)
static void WindowTileInspectorQuarterTileSet(int32_t elementIndex, const int32_t quarterIndex)
{
// quarterIndex is widget index relative to WIDX_SCENERY_CHECK_QUARTER_N, so a value from 0-3
openrct2_assert(quarterIndex >= 0 && quarterIndex < 4, "quarterIndex out of range");
@ -746,7 +746,7 @@ static void window_tile_inspector_quarter_tile_set(int32_t elementIndex, const i
GameActions::Execute(&modifyTile);
}
static void window_tile_inspector_toggle_quadrant_collosion(int32_t elementIndex, const int32_t quadrantIndex)
static void WindowTileInspectorToggleQuadrantCollosion(int32_t elementIndex, const int32_t quadrantIndex)
{
auto modifyTile = TileModifyAction(
windowTileInspectorToolMap, TileModifyType::ScenerySetQuarterCollision, elementIndex,
@ -754,7 +754,7 @@ static void window_tile_inspector_toggle_quadrant_collosion(int32_t elementIndex
GameActions::Execute(&modifyTile);
}
static void window_tile_inspector_banner_toggle_block(int32_t elementIndex, int32_t edgeIndex)
static void WindowTileInspectorBannerToggleBlock(int32_t elementIndex, int32_t edgeIndex)
{
openrct2_assert(edgeIndex >= 0 && edgeIndex < 4, "edgeIndex out of range");
@ -772,12 +772,12 @@ static void WindowTileInspectorToggleInvisibility(int32_t elementIndex)
GameActions::Execute(&modifyTile);
}
static void window_tile_inspector_close(rct_window* w)
static void WindowTileInspectorClose(rct_window* w)
{
OpenRCT2::TileInspector::SetSelectedElement(nullptr);
}
static void window_tile_inspector_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowTileInspectorMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -791,27 +791,27 @@ static void window_tile_inspector_mouseup(rct_window* w, rct_widgetindex widgetI
case WIDX_BUTTON_REMOVE:
{
int32_t nextItemToSelect = windowTileInspectorSelectedIndex - 1;
window_tile_inspector_remove_element(windowTileInspectorSelectedIndex);
window_tile_inspector_select_element_from_list(w, nextItemToSelect);
WindowTileInspectorRemoveElement(windowTileInspectorSelectedIndex);
WindowTileInspectorSelectElementFromList(w, nextItemToSelect);
break;
}
case WIDX_BUTTON_ROTATE:
window_tile_inspector_rotate_element(windowTileInspectorSelectedIndex);
WindowTileInspectorRotateElement(windowTileInspectorSelectedIndex);
break;
case WIDX_BUTTON_SORT:
window_tile_inspector_sort_elements();
WindowTileInspectorSortElements();
break;
case WIDX_BUTTON_COPY:
window_tile_inspector_copy_element(w);
WindowTileInspectorCopyElement(w);
break;
case WIDX_BUTTON_PASTE:
window_tile_inspector_paste_element(w);
WindowTileInspectorPasteElement(w);
break;
case WIDX_BUTTON_MOVE_UP:
window_tile_inspector_swap_elements(windowTileInspectorSelectedIndex, windowTileInspectorSelectedIndex + 1);
WindowTileInspectorSwapElements(windowTileInspectorSelectedIndex, windowTileInspectorSelectedIndex + 1);
break;
case WIDX_BUTTON_MOVE_DOWN:
window_tile_inspector_swap_elements(windowTileInspectorSelectedIndex - 1, windowTileInspectorSelectedIndex);
WindowTileInspectorSwapElements(windowTileInspectorSelectedIndex - 1, windowTileInspectorSelectedIndex);
break;
}
@ -821,7 +821,7 @@ static void window_tile_inspector_mouseup(rct_window* w, rct_widgetindex widgetI
return;
}
TileElement* const tileElement = window_tile_inspector_get_selected_element(w);
TileElement* const tileElement = WindowTileInspectorGetSelectedElement(w);
// Update selection, can be nullptr.
OpenRCT2::TileInspector::SetSelectedElement(tileElement);
@ -836,20 +836,20 @@ static void window_tile_inspector_mouseup(rct_window* w, rct_widgetindex widgetI
switch (widgetIndex)
{
case WIDX_SURFACE_BUTTON_REMOVE_FENCES:
window_tile_inspector_surface_show_park_fences(false);
WindowTileInspectorSurfaceShowParkFences(false);
break;
case WIDX_SURFACE_BUTTON_RESTORE_FENCES:
window_tile_inspector_surface_show_park_fences(true);
WindowTileInspectorSurfaceShowParkFences(true);
break;
case WIDX_SURFACE_CHECK_CORNER_N:
case WIDX_SURFACE_CHECK_CORNER_E:
case WIDX_SURFACE_CHECK_CORNER_S:
case WIDX_SURFACE_CHECK_CORNER_W:
window_tile_inspector_surface_toggle_corner(
WindowTileInspectorSurfaceToggleCorner(
((widgetIndex - WIDX_SURFACE_CHECK_CORNER_N) + 2 - get_current_rotation()) & 3);
break;
case WIDX_SURFACE_CHECK_DIAGONAL:
window_tile_inspector_surface_toggle_diagonal();
WindowTileInspectorSurfaceToggleDiagonal();
break;
} // switch widgetindex
break;
@ -858,10 +858,10 @@ static void window_tile_inspector_mouseup(rct_window* w, rct_widgetindex widgetI
switch (widgetIndex)
{
case WIDX_PATH_CHECK_SLOPED:
window_tile_inspector_path_set_sloped(windowTileInspectorSelectedIndex, !tileElement->AsPath()->IsSloped());
WindowTileInspectorPathSetSloped(windowTileInspectorSelectedIndex, !tileElement->AsPath()->IsSloped());
break;
case WIDX_PATH_CHECK_BROKEN:
window_tile_inspector_path_set_broken(windowTileInspectorSelectedIndex, !tileElement->AsPath()->IsBroken());
WindowTileInspectorPathSetBroken(windowTileInspectorSelectedIndex, !tileElement->AsPath()->IsBroken());
break;
case WIDX_PATH_CHECK_EDGE_E:
case WIDX_PATH_CHECK_EDGE_S:
@ -872,7 +872,7 @@ static void window_tile_inspector_mouseup(rct_window* w, rct_widgetindex widgetI
const int32_t eswn = (widgetIndex - WIDX_PATH_CHECK_EDGE_E) / 2;
// Transform to world orientation
const int32_t index = (eswn - get_current_rotation()) & 3;
window_tile_inspector_path_toggle_edge(
WindowTileInspectorPathToggleEdge(
windowTileInspectorSelectedIndex,
index + 4); // The corners are stored in the 4 most significant bits, hence the + 4
break;
@ -886,7 +886,7 @@ static void window_tile_inspector_mouseup(rct_window* w, rct_widgetindex widgetI
const int32_t neseswnw = (widgetIndex - WIDX_PATH_CHECK_EDGE_NE) / 2;
// Transform to world orientation
const int32_t index = (neseswnw - get_current_rotation()) & 3;
window_tile_inspector_path_toggle_edge(windowTileInspectorSelectedIndex, index);
WindowTileInspectorPathToggleEdge(windowTileInspectorSelectedIndex, index);
break;
}
} // switch widget index
@ -903,15 +903,15 @@ static void window_tile_inspector_mouseup(rct_window* w, rct_widgetindex widgetI
{
bool entireTrackBlock = WidgetIsPressed(w, WIDX_TRACK_CHECK_APPLY_TO_ALL);
bool newLift = !tileElement->AsTrack()->HasChain();
window_tile_inspector_track_block_set_lift(windowTileInspectorSelectedIndex, entireTrackBlock, newLift);
WindowTileInspectorTrackBlockSetLift(windowTileInspectorSelectedIndex, entireTrackBlock, newLift);
break;
}
case WIDX_TRACK_CHECK_BLOCK_BRAKE_CLOSED:
window_tile_inspector_track_set_block_brake(
WindowTileInspectorTrackSetBlockBrake(
windowTileInspectorSelectedIndex, !tileElement->AsTrack()->BlockBrakeClosed());
break;
case WIDX_TRACK_CHECK_IS_INDESTRUCTIBLE:
window_tile_inspector_track_set_indestructible(
WindowTileInspectorTrackSetIndestructible(
windowTileInspectorSelectedIndex, !tileElement->AsTrack()->IsIndestructible());
break;
} // switch widget index
@ -924,14 +924,14 @@ static void window_tile_inspector_mouseup(rct_window* w, rct_widgetindex widgetI
case WIDX_SCENERY_CHECK_QUARTER_E:
case WIDX_SCENERY_CHECK_QUARTER_S:
case WIDX_SCENERY_CHECK_QUARTER_W:
window_tile_inspector_quarter_tile_set(
WindowTileInspectorQuarterTileSet(
windowTileInspectorSelectedIndex, widgetIndex - WIDX_SCENERY_CHECK_QUARTER_N);
break;
case WIDX_SCENERY_CHECK_COLLISION_N:
case WIDX_SCENERY_CHECK_COLLISION_E:
case WIDX_SCENERY_CHECK_COLLISION_S:
case WIDX_SCENERY_CHECK_COLLISION_W:
window_tile_inspector_toggle_quadrant_collosion(
WindowTileInspectorToggleQuadrantCollosion(
windowTileInspectorSelectedIndex, widgetIndex - WIDX_SCENERY_CHECK_COLLISION_N);
break;
} // switch widget index
@ -941,7 +941,7 @@ static void window_tile_inspector_mouseup(rct_window* w, rct_widgetindex widgetI
switch (widgetIndex)
{
case WIDX_ENTRANCE_BUTTON_MAKE_USABLE:
window_tile_inspector_entrance_make_usable(windowTileInspectorSelectedIndex);
WindowTileInspectorEntranceMakeUsable(windowTileInspectorSelectedIndex);
break;
} // switch widget index
break;
@ -953,7 +953,7 @@ static void window_tile_inspector_mouseup(rct_window* w, rct_widgetindex widgetI
case WIDX_BANNER_CHECK_BLOCK_SE:
case WIDX_BANNER_CHECK_BLOCK_SW:
case WIDX_BANNER_CHECK_BLOCK_NW:
window_tile_inspector_banner_toggle_block(
WindowTileInspectorBannerToggleBlock(
windowTileInspectorSelectedIndex, widgetIndex - WIDX_BANNER_CHECK_BLOCK_NE);
break;
} // switch widget index
@ -966,7 +966,7 @@ static void window_tile_inspector_mouseup(rct_window* w, rct_widgetindex widgetI
}
}
static void window_tile_inspector_resize(rct_window* w)
static void WindowTileInspectorResize(rct_window* w)
{
if (w->width < w->min_width)
{
@ -980,29 +980,29 @@ static void window_tile_inspector_resize(rct_window* w)
}
}
static void window_tile_inspector_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowTileInspectorMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
switch (widgetIndex)
{
case WIDX_SPINNER_X_INCREASE:
windowTileInspectorTile.x = std::min<int32_t>(windowTileInspectorTile.x + 1, MAXIMUM_MAP_SIZE_TECHNICAL - 1);
windowTileInspectorToolMap.x = std::min<int32_t>(windowTileInspectorToolMap.x + 32, MAXIMUM_TILE_START_XY);
window_tile_inspector_load_tile(w, nullptr);
WindowTileInspectorLoadTile(w, nullptr);
break;
case WIDX_SPINNER_X_DECREASE:
windowTileInspectorTile.x = std::max<int32_t>(windowTileInspectorTile.x - 1, 0);
windowTileInspectorToolMap.x = std::max<int32_t>(windowTileInspectorToolMap.x - 32, 0);
window_tile_inspector_load_tile(w, nullptr);
WindowTileInspectorLoadTile(w, nullptr);
break;
case WIDX_SPINNER_Y_INCREASE:
windowTileInspectorTile.y = std::min<int32_t>(windowTileInspectorTile.y + 1, MAXIMUM_MAP_SIZE_TECHNICAL - 1);
windowTileInspectorToolMap.y = std::min<int32_t>(windowTileInspectorToolMap.y + 32, MAXIMUM_TILE_START_XY);
window_tile_inspector_load_tile(w, nullptr);
WindowTileInspectorLoadTile(w, nullptr);
break;
case WIDX_SPINNER_Y_DECREASE:
windowTileInspectorTile.y = std::max<int32_t>(windowTileInspectorTile.y - 1, 0);
windowTileInspectorToolMap.y = std::max<int32_t>(windowTileInspectorToolMap.y - 32, 0);
window_tile_inspector_load_tile(w, nullptr);
WindowTileInspectorLoadTile(w, nullptr);
break;
} // switch widget index
@ -1012,7 +1012,7 @@ static void window_tile_inspector_mousedown(rct_window* w, rct_widgetindex widge
return;
}
const TileElement* tileElement = window_tile_inspector_get_selected_element(w);
const TileElement* tileElement = WindowTileInspectorGetSelectedElement(w);
if (tileElement == nullptr)
return;
@ -1022,10 +1022,10 @@ static void window_tile_inspector_mousedown(rct_window* w, rct_widgetindex widge
switch (widgetIndex)
{
case WIDX_SURFACE_SPINNER_HEIGHT_INCREASE:
window_tile_inspector_base_height_offset(windowTileInspectorSelectedIndex, 1);
WindowTileInspectorBaseHeightOffset(windowTileInspectorSelectedIndex, 1);
break;
case WIDX_SURFACE_SPINNER_HEIGHT_DECREASE:
window_tile_inspector_base_height_offset(windowTileInspectorSelectedIndex, -1);
WindowTileInspectorBaseHeightOffset(windowTileInspectorSelectedIndex, -1);
break;
} // switch widget index
break;
@ -1034,10 +1034,10 @@ static void window_tile_inspector_mousedown(rct_window* w, rct_widgetindex widge
switch (widgetIndex)
{
case WIDX_PATH_SPINNER_HEIGHT_INCREASE:
window_tile_inspector_base_height_offset(windowTileInspectorSelectedIndex, 1);
WindowTileInspectorBaseHeightOffset(windowTileInspectorSelectedIndex, 1);
break;
case WIDX_PATH_SPINNER_HEIGHT_DECREASE:
window_tile_inspector_base_height_offset(windowTileInspectorSelectedIndex, -1);
WindowTileInspectorBaseHeightOffset(windowTileInspectorSelectedIndex, -1);
break;
} // switch widget index
break;
@ -1048,21 +1048,21 @@ static void window_tile_inspector_mousedown(rct_window* w, rct_widgetindex widge
case WIDX_TRACK_SPINNER_HEIGHT_INCREASE:
if (WidgetIsPressed(w, WIDX_TRACK_CHECK_APPLY_TO_ALL))
{
window_tile_inspector_track_block_height_offset(windowTileInspectorSelectedIndex, 1);
WindowTileInspectorTrackBlockHeightOffset(windowTileInspectorSelectedIndex, 1);
}
else
{
window_tile_inspector_base_height_offset(windowTileInspectorSelectedIndex, 1);
WindowTileInspectorBaseHeightOffset(windowTileInspectorSelectedIndex, 1);
}
break;
case WIDX_TRACK_SPINNER_HEIGHT_DECREASE:
if (WidgetIsPressed(w, WIDX_TRACK_CHECK_APPLY_TO_ALL))
{
window_tile_inspector_track_block_height_offset(windowTileInspectorSelectedIndex, -1);
WindowTileInspectorTrackBlockHeightOffset(windowTileInspectorSelectedIndex, -1);
}
else
{
window_tile_inspector_base_height_offset(windowTileInspectorSelectedIndex, -1);
WindowTileInspectorBaseHeightOffset(windowTileInspectorSelectedIndex, -1);
}
break;
} // switch widget index
@ -1072,10 +1072,10 @@ static void window_tile_inspector_mousedown(rct_window* w, rct_widgetindex widge
switch (widgetIndex)
{
case WIDX_SCENERY_SPINNER_HEIGHT_INCREASE:
window_tile_inspector_base_height_offset(windowTileInspectorSelectedIndex, 1);
WindowTileInspectorBaseHeightOffset(windowTileInspectorSelectedIndex, 1);
break;
case WIDX_SCENERY_SPINNER_HEIGHT_DECREASE:
window_tile_inspector_base_height_offset(windowTileInspectorSelectedIndex, -1);
WindowTileInspectorBaseHeightOffset(windowTileInspectorSelectedIndex, -1);
break;
} // switch widget index
break;
@ -1084,13 +1084,13 @@ static void window_tile_inspector_mousedown(rct_window* w, rct_widgetindex widge
switch (widgetIndex)
{
case WIDX_ENTRANCE_SPINNER_HEIGHT_INCREASE:
window_tile_inspector_base_height_offset(windowTileInspectorSelectedIndex, 1);
WindowTileInspectorBaseHeightOffset(windowTileInspectorSelectedIndex, 1);
break;
case WIDX_ENTRANCE_SPINNER_HEIGHT_DECREASE:
window_tile_inspector_base_height_offset(windowTileInspectorSelectedIndex, -1);
WindowTileInspectorBaseHeightOffset(windowTileInspectorSelectedIndex, -1);
break;
case WIDX_ENTRANCE_BUTTON_MAKE_USABLE:
window_tile_inspector_entrance_make_usable(windowTileInspectorSelectedIndex);
WindowTileInspectorEntranceMakeUsable(windowTileInspectorSelectedIndex);
break;
} // switch widget index
break;
@ -1099,10 +1099,10 @@ static void window_tile_inspector_mousedown(rct_window* w, rct_widgetindex widge
switch (widgetIndex)
{
case WIDX_WALL_SPINNER_HEIGHT_INCREASE:
window_tile_inspector_base_height_offset(windowTileInspectorSelectedIndex, 1);
WindowTileInspectorBaseHeightOffset(windowTileInspectorSelectedIndex, 1);
break;
case WIDX_WALL_SPINNER_HEIGHT_DECREASE:
window_tile_inspector_base_height_offset(windowTileInspectorSelectedIndex, -1);
WindowTileInspectorBaseHeightOffset(windowTileInspectorSelectedIndex, -1);
break;
case WIDX_WALL_DROPDOWN_SLOPE_BUTTON:
{
@ -1125,10 +1125,10 @@ static void window_tile_inspector_mousedown(rct_window* w, rct_widgetindex widge
break;
}
case WIDX_WALL_SPINNER_ANIMATION_FRAME_INCREASE:
window_tile_inspector_wall_animation_frame_offset(windowTileInspectorSelectedIndex, 1);
WindowTileInspectorWallAnimationFrameOffset(windowTileInspectorSelectedIndex, 1);
break;
case WIDX_WALL_SPINNER_ANIMATION_FRAME_DECREASE:
window_tile_inspector_wall_animation_frame_offset(windowTileInspectorSelectedIndex, -1);
WindowTileInspectorWallAnimationFrameOffset(windowTileInspectorSelectedIndex, -1);
break;
} // switch widget index
break;
@ -1137,10 +1137,10 @@ static void window_tile_inspector_mousedown(rct_window* w, rct_widgetindex widge
switch (widgetIndex)
{
case WIDX_LARGE_SCENERY_SPINNER_HEIGHT_INCREASE:
window_tile_inspector_base_height_offset(windowTileInspectorSelectedIndex, 1);
WindowTileInspectorBaseHeightOffset(windowTileInspectorSelectedIndex, 1);
break;
case WIDX_LARGE_SCENERY_SPINNER_HEIGHT_DECREASE:
window_tile_inspector_base_height_offset(windowTileInspectorSelectedIndex, -1);
WindowTileInspectorBaseHeightOffset(windowTileInspectorSelectedIndex, -1);
break;
} // switch widget index
break;
@ -1149,10 +1149,10 @@ static void window_tile_inspector_mousedown(rct_window* w, rct_widgetindex widge
switch (widgetIndex)
{
case WIDX_BANNER_SPINNER_HEIGHT_INCREASE:
window_tile_inspector_base_height_offset(windowTileInspectorSelectedIndex, 1);
WindowTileInspectorBaseHeightOffset(windowTileInspectorSelectedIndex, 1);
break;
case WIDX_BANNER_SPINNER_HEIGHT_DECREASE:
window_tile_inspector_base_height_offset(windowTileInspectorSelectedIndex, -1);
WindowTileInspectorBaseHeightOffset(windowTileInspectorSelectedIndex, -1);
break;
} // switch widget index
break;
@ -1162,7 +1162,7 @@ static void window_tile_inspector_mousedown(rct_window* w, rct_widgetindex widge
}
}
static void window_tile_inspector_update(rct_window* w)
static void WindowTileInspectorUpdate(rct_window* w)
{
// Check if the mouse is hovering over the list
if (!WidgetIsHighlighted(w, WIDX_LIST))
@ -1175,7 +1175,7 @@ static void window_tile_inspector_update(rct_window* w)
window_close(w);
}
static void window_tile_inspector_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowTileInspectorDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
{
if (dropdownIndex == -1)
{
@ -1183,7 +1183,7 @@ static void window_tile_inspector_dropdown(rct_window* w, rct_widgetindex widget
}
// Get selected element
TileElement* const tileElement = window_tile_inspector_get_selected_element(w);
TileElement* const tileElement = WindowTileInspectorGetSelectedElement(w);
if (w->tileInspectorPage == TileInspectorPage::Wall)
{
@ -1191,12 +1191,12 @@ static void window_tile_inspector_dropdown(rct_window* w, rct_widgetindex widget
if (widgetIndex == WIDX_WALL_DROPDOWN_SLOPE_BUTTON)
{
window_tile_inspector_wall_set_slope(windowTileInspectorSelectedIndex, dropdownIndex);
WindowTileInspectorWallSetSlope(windowTileInspectorSelectedIndex, dropdownIndex);
}
}
}
static void window_tile_inspector_tool_update(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowTileInspectorToolUpdate(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
{
map_invalidate_selection_rect();
@ -1240,7 +1240,7 @@ static void window_tile_inspector_tool_update(rct_window* w, rct_widgetindex wid
map_invalidate_selection_rect();
}
static void window_tile_inspector_update_selected_tile(rct_window* w, const ScreenCoordsXY& screenCoords)
static void WindowTileInspectorUpdateSelectedTile(rct_window* w, const ScreenCoordsXY& screenCoords)
{
const bool ctrlIsHeldDown = InputTestPlaceObjectModifier(PLACE_OBJECT_MODIFIER_COPY_Z);
@ -1289,26 +1289,26 @@ static void window_tile_inspector_update_selected_tile(rct_window* w, const Scre
OpenRCT2::TileInspector::SetSelectedElement(clickedElement);
window_tile_inspector_load_tile(w, clickedElement);
WindowTileInspectorLoadTile(w, clickedElement);
}
static void window_tile_inspector_tool_down(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowTileInspectorToolDown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
{
window_tile_inspector_update_selected_tile(w, screenCoords);
WindowTileInspectorUpdateSelectedTile(w, screenCoords);
}
static void window_tile_inspector_tool_drag(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowTileInspectorToolDrag(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
{
window_tile_inspector_update_selected_tile(w, screenCoords);
WindowTileInspectorUpdateSelectedTile(w, screenCoords);
}
static void window_tile_inspector_scrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
static void WindowTileInspectorScrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
{
*width = WW - 30;
*height = windowTileInspectorElementCount * SCROLLABLE_ROW_HEIGHT;
}
static void window_tile_inspector_set_page(rct_window* w, const TileInspectorPage page)
static void WindowTileInspectorSetPage(rct_window* w, const TileInspectorPage page)
{
// Invalidate the window already, because the size may change
w->Invalidate();
@ -1335,14 +1335,14 @@ static void window_tile_inspector_set_page(rct_window* w, const TileInspectorPag
w->pressed_widgets = 0;
}
static void window_tile_inspector_scrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
static void WindowTileInspectorScrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
{
// Because the list items are displayed in reverse order, subtract the calculated index from the amount of elements
const int16_t index = windowTileInspectorElementCount - (screenCoords.y - 1) / SCROLLABLE_ROW_HEIGHT - 1;
window_tile_inspector_select_element_from_list(w, index);
WindowTileInspectorSelectElementFromList(w, index);
}
static void window_tile_inspector_scrollmouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
static void WindowTileInspectorScrollmouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
{
int16_t index = windowTileInspectorElementCount - (screenCoords.y - 1) / SCROLLABLE_ROW_HEIGHT - 1;
if (index < 0 || index >= windowTileInspectorElementCount)
@ -1353,13 +1353,13 @@ static void window_tile_inspector_scrollmouseover(rct_window* w, int32_t scrollI
widget_invalidate(w, WIDX_LIST);
}
static void window_tile_inspector_invalidate(rct_window* w)
static void WindowTileInspectorInvalidate(rct_window* w)
{
// Set the correct page automatically
TileInspectorPage page = TileInspectorPage::Default;
if (windowTileInspectorSelectedIndex != -1)
{
const auto element = window_tile_inspector_get_selected_element(w);
const auto element = WindowTileInspectorGetSelectedElement(w);
auto type = element->GetType();
switch (type)
{
@ -1393,7 +1393,7 @@ static void window_tile_inspector_invalidate(rct_window* w)
if (w->tileInspectorPage != page)
{
window_tile_inspector_set_page(w, page);
WindowTileInspectorSetPage(w, page);
w->Invalidate();
}
@ -1460,7 +1460,7 @@ static void window_tile_inspector_invalidate(rct_window* w)
// Using a switch, because I don't think giving each page their own callbacks is
// needed here, as only the mouseup and invalidate functions are different.
const int32_t propertiesAnchor = w->widgets[WIDX_GROUPBOX_PROPERTIES].top;
const TileElement* const tileElement = window_tile_inspector_get_selected_element(w);
const TileElement* const tileElement = WindowTileInspectorGetSelectedElement(w);
if (tileElement == nullptr)
return;
@ -1711,7 +1711,7 @@ static void window_tile_inspector_invalidate(rct_window* w)
}
}
static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowTileInspectorPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
@ -1745,7 +1745,7 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi)
+ ScreenCoordsXY{ w->widgets[WIDX_GROUPBOX_DETAILS].left + 7, w->widgets[WIDX_GROUPBOX_DETAILS].top + 14 };
// Get map element
TileElement* const tileElement = window_tile_inspector_get_selected_element(w);
TileElement* const tileElement = WindowTileInspectorGetSelectedElement(w);
if (tileElement == nullptr)
return;
@ -2245,7 +2245,7 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi)
}
}
static void window_tile_inspector_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
static void WindowTileInspectorScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
{
const int32_t listWidth = w->widgets[WIDX_LIST].width();
gfx_fill_rect(

101
src/openrct2-ui/windows/TitleCommandEditor.cpp
View File

@ -110,36 +110,36 @@ static rct_widget window_title_command_editor_widgets[] = {
WIDGETS_END,
};
static void window_title_command_editor_close(rct_window * w);
static void window_title_command_editor_mouseup(rct_window * w, rct_widgetindex widgetIndex);
static void window_title_command_editor_mousedown(rct_window * w, rct_widgetindex widgetIndex, rct_widget * widget);
static void window_title_command_editor_dropdown(rct_window * w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void window_title_command_editor_update(rct_window * w);
static void window_title_command_editor_tool_down(rct_window * w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void window_title_command_editor_invalidate(rct_window * w);
static void window_title_command_editor_paint(rct_window * w, rct_drawpixelinfo * dpi);
static void window_title_command_editor_textinput(rct_window * w, rct_widgetindex widgetIndex, char * text);
static void scenario_select_callback(const utf8 * path);
static int32_t get_command_info_index(TitleScript commandType);
static TITLE_COMMAND_ORDER get_command_info(TitleScript commandType);
static TileCoordsXY get_location();
static uint8_t get_zoom();
static void WindowTitleCommandEditorClose(rct_window * w);
static void WindowTitleCommandEditorMouseup(rct_window * w, rct_widgetindex widgetIndex);
static void WindowTitleCommandEditorMousedown(rct_window * w, rct_widgetindex widgetIndex, rct_widget * widget);
static void WindowTitleCommandEditorDropdown(rct_window * w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowTitleCommandEditorUpdate(rct_window * w);
static void WindowTitleCommandEditorToolDown(rct_window * w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowTitleCommandEditorInvalidate(rct_window * w);
static void WindowTitleCommandEditorPaint(rct_window * w, rct_drawpixelinfo * dpi);
static void WindowTitleCommandEditorTextinput(rct_window * w, rct_widgetindex widgetIndex, char * text);
static void ScenarioSelectCallback(const utf8 * path);
static int32_t GetCommandInfoIndex(TitleScript commandType);
static TITLE_COMMAND_ORDER GetCommandInfo(TitleScript commandType);
static TileCoordsXY GetLocation();
static uint8_t GetZoom();
static rct_window_event_list window_title_command_editor_events([](auto& events)
{
events.close = &window_title_command_editor_close;
events.mouse_up = &window_title_command_editor_mouseup;
events.mouse_down = &window_title_command_editor_mousedown;
events.dropdown = &window_title_command_editor_dropdown;
events.update = &window_title_command_editor_update;
events.tool_down = &window_title_command_editor_tool_down;
events.text_input = &window_title_command_editor_textinput;
events.invalidate = &window_title_command_editor_invalidate;
events.paint = &window_title_command_editor_paint;
events.close = &WindowTitleCommandEditorClose;
events.mouse_up = &WindowTitleCommandEditorMouseup;
events.mouse_down = &WindowTitleCommandEditorMousedown;
events.dropdown = &WindowTitleCommandEditorDropdown;
events.update = &WindowTitleCommandEditorUpdate;
events.tool_down = &WindowTitleCommandEditorToolDown;
events.text_input = &WindowTitleCommandEditorTextinput;
events.invalidate = &WindowTitleCommandEditorInvalidate;
events.paint = &WindowTitleCommandEditorPaint;
});
// clang-format on
static void scenario_select_callback(const utf8* path)
static void ScenarioSelectCallback(const utf8* path)
{
if (_command.Type == TitleScript::LoadSc)
{
@ -149,7 +149,7 @@ static void scenario_select_callback(const utf8* path)
}
}
static int32_t get_command_info_index(TitleScript commandType)
static int32_t GetCommandInfoIndex(TitleScript commandType)
{
for (int32_t i = 0; i < static_cast<int32_t>(NUM_COMMANDS); i++)
{
@ -159,7 +159,7 @@ static int32_t get_command_info_index(TitleScript commandType)
return 0;
}
static TITLE_COMMAND_ORDER get_command_info(TitleScript commandType)
static TITLE_COMMAND_ORDER GetCommandInfo(TitleScript commandType)
{
for (int32_t i = 0; i < static_cast<int32_t>(NUM_COMMANDS); i++)
{
@ -169,7 +169,7 @@ static TITLE_COMMAND_ORDER get_command_info(TitleScript commandType)
return _window_title_command_editor_orders[0];
}
static TileCoordsXY get_location()
static TileCoordsXY GetLocation()
{
TileCoordsXY tileCoord = {};
rct_window* w = window_get_main();
@ -187,7 +187,7 @@ static TileCoordsXY get_location()
return tileCoord;
}
static uint8_t get_zoom()
static uint8_t GetZoom()
{
uint8_t zoom = 0;
rct_window* w = window_get_main();
@ -198,7 +198,7 @@ static uint8_t get_zoom()
return zoom;
}
static bool sprite_selector_tool_is_active()
static bool SpriteSelectorToolIsActive()
{
if (!(input_test_flag(INPUT_FLAG_TOOL_ACTIVE)))
return false;
@ -207,7 +207,7 @@ static bool sprite_selector_tool_is_active()
return true;
}
void window_title_command_editor_open(TitleSequence* sequence, int32_t index, bool insert)
void WindowTitleCommandEditorOpen(TitleSequence* sequence, int32_t index, bool insert)
{
_sequence = sequence;
@ -280,15 +280,15 @@ void window_title_command_editor_open(TitleSequence* sequence, int32_t index, bo
}
}
static void window_title_command_editor_close(rct_window* w)
static void WindowTitleCommandEditorClose(rct_window* w)
{
if (sprite_selector_tool_is_active())
if (SpriteSelectorToolIsActive())
{
tool_cancel();
}
}
static void window_title_command_editor_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowTitleCommandEditorMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -317,7 +317,7 @@ static void window_title_command_editor_mouseup(rct_window* w, rct_widgetindex w
case WIDX_GET:
if (_command.Type == TitleScript::Location)
{
auto tileCoord = get_location();
auto tileCoord = GetLocation();
_command.X = static_cast<uint8_t>(tileCoord.x);
_command.Y = static_cast<uint8_t>(tileCoord.y);
snprintf(textbox1Buffer, BUF_SIZE, "%d", _command.X);
@ -325,17 +325,17 @@ static void window_title_command_editor_mouseup(rct_window* w, rct_widgetindex w
}
else if (_command.Type == TitleScript::Zoom)
{
uint8_t zoom = get_zoom();
uint8_t zoom = GetZoom();
_command.Zoom = zoom;
snprintf(textbox1Buffer, BUF_SIZE, "%d", _command.Zoom);
}
w->Invalidate();
break;
case WIDX_SELECT_SCENARIO:
window_scenarioselect_open(scenario_select_callback, true);
WindowScenarioselectOpen(ScenarioSelectCallback, true);
break;
case WIDX_SELECT_SPRITE:
if (!sprite_selector_tool_is_active())
if (!SpriteSelectorToolIsActive())
{
tool_set(w, WIDX_BACKGROUND, Tool::Crosshair);
}
@ -366,7 +366,7 @@ static void window_title_command_editor_mouseup(rct_window* w, rct_widgetindex w
}
}
static void window_title_command_editor_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowTitleCommandEditorMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
widget--;
switch (widgetIndex)
@ -384,7 +384,7 @@ static void window_title_command_editor_mousedown(rct_window* w, rct_widgetindex
{ w->windowPos.x + widget->left, w->windowPos.y + widget->top }, widget->height() + 1, w->colours[1], 0,
Dropdown::Flag::StayOpen, numItems, widget->width() - 3);
Dropdown::SetChecked(get_command_info_index(_command.Type), true);
Dropdown::SetChecked(GetCommandInfoIndex(_command.Type), true);
break;
}
case WIDX_INPUT_DROPDOWN:
@ -422,13 +422,13 @@ static void window_title_command_editor_mousedown(rct_window* w, rct_widgetindex
}
}
static void window_title_command_editor_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowTitleCommandEditorDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
{
if (dropdownIndex == -1)
return;
// Cancel sprite selector tool if it's active
if (sprite_selector_tool_is_active())
if (SpriteSelectorToolIsActive())
{
tool_cancel();
}
@ -440,7 +440,7 @@ static void window_title_command_editor_dropdown(rct_window* w, rct_widgetindex
{
window_unfollow_sprite(w);
}
if (dropdownIndex == get_command_info_index(_command.Type))
if (dropdownIndex == GetCommandInfoIndex(_command.Type))
{
break;
}
@ -449,7 +449,7 @@ static void window_title_command_editor_dropdown(rct_window* w, rct_widgetindex
{
case TitleScript::Location:
{
auto tileCoord = get_location();
auto tileCoord = GetLocation();
_command.X = static_cast<uint8_t>(tileCoord.x);
_command.Y = static_cast<uint8_t>(tileCoord.y);
snprintf(textbox1Buffer, BUF_SIZE, "%d", _command.X);
@ -544,7 +544,7 @@ static void window_title_command_editor_dropdown(rct_window* w, rct_widgetindex
}
}
static void window_title_command_editor_textinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
static void WindowTitleCommandEditorTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
{
char* end;
int32_t value = strtol(widgetIndex != WIDX_TEXTBOX_Y ? textbox1Buffer : textbox2Buffer, &end, 10);
@ -620,7 +620,7 @@ static void window_title_command_editor_textinput(rct_window* w, rct_widgetindex
}
}
static void window_title_command_editor_update(rct_window* w)
static void WindowTitleCommandEditorUpdate(rct_window* w)
{
if (gCurrentTextBox.window.classification == w->classification && gCurrentTextBox.window.number == w->number)
{
@ -629,8 +629,7 @@ static void window_title_command_editor_update(rct_window* w)
}
}
static void window_title_command_editor_tool_down(
rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowTitleCommandEditorToolDown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
{
auto info = ViewportInteractionGetItemLeft(screenCoords);
@ -692,7 +691,7 @@ static void window_title_command_editor_tool_down(
}
}
static void window_title_command_editor_invalidate(rct_window* w)
static void WindowTitleCommandEditorInvalidate(rct_window* w)
{
ColourSchemeUpdateByClass(w, WC_TITLE_EDITOR);
@ -744,7 +743,7 @@ static void window_title_command_editor_invalidate(rct_window* w)
window_title_command_editor_widgets[WIDX_VIEWPORT].type = WindowWidgetType::Viewport;
// Draw button pressed while the tool is active
if (sprite_selector_tool_is_active())
if (SpriteSelectorToolIsActive())
w->pressed_widgets |= (1ULL << WIDX_SELECT_SPRITE);
else
w->pressed_widgets &= ~(1ULL << WIDX_SELECT_SPRITE);
@ -764,11 +763,11 @@ static void window_title_command_editor_invalidate(rct_window* w)
}
}
static void window_title_command_editor_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowTitleCommandEditorPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
TITLE_COMMAND_ORDER command_info = get_command_info(_command.Type);
TITLE_COMMAND_ORDER command_info = GetCommandInfo(_command.Type);
// "Command:" label
DrawTextBasic(

182
src/openrct2-ui/windows/TitleEditor.cpp
View File

@ -43,42 +43,42 @@ enum WINDOW_TITLE_EDITOR_TAB
WINDOW_TITLE_EDITOR_TAB_COUNT
};
static void window_title_editor_close(rct_window* w);
static void window_title_editor_mouseup(rct_window* w, rct_widgetindex widgetIndex);
static void window_title_editor_resize(rct_window* w);
static void window_title_editor_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void window_title_editor_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void window_title_editor_update(rct_window* w);
static void window_title_editor_scrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height);
static void window_title_editor_scrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void window_title_editor_scrollmouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void window_title_editor_textinput(rct_window* w, rct_widgetindex widgetIndex, char* text);
static void window_title_editor_invalidate(rct_window* w);
static void window_title_editor_paint(rct_window* w, rct_drawpixelinfo* dpi);
static void window_title_editor_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex);
static void window_title_editor_scrollpaint_saves(rct_window* w, rct_drawpixelinfo* dpi);
static void window_title_editor_scrollpaint_commands(rct_window* w, rct_drawpixelinfo* dpi);
static void window_title_editor_draw_tab_images(rct_drawpixelinfo* dpi, rct_window* w);
static void window_title_editor_load_sequence(size_t index);
static ITitleSequencePlayer* window_title_editor_get_player();
static bool window_title_editor_check_can_edit();
static void window_title_editor_add_park_callback(int32_t result, const utf8* path);
static void window_title_editor_rename_park(size_t index, const utf8* name);
static void WindowTitleEditorClose(rct_window* w);
static void WindowTitleEditorMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowTitleEditorResize(rct_window* w);
static void WindowTitleEditorMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowTitleEditorDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowTitleEditorUpdate(rct_window* w);
static void WindowTitleEditorScrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height);
static void WindowTitleEditorScrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowTitleEditorScrollmouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowTitleEditorTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text);
static void WindowTitleEditorInvalidate(rct_window* w);
static void WindowTitleEditorPaint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowTitleEditorScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex);
static void WindowTitleEditorScrollpaintSaves(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowTitleEditorScrollpaintCommands(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowTitleEditorDrawTabImages(rct_drawpixelinfo* dpi, rct_window* w);
static void WindowTitleEditorLoadSequence(size_t index);
static ITitleSequencePlayer* WindowTitleEditorGetPlayer();
static bool WindowTitleEditorCheckCanEdit();
static void WindowTitleEditorAddParkCallback(int32_t result, const utf8* path);
static void WindowTitleEditorRenamePark(size_t index, const utf8* name);
static rct_window_event_list window_title_editor_events([](auto& events) {
events.close = &window_title_editor_close;
events.mouse_up = &window_title_editor_mouseup;
events.resize = &window_title_editor_resize;
events.mouse_down = &window_title_editor_mousedown;
events.dropdown = &window_title_editor_dropdown;
events.update = &window_title_editor_update;
events.get_scroll_size = &window_title_editor_scrollgetsize;
events.scroll_mousedown = &window_title_editor_scrollmousedown;
events.scroll_mouseover = &window_title_editor_scrollmouseover;
events.text_input = &window_title_editor_textinput;
events.invalidate = &window_title_editor_invalidate;
events.paint = &window_title_editor_paint;
events.scroll_paint = &window_title_editor_scrollpaint;
events.close = &WindowTitleEditorClose;
events.mouse_up = &WindowTitleEditorMouseup;
events.resize = &WindowTitleEditorResize;
events.mouse_down = &WindowTitleEditorMousedown;
events.dropdown = &WindowTitleEditorDropdown;
events.update = &WindowTitleEditorUpdate;
events.get_scroll_size = &WindowTitleEditorScrollgetsize;
events.scroll_mousedown = &WindowTitleEditorScrollmousedown;
events.scroll_mouseover = &WindowTitleEditorScrollmouseover;
events.text_input = &WindowTitleEditorTextinput;
events.invalidate = &WindowTitleEditorInvalidate;
events.paint = &WindowTitleEditorPaint;
events.scroll_paint = &WindowTitleEditorScrollpaint;
});
enum WINDOW_TITLE_EDITOR_WIDGET_IDX
@ -201,7 +201,7 @@ static int32_t window_title_editor_tab_sprites[] = {
SPR_TAB_STATS_0,
};
void window_title_editor_open(int32_t tab)
void WindowTitleEditorOpen(int32_t tab)
{
rct_window* window;
@ -249,10 +249,10 @@ void window_title_editor_open(int32_t tab)
if (_selectedTitleSequence >= title_sequence_manager_get_count())
_selectedTitleSequence = 0;
window_title_editor_load_sequence(_selectedTitleSequence);
WindowTitleEditorLoadSequence(_selectedTitleSequence);
}
static void window_title_editor_close(rct_window* w)
static void WindowTitleEditorClose(rct_window* w)
{
title_stop_previewing_sequence();
@ -265,7 +265,7 @@ static void window_title_editor_close(rct_window* w)
SafeFree(_renameSavePath);
}
static void window_title_editor_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowTitleEditorMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
bool commandEditorOpen = (window_find_by_class(WC_TITLE_COMMAND_EDITOR) != nullptr);
switch (widgetIndex)
@ -280,7 +280,7 @@ static void window_title_editor_mouseup(rct_window* w, rct_widgetindex widgetInd
case WIDX_TITLE_EDITOR_NEW_BUTTON:
if (!commandEditorOpen)
{
window_text_input_open(
WindowTextInputOpen(
w, widgetIndex, STR_TITLE_EDITOR_ACTION_CREATE, STR_TITLE_EDITOR_ENTER_NAME_FOR_SEQUENCE, {}, STR_NONE, 0,
64);
}
@ -288,22 +288,22 @@ static void window_title_editor_mouseup(rct_window* w, rct_widgetindex widgetInd
case WIDX_TITLE_EDITOR_DUPLICATE_BUTTON:
if (!commandEditorOpen && _editingTitleSequence != nullptr)
{
window_text_input_open(
WindowTextInputOpen(
w, widgetIndex, STR_TITLE_EDITOR_ACTION_DUPLICATE, STR_TITLE_EDITOR_ENTER_NAME_FOR_SEQUENCE, {}, STR_STRING,
reinterpret_cast<uintptr_t>(_sequenceName), 64);
}
break;
case WIDX_TITLE_EDITOR_DELETE_BUTTON:
if (window_title_editor_check_can_edit())
if (WindowTitleEditorCheckCanEdit())
{
title_sequence_manager_delete(_selectedTitleSequence);
window_title_editor_load_sequence(0);
WindowTitleEditorLoadSequence(0);
}
break;
case WIDX_TITLE_EDITOR_RENAME_BUTTON:
if (window_title_editor_check_can_edit() && _editingTitleSequence != nullptr)
if (WindowTitleEditorCheckCanEdit() && _editingTitleSequence != nullptr)
{
window_text_input_open(
WindowTextInputOpen(
w, widgetIndex, STR_TRACK_MANAGE_RENAME, STR_TITLE_EDITOR_ENTER_NAME_FOR_SEQUENCE, {}, STR_STRING,
reinterpret_cast<uintptr_t>(_sequenceName), 64);
}
@ -317,12 +317,12 @@ static void window_title_editor_mouseup(rct_window* w, rct_widgetindex widgetInd
{
auto intent = Intent(WC_LOADSAVE);
intent.putExtra(INTENT_EXTRA_LOADSAVE_TYPE, LOADSAVETYPE_LOAD | LOADSAVETYPE_GAME);
intent.putExtra(INTENT_EXTRA_CALLBACK, reinterpret_cast<void*>(window_title_editor_add_park_callback));
intent.putExtra(INTENT_EXTRA_CALLBACK, reinterpret_cast<void*>(WindowTitleEditorAddParkCallback));
context_open_intent(&intent);
}
break;
case WIDX_TITLE_EDITOR_REMOVE_SAVE:
if (window_title_editor_check_can_edit())
if (WindowTitleEditorCheckCanEdit())
{
if (w->selected_list_item != -1)
{
@ -335,11 +335,11 @@ static void window_title_editor_mouseup(rct_window* w, rct_widgetindex widgetInd
}
break;
case WIDX_TITLE_EDITOR_RENAME_SAVE:
if (window_title_editor_check_can_edit())
if (WindowTitleEditorCheckCanEdit())
{
if (w->selected_list_item != -1)
{
window_text_input_open(
WindowTextInputOpen(
w, widgetIndex, STR_FILEBROWSER_RENAME_SAVE_TITLE, STR_TITLE_EDITOR_ENTER_NAME_FOR_SAVE, {}, STR_STRING,
reinterpret_cast<uintptr_t>(_editingTitleSequence->Saves[w->selected_list_item].c_str()), 52 - 1);
}
@ -363,7 +363,7 @@ static void window_title_editor_mouseup(rct_window* w, rct_widgetindex widgetInd
else
game_load_init();
window_title_editor_open(WINDOW_TITLE_EDITOR_TAB_SAVES);
WindowTitleEditorOpen(WINDOW_TITLE_EDITOR_TAB_SAVES);
}
catch (const std::exception&)
{
@ -376,27 +376,27 @@ static void window_title_editor_mouseup(rct_window* w, rct_widgetindex widgetInd
// Commands tab
//////////////////////////////////////////////////////////////////////////////////////////////////////
case WIDX_TITLE_EDITOR_INSERT:
if (window_title_editor_check_can_edit())
if (WindowTitleEditorCheckCanEdit())
{
if (w->selected_list_item != -1)
window_title_command_editor_open(_editingTitleSequence.get(), w->selected_list_item + 1, true);
WindowTitleCommandEditorOpen(_editingTitleSequence.get(), w->selected_list_item + 1, true);
else
window_title_command_editor_open(
WindowTitleCommandEditorOpen(
_editingTitleSequence.get(), static_cast<int32_t>(_editingTitleSequence->Commands.size()), true);
}
break;
case WIDX_TITLE_EDITOR_EDIT:
if (window_title_editor_check_can_edit())
if (WindowTitleEditorCheckCanEdit())
{
if (w->selected_list_item != -1
&& w->selected_list_item < static_cast<int16_t>(_editingTitleSequence->Commands.size()))
{
window_title_command_editor_open(_editingTitleSequence.get(), w->selected_list_item, false);
WindowTitleCommandEditorOpen(_editingTitleSequence.get(), w->selected_list_item, false);
}
}
break;
case WIDX_TITLE_EDITOR_DELETE:
if (window_title_editor_check_can_edit())
if (WindowTitleEditorCheckCanEdit())
{
if (w->selected_list_item != -1
&& w->selected_list_item < static_cast<int16_t>(_editingTitleSequence->Commands.size()))
@ -416,14 +416,14 @@ static void window_title_editor_mouseup(rct_window* w, rct_widgetindex widgetInd
if (title_is_previewing_sequence() && position != -1
&& position < static_cast<int32_t>(_editingTitleSequence->Commands.size()))
{
auto player = window_title_editor_get_player();
auto player = WindowTitleEditorGetPlayer();
player->Seek(position);
player->Update();
}
break;
}
case WIDX_TITLE_EDITOR_MOVE_DOWN:
if (window_title_editor_check_can_edit())
if (WindowTitleEditorCheckCanEdit())
{
if (w->selected_list_item != -1
&& w->selected_list_item < static_cast<int16_t>(_editingTitleSequence->Commands.size()) - 1)
@ -437,7 +437,7 @@ static void window_title_editor_mouseup(rct_window* w, rct_widgetindex widgetInd
}
break;
case WIDX_TITLE_EDITOR_MOVE_UP:
if (window_title_editor_check_can_edit())
if (WindowTitleEditorCheckCanEdit())
{
if (w->selected_list_item > 0
&& w->selected_list_item < static_cast<int16_t>(_editingTitleSequence->Commands.size()))
@ -453,7 +453,7 @@ static void window_title_editor_mouseup(rct_window* w, rct_widgetindex widgetInd
case WIDX_TITLE_EDITOR_REPLAY:
if (title_is_previewing_sequence())
{
auto player = window_title_editor_get_player();
auto player = WindowTitleEditorGetPlayer();
player->Reset();
player->Update();
}
@ -480,7 +480,7 @@ static void window_title_editor_mouseup(rct_window* w, rct_widgetindex widgetInd
case WIDX_TITLE_EDITOR_SKIP:
if (title_is_previewing_sequence())
{
auto player = window_title_editor_get_player();
auto player = WindowTitleEditorGetPlayer();
int32_t position = player->GetCurrentPosition() + 1;
if (position >= static_cast<int32_t>(_editingTitleSequence->Commands.size()))
{
@ -493,7 +493,7 @@ static void window_title_editor_mouseup(rct_window* w, rct_widgetindex widgetInd
}
}
static void window_title_editor_resize(rct_window* w)
static void WindowTitleEditorResize(rct_window* w)
{
if (w->selected_tab == WINDOW_TITLE_EDITOR_TAB_PRESETS)
window_set_resize(w, WW, WH2, 500, WH2);
@ -501,7 +501,7 @@ static void window_title_editor_resize(rct_window* w)
window_set_resize(w, WW, WH, 500, 580);
}
static void window_title_editor_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowTitleEditorMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
switch (widgetIndex)
{
@ -546,19 +546,19 @@ static void window_title_editor_mousedown(rct_window* w, rct_widgetindex widgetI
}
}
static void window_title_editor_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowTitleEditorDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
{
if (dropdownIndex == -1)
return;
if (widgetIndex == WIDX_TITLE_EDITOR_PRESETS_DROPDOWN)
{
window_title_editor_load_sequence(dropdownIndex);
WindowTitleEditorLoadSequence(dropdownIndex);
w->Invalidate();
}
}
static void window_title_editor_update(rct_window* w)
static void WindowTitleEditorUpdate(rct_window* w)
{
w->frame_no++;
if (w->frame_no >= window_title_editor_tab_animation_loops[w->selected_tab])
@ -575,7 +575,7 @@ static void window_title_editor_update(rct_window* w)
widget_invalidate(w, WIDX_TITLE_EDITOR_PRESETS_TAB + w->selected_tab);
}
static void window_title_editor_scrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
static void WindowTitleEditorScrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
{
size_t lineCount = 1;
if (w->selected_tab == WINDOW_TITLE_EDITOR_TAB_SAVES)
@ -599,7 +599,7 @@ static void window_title_editor_scrollgetsize(rct_window* w, int32_t scrollIndex
*width = SCROLL_WIDTH;
}
static void window_title_editor_scrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
static void WindowTitleEditorScrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
{
int32_t index = screenCoords.y / SCROLLABLE_ROW_HEIGHT;
w->selected_list_item = -1;
@ -622,7 +622,7 @@ static void window_title_editor_scrollmousedown(rct_window* w, int32_t scrollInd
}
}
static void window_title_editor_scrollmouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
static void WindowTitleEditorScrollmouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
{
int32_t index = screenCoords.y / SCROLLABLE_ROW_HEIGHT;
switch (w->selected_tab)
@ -639,7 +639,7 @@ static void window_title_editor_scrollmouseover(rct_window* w, int32_t scrollInd
widget_invalidate(w, WIDX_TITLE_EDITOR_LIST);
}
static void window_title_editor_textinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
static void WindowTitleEditorTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
{
if (str_is_null_or_empty(text))
return;
@ -658,17 +658,17 @@ static void window_title_editor_textinput(rct_window* w, rct_widgetindex widgetI
if (widgetIndex == WIDX_TITLE_EDITOR_NEW_BUTTON)
{
size_t newIndex = title_sequence_manager_create(text);
window_title_editor_load_sequence(newIndex);
WindowTitleEditorLoadSequence(newIndex);
}
else if (widgetIndex == WIDX_TITLE_EDITOR_DUPLICATE_BUTTON)
{
size_t newIndex = title_sequence_manager_duplicate(_selectedTitleSequence, text);
window_title_editor_load_sequence(newIndex);
WindowTitleEditorLoadSequence(newIndex);
}
else
{
size_t newIndex = title_sequence_manager_rename(_selectedTitleSequence, text);
window_title_editor_load_sequence(newIndex);
WindowTitleEditorLoadSequence(newIndex);
}
config_save_default();
w->Invalidate();
@ -689,12 +689,12 @@ static void window_title_editor_textinput(rct_window* w, rct_widgetindex widgetI
}
break;
case WIDX_TITLE_EDITOR_RENAME_SAVE:
window_title_editor_rename_park(w->selected_list_item, text);
WindowTitleEditorRenamePark(w->selected_list_item, text);
break;
}
}
static void window_title_editor_invalidate(rct_window* w)
static void WindowTitleEditorInvalidate(rct_window* w)
{
int32_t pressed_widgets = w->pressed_widgets
& ~((1LL << WIDX_TITLE_EDITOR_PRESETS_TAB) | (1LL << WIDX_TITLE_EDITOR_SAVES_TAB)
@ -798,11 +798,11 @@ static void window_title_editor_invalidate(rct_window* w)
| (1ULL << WIDX_TITLE_EDITOR_SKIP_TO));
}
static void window_title_editor_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowTitleEditorPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
// Widgets
WindowDrawWidgets(w, dpi);
window_title_editor_draw_tab_images(dpi, w);
WindowTitleEditorDrawTabImages(dpi, w);
// Draw strings
switch (w->selected_tab)
@ -831,7 +831,7 @@ static void window_title_editor_paint(rct_window* w, rct_drawpixelinfo* dpi)
}
}
static void window_title_editor_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
static void WindowTitleEditorScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
{
gfx_fill_rect(
dpi, { { dpi->x, dpi->y }, { dpi->x + dpi->width - 1, dpi->y + dpi->height - 1 } },
@ -839,15 +839,15 @@ static void window_title_editor_scrollpaint(rct_window* w, rct_drawpixelinfo* dp
switch (w->selected_tab)
{
case WINDOW_TITLE_EDITOR_TAB_SAVES:
window_title_editor_scrollpaint_saves(w, dpi);
WindowTitleEditorScrollpaintSaves(w, dpi);
break;
case WINDOW_TITLE_EDITOR_TAB_SCRIPT:
window_title_editor_scrollpaint_commands(w, dpi);
WindowTitleEditorScrollpaintCommands(w, dpi);
break;
}
}
static void window_title_editor_scrollpaint_saves(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowTitleEditorScrollpaintSaves(rct_window* w, rct_drawpixelinfo* dpi)
{
int32_t currentSaveIndex = -1;
auto screenCoords = ScreenCoordsXY{ 0, 0 };
@ -892,12 +892,12 @@ static void window_title_editor_scrollpaint_saves(rct_window* w, rct_drawpixelin
}
}
static void window_title_editor_scrollpaint_commands(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowTitleEditorScrollpaintCommands(rct_window* w, rct_drawpixelinfo* dpi)
{
int32_t position = -1;
if (title_is_previewing_sequence() && _selectedTitleSequence == title_get_current_sequence())
{
auto player = window_title_editor_get_player();
auto player = WindowTitleEditorGetPlayer();
position = player->GetCurrentPosition();
}
@ -1051,7 +1051,7 @@ static void window_title_editor_scrollpaint_commands(rct_window* w, rct_drawpixe
}
}
static void window_title_editor_draw_tab_images(rct_drawpixelinfo* dpi, rct_window* w)
static void WindowTitleEditorDrawTabImages(rct_drawpixelinfo* dpi, rct_window* w)
{
for (int32_t i = 0; i < WINDOW_TITLE_EDITOR_TAB_COUNT; i++)
{
@ -1073,7 +1073,7 @@ static void window_title_editor_draw_tab_images(rct_drawpixelinfo* dpi, rct_wind
}
}
static void window_title_editor_load_sequence(size_t index)
static void WindowTitleEditorLoadSequence(size_t index)
{
if (index >= title_sequence_manager_get_count())
return;
@ -1095,12 +1095,12 @@ static void window_title_editor_load_sequence(size_t index)
window_close_by_class(WC_TITLE_COMMAND_EDITOR);
}
static ITitleSequencePlayer* window_title_editor_get_player()
static ITitleSequencePlayer* WindowTitleEditorGetPlayer()
{
return static_cast<ITitleSequencePlayer*>(title_get_sequence_player());
}
static bool window_title_editor_check_can_edit()
static bool WindowTitleEditorCheckCanEdit()
{
bool commandEditorOpen = (window_find_by_class(WC_TITLE_COMMAND_EDITOR) != nullptr);
@ -1116,7 +1116,7 @@ static bool window_title_editor_check_can_edit()
return false;
}
static bool save_filename_exists(const utf8* filename)
static bool SaveFilenameExists(const utf8* filename)
{
auto& seq = _editingTitleSequence;
for (size_t i = 0; i < seq->Saves.size(); i++)
@ -1129,19 +1129,19 @@ static bool save_filename_exists(const utf8* filename)
return false;
}
static void window_title_editor_add_park_callback(int32_t result, const utf8* path)
static void WindowTitleEditorAddParkCallback(int32_t result, const utf8* path)
{
uint32_t extension = get_file_extension_type(path);
if (extension != FILE_EXTENSION_SV4 && extension != FILE_EXTENSION_SV6)
return;
const utf8* filename = path_get_filename(path);
if (save_filename_exists(filename))
if (SaveFilenameExists(filename))
{
free(_renameSavePath);
_renameSavePath = _strdup(filename);
rct_window* w = window_find_by_class(WC_TITLE_EDITOR);
window_text_input_open(
WindowTextInputOpen(
w, WIDX_TITLE_EDITOR_RENAME_SAVE, STR_FILEBROWSER_RENAME_SAVE_TITLE, STR_ERROR_EXISTING_NAME, {}, STR_STRING,
reinterpret_cast<uintptr_t>(_renameSavePath), 52 - 1);
return;
@ -1150,7 +1150,7 @@ static void window_title_editor_add_park_callback(int32_t result, const utf8* pa
TitleSequenceAddPark(*_editingTitleSequence, path, filename);
}
static void window_title_editor_rename_park(size_t index, const utf8* name)
static void WindowTitleEditorRenamePark(size_t index, const utf8* name)
{
if (!filename_valid_characters(name))
{

14
src/openrct2-ui/windows/TitleExit.cpp
View File

@ -25,13 +25,13 @@ static rct_widget window_title_exit_widgets[] = {
WIDGETS_END,
};
static void window_title_exit_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_title_exit_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowTitleExitPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowTitleExitMouseup(rct_window *w, rct_widgetindex widgetIndex);
static rct_window_event_list window_title_exit_events([](auto& events)
{
events.mouse_up = &window_title_exit_mouseup;
events.paint = &window_title_exit_paint;
events.mouse_up = &WindowTitleExitMouseup;
events.paint = &WindowTitleExitPaint;
});
// clang-format on
@ -39,7 +39,7 @@ static rct_window_event_list window_title_exit_events([](auto& events)
* Creates the window containing the exit button on the title screen.
* rct2: 0x0066B624 (part of 0x0066B3E8)
*/
rct_window* window_title_exit_open()
rct_window* WindowTitleExitOpen()
{
rct_window* window;
@ -57,7 +57,7 @@ rct_window* window_title_exit_open()
*
* rct2: 0x0066B83C
*/
static void window_title_exit_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowTitleExitMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
if (gIntroState != IntroState::None)
return;
@ -75,7 +75,7 @@ static void window_title_exit_mouseup(rct_window* w, rct_widgetindex widgetIndex
*
* rct2: 0x0066B836
*/
static void window_title_exit_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowTitleExitPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
}

16
src/openrct2-ui/windows/TitleLogo.cpp
View File

@ -27,14 +27,14 @@ static rct_widget window_title_logo_widgets[] = {
WIDGETS_END,
};
static void window_title_menu_mouseup(rct_window* w, rct_widgetindex widgetIndex);
static void window_title_logo_paint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowTitleMenuMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowTitleLogoPaint(rct_window* w, rct_drawpixelinfo* dpi);
// clang-format off
static rct_window_event_list window_title_logo_events([](auto& events)
{
events.mouse_up = &window_title_menu_mouseup;
events.paint = &window_title_logo_paint;
events.mouse_up = &WindowTitleMenuMouseup;
events.paint = &WindowTitleLogoPaint;
});
// clang-format on
@ -42,7 +42,7 @@ static rct_window_event_list window_title_logo_events([](auto& events)
* Creates the window containing the logo and the expansion packs on the title screen.
* rct2: 0x0066B679 (part of 0x0066B3E8)
*/
rct_window* window_title_logo_open()
rct_window* WindowTitleLogoOpen()
{
rct_window* window = WindowCreate(
ScreenCoordsXY(0, 0), WW, WH, &window_title_logo_events, WC_TITLE_LOGO, WF_STICK_TO_BACK | WF_TRANSPARENT);
@ -56,12 +56,12 @@ rct_window* window_title_logo_open()
return window;
}
static void window_title_menu_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowTitleMenuMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
case WIDX_LOGO:
window_about_open();
WindowAboutOpen();
break;
}
}
@ -70,7 +70,7 @@ static void window_title_menu_mouseup(rct_window* w, rct_widgetindex widgetIndex
*
* rct2: 0x0066B872
*/
static void window_title_logo_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowTitleLogoPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
auto screenCoords = w->windowPos + ScreenCoordsXY{ 2, 2 };
gfx_draw_sprite(dpi, ImageId(SPR_G2_LOGO), screenCoords);

42
src/openrct2-ui/windows/TitleMenu.cpp
View File

@ -44,21 +44,21 @@ static rct_widget window_title_menu_widgets[] = {
WIDGETS_END,
};
static void window_title_menu_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_title_menu_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget);
static void window_title_menu_dropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void window_title_menu_cursor(rct_window *w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords, CursorID *cursorId);
static void window_title_menu_invalidate(rct_window *w);
static void window_title_menu_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowTitleMenuMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowTitleMenuMousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowTitleMenuDropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowTitleMenuCursor(rct_window *w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords, CursorID *cursorId);
static void WindowTitleMenuInvalidate(rct_window *w);
static void WindowTitleMenuPaint(rct_window *w, rct_drawpixelinfo *dpi);
static rct_window_event_list window_title_menu_events([](auto& events)
{
events.mouse_up = &window_title_menu_mouseup;
events.mouse_down = &window_title_menu_mousedown;
events.dropdown = &window_title_menu_dropdown;
events.cursor = &window_title_menu_cursor;
events.invalidate = &window_title_menu_invalidate;
events.paint = &window_title_menu_paint;
events.mouse_up = &WindowTitleMenuMouseup;
events.mouse_down = &WindowTitleMenuMousedown;
events.dropdown = &WindowTitleMenuDropdown;
events.cursor = &WindowTitleMenuCursor;
events.invalidate = &WindowTitleMenuInvalidate;
events.paint = &WindowTitleMenuPaint;
});
// clang-format on
@ -66,7 +66,7 @@ static rct_window_event_list window_title_menu_events([](auto& events)
* Creates the window containing the menu buttons on the title screen.
* rct2: 0x0066B5C0 (part of 0x0066B3E8)
*/
rct_window* window_title_menu_open()
rct_window* WindowTitleMenuOpen()
{
rct_window* window;
@ -110,13 +110,13 @@ rct_window* window_title_menu_open()
return window;
}
static void window_title_menu_scenarioselect_callback(const utf8* path)
static void WindowTitleMenuScenarioselectCallback(const utf8* path)
{
OpenRCT2::GetContext()->LoadParkFromFile(path, false, true);
game_load_scripts();
}
static void window_title_menu_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowTitleMenuMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
rct_window* windowToOpen = nullptr;
@ -132,7 +132,7 @@ static void window_title_menu_mouseup(rct_window* w, rct_widgetindex widgetIndex
{
window_close_by_class(WC_LOADSAVE);
window_close_by_class(WC_SERVER_LIST);
window_scenarioselect_open(window_title_menu_scenarioselect_callback, false);
WindowScenarioselectOpen(WindowTitleMenuScenarioselectCallback, false);
}
break;
case WIDX_CONTINUE_SAVED_GAME:
@ -168,7 +168,7 @@ static void window_title_menu_mouseup(rct_window* w, rct_widgetindex widgetIndex
}
}
static void window_title_menu_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowTitleMenuMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
if (widgetIndex == WIDX_GAME_TOOLS)
{
@ -183,7 +183,7 @@ static void window_title_menu_mousedown(rct_window* w, rct_widgetindex widgetInd
}
}
static void window_title_menu_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowTitleMenuDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
{
if (widgetIndex == WIDX_GAME_TOOLS)
{
@ -213,13 +213,13 @@ static void window_title_menu_dropdown(rct_window* w, rct_widgetindex widgetInde
}
}
static void window_title_menu_cursor(
static void WindowTitleMenuCursor(
rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords, CursorID* cursorId)
{
gTooltipTimeout = 2000;
}
static void window_title_menu_invalidate(rct_window* w)
static void WindowTitleMenuInvalidate(rct_window* w)
{
_filterRect = { w->windowPos.x, w->windowPos.y + UpdateButtonDims.height, w->windowPos.x + w->width - 1,
w->windowPos.y + MenuButtonDims.height + UpdateButtonDims.height - 1 };
@ -231,7 +231,7 @@ static void window_title_menu_invalidate(rct_window* w)
}
}
static void window_title_menu_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowTitleMenuPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
gfx_filter_rect(dpi, _filterRect, FilterPaletteID::Palette51);
WindowDrawWidgets(w, dpi);

14
src/openrct2-ui/windows/TitleOptions.cpp
View File

@ -24,20 +24,20 @@ static rct_widget window_title_options_widgets[] = {
WIDGETS_END,
};
static void window_title_options_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_title_options_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowTitleOptionsMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowTitleOptionsPaint(rct_window *w, rct_drawpixelinfo *dpi);
static rct_window_event_list window_title_options_events([](auto& events)
{
events.mouse_up = &window_title_options_mouseup;
events.paint = &window_title_options_paint;
events.mouse_up = &WindowTitleOptionsMouseup;
events.paint = &WindowTitleOptionsPaint;
});
// clang-format on
/**
* Creates the window containing the options button on the title screen.
*/
rct_window* window_title_options_open()
rct_window* WindowTitleOptionsOpen()
{
rct_window* window = WindowCreate(
ScreenCoordsXY(context_get_width() - 80, 0), 80, 15, &window_title_options_events, WC_TITLE_OPTIONS,
@ -49,7 +49,7 @@ rct_window* window_title_options_open()
return window;
}
static void window_title_options_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowTitleOptionsMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
if (gIntroState != IntroState::None)
return;
@ -62,7 +62,7 @@ static void window_title_options_mouseup(rct_window* w, rct_widgetindex widgetIn
}
}
static void window_title_options_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowTitleOptionsPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
}

22
src/openrct2-ui/windows/Tooltip.cpp
View File

@ -25,20 +25,20 @@ static rct_widget window_tooltip_widgets[] = {
WIDGETS_END,
};
static void window_tooltip_update(rct_window *w);
static void window_tooltip_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowTooltipUpdate(rct_window *w);
static void WindowTooltipPaint(rct_window *w, rct_drawpixelinfo *dpi);
static rct_window_event_list window_tooltip_events([](auto& events)
{
events.update = &window_tooltip_update;
events.paint = &window_tooltip_paint;
events.update = &WindowTooltipUpdate;
events.paint = &WindowTooltipPaint;
});
// clang-format on
static utf8 _tooltipText[sizeof(gCommonStringFormatBuffer)];
static int16_t _tooltipNumLines;
void window_tooltip_reset(const ScreenCoordsXY& screenCoords)
void WindowTooltipReset(const ScreenCoordsXY& screenCoords)
{
gTooltipCursor = screenCoords;
gTooltipTimeout = 0;
@ -66,7 +66,7 @@ static int32_t FormatTextForTooltip(const OpenRCT2String& message)
return textWidth;
}
void window_tooltip_show(const OpenRCT2String& message, ScreenCoordsXY screenCoords)
void WindowTooltipShow(const OpenRCT2String& message, ScreenCoordsXY screenCoords)
{
auto* w = window_find_by_class(WC_ERROR);
if (w != nullptr)
@ -103,7 +103,7 @@ void window_tooltip_show(const OpenRCT2String& message, ScreenCoordsXY screenCoo
*
* rct2: 0x006EA10D
*/
void window_tooltip_open(rct_window* widgetWindow, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCords)
void WindowTooltipOpen(rct_window* widgetWindow, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCords)
{
if (widgetWindow == nullptr || widgetIndex == -1)
return;
@ -136,14 +136,14 @@ void window_tooltip_open(rct_window* widgetWindow, rct_widgetindex widgetIndex,
return;
}
window_tooltip_show(result, screenCords);
WindowTooltipShow(result, screenCords);
}
/**
*
* rct2: 0x006E98C6
*/
void window_tooltip_close()
void WindowTooltipClose()
{
window_close_by_class(WC_TOOLTIP);
gTooltipTimeout = 0;
@ -154,7 +154,7 @@ void window_tooltip_close()
*
* rct2: 0x006EA580
*/
static void window_tooltip_update(rct_window* w)
static void WindowTooltipUpdate(rct_window* w)
{
reset_tooltip_not_shown();
}
@ -163,7 +163,7 @@ static void window_tooltip_update(rct_window* w)
*
* rct2: 0x006EA41D
*/
static void window_tooltip_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowTooltipPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
int32_t left = w->windowPos.x;
int32_t top = w->windowPos.y;

322
src/openrct2-ui/windows/TopToolbar.cpp
View File

@ -273,52 +273,52 @@ static rct_widget window_top_toolbar_widgets[] = {
};
// clang-format on
static void window_top_toolbar_mouseup(rct_window* w, rct_widgetindex widgetIndex);
static void window_top_toolbar_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void window_top_toolbar_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void window_top_toolbar_tool_update(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void window_top_toolbar_tool_down(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void window_top_toolbar_tool_drag(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void window_top_toolbar_tool_up(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoordsy);
static void window_top_toolbar_tool_abort(rct_window* w, rct_widgetindex widgetIndex);
static void window_top_toolbar_invalidate(rct_window* w);
static void window_top_toolbar_paint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowTopToolbarMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowTopToolbarMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowTopToolbarDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowTopToolbarToolUpdate(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowTopToolbarToolDown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowTopToolbarToolDrag(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowTopToolbarToolUp(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoordsy);
static void WindowTopToolbarToolAbort(rct_window* w, rct_widgetindex widgetIndex);
static void WindowTopToolbarInvalidate(rct_window* w);
static void WindowTopToolbarPaint(rct_window* w, rct_drawpixelinfo* dpi);
static rct_window_event_list window_top_toolbar_events([](auto& events) {
events.mouse_up = &window_top_toolbar_mouseup;
events.mouse_down = &window_top_toolbar_mousedown;
events.dropdown = &window_top_toolbar_dropdown;
events.tool_update = &window_top_toolbar_tool_update;
events.tool_down = &window_top_toolbar_tool_down;
events.tool_drag = &window_top_toolbar_tool_drag;
events.tool_up = &window_top_toolbar_tool_up;
events.tool_abort = &window_top_toolbar_tool_abort;
events.invalidate = &window_top_toolbar_invalidate;
events.paint = &window_top_toolbar_paint;
events.mouse_up = &WindowTopToolbarMouseup;
events.mouse_down = &WindowTopToolbarMousedown;
events.dropdown = &WindowTopToolbarDropdown;
events.tool_update = &WindowTopToolbarToolUpdate;
events.tool_down = &WindowTopToolbarToolDown;
events.tool_drag = &WindowTopToolbarToolDrag;
events.tool_up = &WindowTopToolbarToolUp;
events.tool_abort = &WindowTopToolbarToolAbort;
events.invalidate = &WindowTopToolbarInvalidate;
events.paint = &WindowTopToolbarPaint;
});
static void top_toolbar_init_view_menu(rct_window* window, rct_widget* widget);
static void top_toolbar_view_menu_dropdown(int16_t dropdownIndex);
static void top_toolbar_init_map_menu(rct_window* window, rct_widget* widget);
static void top_toolbar_map_menu_dropdown(int16_t dropdownIndex);
static void top_toolbar_init_fastforward_menu(rct_window* window, rct_widget* widget);
static void top_toolbar_fastforward_menu_dropdown(int16_t dropdownIndex);
static void top_toolbar_init_rotate_menu(rct_window* window, rct_widget* widget);
static void top_toolbar_rotate_menu_dropdown(int16_t dropdownIndex);
static void top_toolbar_init_cheats_menu(rct_window* window, rct_widget* widget);
static void top_toolbar_cheats_menu_dropdown(int16_t dropdownIndex);
static void top_toolbar_init_debug_menu(rct_window* window, rct_widget* widget);
static void top_toolbar_debug_menu_dropdown(int16_t dropdownIndex);
static void top_toolbar_init_network_menu(rct_window* window, rct_widget* widget);
static void top_toolbar_network_menu_dropdown(int16_t dropdownIndex);
static void TopToolbarInitViewMenu(rct_window* window, rct_widget* widget);
static void TopToolbarViewMenuDropdown(int16_t dropdownIndex);
static void TopToolbarInitMapMenu(rct_window* window, rct_widget* widget);
static void TopToolbarMapMenuDropdown(int16_t dropdownIndex);
static void TopToolbarInitFastforwardMenu(rct_window* window, rct_widget* widget);
static void TopToolbarFastforwardMenuDropdown(int16_t dropdownIndex);
static void TopToolbarInitRotateMenu(rct_window* window, rct_widget* widget);
static void TopToolbarRotateMenuDropdown(int16_t dropdownIndex);
static void TopToolbarInitCheatsMenu(rct_window* window, rct_widget* widget);
static void TopToolbarCheatsMenuDropdown(int16_t dropdownIndex);
static void TopToolbarInitDebugMenu(rct_window* window, rct_widget* widget);
static void TopToolbarDebugMenuDropdown(int16_t dropdownIndex);
static void TopToolbarInitNetworkMenu(rct_window* window, rct_widget* widget);
static void TopToolbarNetworkMenuDropdown(int16_t dropdownIndex);
static void toggle_footpath_window();
static void toggle_land_window(rct_window* topToolbar, rct_widgetindex widgetIndex);
static void toggle_clear_scenery_window(rct_window* topToolbar, rct_widgetindex widgetIndex);
static void toggle_water_window(rct_window* topToolbar, rct_widgetindex widgetIndex);
static void ToggleFootpathWindow();
static void ToggleLandWindow(rct_window* topToolbar, rct_widgetindex widgetIndex);
static void ToggleClearSceneryWindow(rct_window* topToolbar, rct_widgetindex widgetIndex);
static void ToggleWaterWindow(rct_window* topToolbar, rct_widgetindex widgetIndex);
static money64 selection_lower_land(uint8_t flags);
static money64 selection_raise_land(uint8_t flags);
static money64 SelectionLowerLand(uint8_t flags);
static money64 SelectionRaiseLand(uint8_t flags);
static ClearAction GetClearAction();
@ -330,7 +330,7 @@ static int16_t _unkF64F0A;
* Creates the main game top toolbar window.
* rct2: 0x0066B485 (part of 0x0066B3E8)
*/
rct_window* window_top_toolbar_open()
rct_window* WindowTopToolbarOpen()
{
rct_window* window = WindowCreate(
ScreenCoordsXY(0, 0), context_get_width(), TOP_TOOLBAR_HEIGHT + 1, &window_top_toolbar_events, WC_TOP_TOOLBAR,
@ -346,7 +346,7 @@ rct_window* window_top_toolbar_open()
*
* rct2: 0x0066C957
*/
static void window_top_toolbar_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowTopToolbarMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
rct_window* mainWindow;
@ -368,13 +368,13 @@ static void window_top_toolbar_mouseup(rct_window* w, rct_widgetindex widgetInde
window_zoom_in(mainWindow, false);
break;
case WIDX_CLEAR_SCENERY:
toggle_clear_scenery_window(w, WIDX_CLEAR_SCENERY);
ToggleClearSceneryWindow(w, WIDX_CLEAR_SCENERY);
break;
case WIDX_LAND:
toggle_land_window(w, WIDX_LAND);
ToggleLandWindow(w, WIDX_LAND);
break;
case WIDX_WATER:
toggle_water_window(w, WIDX_WATER);
ToggleWaterWindow(w, WIDX_WATER);
break;
case WIDX_SCENERY:
if (!tool_set(w, WIDX_SCENERY, Tool::Arrow))
@ -384,7 +384,7 @@ static void window_top_toolbar_mouseup(rct_window* w, rct_widgetindex widgetInde
}
break;
case WIDX_PATH:
toggle_footpath_window();
ToggleFootpathWindow();
break;
case WIDX_CONSTRUCT_RIDE:
context_open_window(WC_CONSTRUCT_RIDE);
@ -430,7 +430,7 @@ static void window_top_toolbar_mouseup(rct_window* w, rct_widgetindex widgetInde
*
* rct2: 0x0066CA3B
*/
static void window_top_toolbar_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowTopToolbarMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
int32_t numItems = 0;
@ -504,30 +504,30 @@ static void window_top_toolbar_mousedown(rct_window* w, rct_widgetindex widgetIn
Dropdown::Flag::StayOpen, numItems);
break;
case WIDX_CHEATS:
top_toolbar_init_cheats_menu(w, widget);
TopToolbarInitCheatsMenu(w, widget);
break;
case WIDX_VIEW_MENU:
top_toolbar_init_view_menu(w, widget);
TopToolbarInitViewMenu(w, widget);
break;
case WIDX_MAP:
top_toolbar_init_map_menu(w, widget);
TopToolbarInitMapMenu(w, widget);
break;
case WIDX_FASTFORWARD:
top_toolbar_init_fastforward_menu(w, widget);
TopToolbarInitFastforwardMenu(w, widget);
break;
case WIDX_ROTATE:
top_toolbar_init_rotate_menu(w, widget);
TopToolbarInitRotateMenu(w, widget);
break;
case WIDX_DEBUG:
top_toolbar_init_debug_menu(w, widget);
TopToolbarInitDebugMenu(w, widget);
break;
case WIDX_NETWORK:
top_toolbar_init_network_menu(w, widget);
TopToolbarInitNetworkMenu(w, widget);
break;
}
}
static void window_top_toolbar_scenarioselect_callback(const utf8* path)
static void WindowTopToolbarScenarioselectCallback(const utf8* path)
{
window_close_by_class(WC_EDITOR_OBJECT_SELECTION);
GetContext()->LoadParkFromFile(path, false, true);
@ -537,7 +537,7 @@ static void window_top_toolbar_scenarioselect_callback(const utf8* path)
*
* rct2: 0x0066C9EA
*/
static void window_top_toolbar_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowTopToolbarDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
{
switch (widgetIndex)
{
@ -566,7 +566,7 @@ static void window_top_toolbar_dropdown(rct_window* w, rct_widgetindex widgetInd
case DDIDX_NEW_GAME:
{
auto intent = Intent(WC_SCENARIO_SELECT);
intent.putExtra(INTENT_EXTRA_CALLBACK, reinterpret_cast<void*>(window_top_toolbar_scenarioselect_callback));
intent.putExtra(INTENT_EXTRA_CALLBACK, reinterpret_cast<void*>(WindowTopToolbarScenarioselectCallback));
context_open_intent(&intent);
break;
}
@ -632,25 +632,25 @@ static void window_top_toolbar_dropdown(rct_window* w, rct_widgetindex widgetInd
}
break;
case WIDX_CHEATS:
top_toolbar_cheats_menu_dropdown(dropdownIndex);
TopToolbarCheatsMenuDropdown(dropdownIndex);
break;
case WIDX_VIEW_MENU:
top_toolbar_view_menu_dropdown(dropdownIndex);
TopToolbarViewMenuDropdown(dropdownIndex);
break;
case WIDX_MAP:
top_toolbar_map_menu_dropdown(dropdownIndex);
TopToolbarMapMenuDropdown(dropdownIndex);
break;
case WIDX_FASTFORWARD:
top_toolbar_fastforward_menu_dropdown(dropdownIndex);
TopToolbarFastforwardMenuDropdown(dropdownIndex);
break;
case WIDX_ROTATE:
top_toolbar_rotate_menu_dropdown(dropdownIndex);
TopToolbarRotateMenuDropdown(dropdownIndex);
break;
case WIDX_DEBUG:
top_toolbar_debug_menu_dropdown(dropdownIndex);
TopToolbarDebugMenuDropdown(dropdownIndex);
break;
case WIDX_NETWORK:
top_toolbar_network_menu_dropdown(dropdownIndex);
TopToolbarNetworkMenuDropdown(dropdownIndex);
break;
}
}
@ -659,7 +659,7 @@ static void window_top_toolbar_dropdown(rct_window* w, rct_widgetindex widgetInd
*
* rct2: 0x0066C810
*/
static void window_top_toolbar_invalidate(rct_window* w)
static void WindowTopToolbarInvalidate(rct_window* w)
{
int32_t x, enabledWidgets, widgetIndex, widgetWidth, firstAlignment;
rct_widget* widget;
@ -878,7 +878,7 @@ static void window_top_toolbar_invalidate(rct_window* w)
*
* rct2: 0x0066C8EC
*/
static void window_top_toolbar_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowTopToolbarPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
int32_t imgId;
@ -1012,7 +1012,7 @@ static void window_top_toolbar_paint(rct_window* w, rct_drawpixelinfo* dpi)
*
* rct2: 0x006E3158
*/
static void repaint_scenery_tool_down(const ScreenCoordsXY& windowPos, rct_widgetindex widgetIndex)
static void RepaintSceneryToolDown(const ScreenCoordsXY& windowPos, rct_widgetindex widgetIndex)
{
auto flags = EnumsToFlags(
ViewportInteractionItem::Scenery, ViewportInteractionItem::Wall, ViewportInteractionItem::LargeScenery,
@ -1088,7 +1088,7 @@ static void repaint_scenery_tool_down(const ScreenCoordsXY& windowPos, rct_widge
}
}
static void scenery_eyedropper_tool_down(const ScreenCoordsXY& windowPos, rct_widgetindex widgetIndex)
static void SceneryEyedropperToolDown(const ScreenCoordsXY& windowPos, rct_widgetindex widgetIndex)
{
auto flags = EnumsToFlags(
ViewportInteractionItem::Scenery, ViewportInteractionItem::Wall, ViewportInteractionItem::LargeScenery,
@ -1103,7 +1103,7 @@ static void scenery_eyedropper_tool_down(const ScreenCoordsXY& windowPos, rct_wi
auto* sceneryEntry = get_small_scenery_entry(entryIndex);
if (sceneryEntry != nullptr)
{
if (window_scenery_set_selected_item({ SCENERY_TYPE_SMALL, entryIndex }))
if (WindowScenerySetSelectedItem({ SCENERY_TYPE_SMALL, entryIndex }))
{
gWindowSceneryRotation = sceneryElement->GetDirectionWithOffset(get_current_rotation());
gWindowSceneryPrimaryColour = sceneryElement->GetPrimaryColour();
@ -1119,7 +1119,7 @@ static void scenery_eyedropper_tool_down(const ScreenCoordsXY& windowPos, rct_wi
auto* sceneryEntry = get_wall_entry(entryIndex);
if (sceneryEntry != nullptr)
{
if (window_scenery_set_selected_item({ SCENERY_TYPE_WALL, entryIndex }))
if (WindowScenerySetSelectedItem({ SCENERY_TYPE_WALL, entryIndex }))
{
gWindowSceneryPrimaryColour = info.Element->AsWall()->GetPrimaryColour();
gWindowScenerySecondaryColour = info.Element->AsWall()->GetSecondaryColour();
@ -1135,7 +1135,7 @@ static void scenery_eyedropper_tool_down(const ScreenCoordsXY& windowPos, rct_wi
auto* sceneryEntry = get_large_scenery_entry(entryIndex);
if (sceneryEntry != nullptr)
{
if (window_scenery_set_selected_item({ SCENERY_TYPE_LARGE, entryIndex }))
if (WindowScenerySetSelectedItem({ SCENERY_TYPE_LARGE, entryIndex }))
{
gWindowSceneryRotation = (get_current_rotation() + info.Element->GetDirection()) & 3;
gWindowSceneryPrimaryColour = info.Element->AsLargeScenery()->GetPrimaryColour();
@ -1153,7 +1153,7 @@ static void scenery_eyedropper_tool_down(const ScreenCoordsXY& windowPos, rct_wi
auto sceneryEntry = get_banner_entry(banner->type);
if (sceneryEntry != nullptr)
{
if (window_scenery_set_selected_item({ SCENERY_TYPE_BANNER, banner->type }))
if (WindowScenerySetSelectedItem({ SCENERY_TYPE_BANNER, banner->type }))
{
gWindowSceneryEyedropperEnabled = false;
}
@ -1167,7 +1167,7 @@ static void scenery_eyedropper_tool_down(const ScreenCoordsXY& windowPos, rct_wi
auto* pathBitEntry = get_footpath_item_entry(entryIndex);
if (pathBitEntry != nullptr)
{
if (window_scenery_set_selected_item({ SCENERY_TYPE_PATH_ITEM, entryIndex }))
if (WindowScenerySetSelectedItem({ SCENERY_TYPE_PATH_ITEM, entryIndex }))
{
gWindowSceneryEyedropperEnabled = false;
}
@ -1179,7 +1179,7 @@ static void scenery_eyedropper_tool_down(const ScreenCoordsXY& windowPos, rct_wi
}
}
static void sub_6E1F34_update_screen_coords_and_buttons_pressed(bool canRaiseItem, ScreenCoordsXY& screenPos)
static void Sub6E1F34UpdateScreenCoordsAndButtonsPressed(bool canRaiseItem, ScreenCoordsXY& screenPos)
{
if (!canRaiseItem && !gCheatsDisableSupportLimits)
{
@ -1251,7 +1251,7 @@ static void sub_6E1F34_update_screen_coords_and_buttons_pressed(bool canRaiseIte
}
}
static void sub_6E1F34_small_scenery(
static void Sub6E1F34SmallScenery(
const ScreenCoordsXY& sourceScreenPos, ObjectEntryIndex sceneryIndex, CoordsXY& gridPos, uint8_t* outQuadrant,
Direction* outRotation)
{
@ -1274,7 +1274,7 @@ static void sub_6E1F34_small_scenery(
can_raise_item = true;
}
sub_6E1F34_update_screen_coords_and_buttons_pressed(can_raise_item, screenPos);
Sub6E1F34UpdateScreenCoordsAndButtonsPressed(can_raise_item, screenPos);
// Small scenery
if (!sceneryEntry->HasFlag(SMALL_SCENERY_FLAG_FULL_TILE))
@ -1442,7 +1442,7 @@ static void sub_6E1F34_small_scenery(
*outRotation = rotation;
}
static void sub_6E1F34_path_item(
static void Sub6E1F34PathItem(
const ScreenCoordsXY& sourceScreenPos, ObjectEntryIndex sceneryIndex, CoordsXY& gridPos, int32_t* outZ)
{
rct_window* w = window_find_by_class(WC_SCENERY);
@ -1454,7 +1454,7 @@ static void sub_6E1F34_path_item(
}
auto screenPos = sourceScreenPos;
sub_6E1F34_update_screen_coords_and_buttons_pressed(false, screenPos);
Sub6E1F34UpdateScreenCoordsAndButtonsPressed(false, screenPos);
// Path bits
constexpr auto flags = EnumsToFlags(ViewportInteractionItem::Footpath, ViewportInteractionItem::FootpathItem);
@ -1475,7 +1475,7 @@ static void sub_6E1F34_path_item(
*outZ = info.Element->GetBaseZ();
}
static void sub_6E1F34_wall(
static void Sub6E1F34Wall(
const ScreenCoordsXY& sourceScreenPos, ObjectEntryIndex sceneryIndex, CoordsXY& gridPos, uint8_t* outEdges)
{
rct_window* w = window_find_by_class(WC_SCENERY);
@ -1495,7 +1495,7 @@ static void sub_6E1F34_wall(
maxPossibleHeight -= wallEntry->height;
}
sub_6E1F34_update_screen_coords_and_buttons_pressed(true, screenPos);
Sub6E1F34UpdateScreenCoordsAndButtonsPressed(true, screenPos);
// Walls
uint8_t edge;
@ -1564,7 +1564,7 @@ static void sub_6E1F34_wall(
*outEdges = edge;
}
static void sub_6E1F34_large_scenery(
static void Sub6E1F34LargeScenery(
const ScreenCoordsXY& sourceScreenPos, ObjectEntryIndex sceneryIndex, CoordsXY& gridPos, Direction* outDirection)
{
rct_window* w = window_find_by_class(WC_SCENERY);
@ -1589,7 +1589,7 @@ static void sub_6E1F34_large_scenery(
maxPossibleHeight = std::max(0, maxPossibleHeight - maxClearZ);
}
sub_6E1F34_update_screen_coords_and_buttons_pressed(true, screenPos);
Sub6E1F34UpdateScreenCoordsAndButtonsPressed(true, screenPos);
// Large scenery
// If CTRL not pressed
@ -1663,7 +1663,7 @@ static void sub_6E1F34_large_scenery(
*outDirection = rotation;
}
static void sub_6E1F34_banner(
static void Sub6E1F34Banner(
const ScreenCoordsXY& sourceScreenPos, ObjectEntryIndex sceneryIndex, CoordsXY& gridPos, int32_t* outZ,
Direction* outDirection)
{
@ -1676,7 +1676,7 @@ static void sub_6E1F34_banner(
}
auto screenPos = sourceScreenPos;
sub_6E1F34_update_screen_coords_and_buttons_pressed(false, screenPos);
Sub6E1F34UpdateScreenCoordsAndButtonsPressed(false, screenPos);
// Banner
constexpr auto flags = EnumsToFlags(ViewportInteractionItem::Footpath, ViewportInteractionItem::FootpathItem);
@ -1716,18 +1716,18 @@ static void sub_6E1F34_banner(
*
* rct2: 0x006E2CC6
*/
static void window_top_toolbar_scenery_tool_down(const ScreenCoordsXY& windowPos, rct_window* w, rct_widgetindex widgetIndex)
static void WindowTopToolbarSceneryToolDown(const ScreenCoordsXY& windowPos, rct_window* w, rct_widgetindex widgetIndex)
{
scenery_remove_ghost_tool_placement();
if (gWindowSceneryPaintEnabled & 1)
{
repaint_scenery_tool_down(windowPos, widgetIndex);
RepaintSceneryToolDown(windowPos, widgetIndex);
return;
}
if (gWindowSceneryEyedropperEnabled)
{
scenery_eyedropper_tool_down(windowPos, widgetIndex);
SceneryEyedropperToolDown(windowPos, widgetIndex);
return;
}
@ -1744,7 +1744,7 @@ static void window_top_toolbar_scenery_tool_down(const ScreenCoordsXY& windowPos
{
uint8_t quadrant;
Direction rotation;
sub_6E1F34_small_scenery(windowPos, selectedScenery, gridPos, &quadrant, &rotation);
Sub6E1F34SmallScenery(windowPos, selectedScenery, gridPos, &quadrant, &rotation);
if (gridPos.IsNull())
return;
@ -1864,7 +1864,7 @@ static void window_top_toolbar_scenery_tool_down(const ScreenCoordsXY& windowPos
case SCENERY_TYPE_PATH_ITEM:
{
int32_t z;
sub_6E1F34_path_item(windowPos, selectedScenery, gridPos, &z);
Sub6E1F34PathItem(windowPos, selectedScenery, gridPos, &z);
if (gridPos.IsNull())
return;
@ -1883,7 +1883,7 @@ static void window_top_toolbar_scenery_tool_down(const ScreenCoordsXY& windowPos
case SCENERY_TYPE_WALL:
{
uint8_t edges;
sub_6E1F34_wall(windowPos, selectedScenery, gridPos, &edges);
Sub6E1F34Wall(windowPos, selectedScenery, gridPos, &edges);
if (gridPos.IsNull())
return;
@ -1935,7 +1935,7 @@ static void window_top_toolbar_scenery_tool_down(const ScreenCoordsXY& windowPos
case SCENERY_TYPE_LARGE:
{
Direction direction;
sub_6E1F34_large_scenery(windowPos, selectedScenery, gridPos, &direction);
Sub6E1F34LargeScenery(windowPos, selectedScenery, gridPos, &direction);
if (gridPos.IsNull())
return;
@ -1993,7 +1993,7 @@ static void window_top_toolbar_scenery_tool_down(const ScreenCoordsXY& windowPos
{
int32_t z;
Direction direction;
sub_6E1F34_banner(windowPos, selectedScenery, gridPos, &z, &direction);
Sub6E1F34Banner(windowPos, selectedScenery, gridPos, &z, &direction);
if (gridPos.IsNull())
return;
@ -2014,7 +2014,7 @@ static void window_top_toolbar_scenery_tool_down(const ScreenCoordsXY& windowPos
}
}
static uint8_t top_toolbar_tool_update_land_paint(const ScreenCoordsXY& screenPos)
static uint8_t TopToolbarToolUpdateLandPaint(const ScreenCoordsXY& screenPos)
{
uint8_t state_changed = 0;
@ -2088,9 +2088,9 @@ static uint8_t top_toolbar_tool_update_land_paint(const ScreenCoordsXY& screenPo
*
* rct2: 0x0068E213
*/
static void top_toolbar_tool_update_scenery_clear(const ScreenCoordsXY& screenPos)
static void TopToolbarToolUpdateSceneryClear(const ScreenCoordsXY& screenPos)
{
if (!top_toolbar_tool_update_land_paint(screenPos))
if (!TopToolbarToolUpdateLandPaint(screenPos))
return;
auto action = GetClearAction();
@ -2107,7 +2107,7 @@ static void top_toolbar_tool_update_scenery_clear(const ScreenCoordsXY& screenPo
*
* rct2: 0x00664280
*/
static void top_toolbar_tool_update_land(const ScreenCoordsXY& screenPos)
static void TopToolbarToolUpdateLand(const ScreenCoordsXY& screenPos)
{
const bool mapCtrlPressed = InputTestPlaceObjectModifier(PLACE_OBJECT_MODIFIER_COPY_Z);
@ -2118,8 +2118,8 @@ static void top_toolbar_tool_update_land(const ScreenCoordsXY& screenPos)
if (!(gMapSelectFlags & MAP_SELECT_FLAG_ENABLE))
return;
money64 lower_cost = selection_lower_land(0);
money64 raise_cost = selection_raise_land(0);
money64 lower_cost = SelectionLowerLand(0);
money64 raise_cost = SelectionRaiseLand(0);
if (gLandToolRaiseCost != raise_cost || gLandToolLowerCost != lower_cost)
{
@ -2204,8 +2204,8 @@ static void top_toolbar_tool_update_land(const ScreenCoordsXY& screenPos)
if (!state_changed)
return;
money64 lower_cost = selection_lower_land(0);
money64 raise_cost = selection_raise_land(0);
money64 lower_cost = SelectionLowerLand(0);
money64 raise_cost = SelectionRaiseLand(0);
if (gLandToolRaiseCost != raise_cost || gLandToolLowerCost != lower_cost)
{
@ -2330,8 +2330,8 @@ static void top_toolbar_tool_update_land(const ScreenCoordsXY& screenPos)
if (!state_changed)
return;
money64 lower_cost = selection_lower_land(0);
money64 raise_cost = selection_raise_land(0);
money64 lower_cost = SelectionLowerLand(0);
money64 raise_cost = SelectionRaiseLand(0);
if (gLandToolRaiseCost != raise_cost || gLandToolLowerCost != lower_cost)
{
@ -2345,7 +2345,7 @@ static void top_toolbar_tool_update_land(const ScreenCoordsXY& screenPos)
*
* rct2: 0x006E6BDC
*/
static void top_toolbar_tool_update_water(const ScreenCoordsXY& screenPos)
static void TopToolbarToolUpdateWater(const ScreenCoordsXY& screenPos)
{
map_invalidate_selection_rect();
@ -2471,7 +2471,7 @@ static void top_toolbar_tool_update_water(const ScreenCoordsXY& screenPos)
* On failure returns MONEY64_UNDEFINED
* On success places ghost scenery and returns cost to place proper
*/
static money64 try_place_ghost_small_scenery(
static money64 TryPlaceGhostSmallScenery(
CoordsXYZD loc, uint8_t quadrant, ObjectEntryIndex entryIndex, colour_t primaryColour, colour_t secondaryColour)
{
scenery_remove_ghost_tool_placement();
@ -2506,7 +2506,7 @@ static money64 try_place_ghost_small_scenery(
return res->Cost;
}
static money64 try_place_ghost_path_addition(CoordsXYZ loc, ObjectEntryIndex entryIndex)
static money64 TryPlaceGhostPathAddition(CoordsXYZ loc, ObjectEntryIndex entryIndex)
{
scenery_remove_ghost_tool_placement();
@ -2528,7 +2528,7 @@ static money64 try_place_ghost_path_addition(CoordsXYZ loc, ObjectEntryIndex ent
return res->Cost;
}
static money64 try_place_ghost_wall(
static money64 TryPlaceGhostWall(
CoordsXYZ loc, uint8_t edge, ObjectEntryIndex entryIndex, colour_t primaryColour, colour_t secondaryColour,
colour_t tertiaryColour)
{
@ -2555,7 +2555,7 @@ static money64 try_place_ghost_wall(
return res->Cost;
}
static money64 try_place_ghost_large_scenery(
static money64 TryPlaceGhostLargeScenery(
CoordsXYZD loc, ObjectEntryIndex entryIndex, colour_t primaryColour, colour_t secondaryColour)
{
scenery_remove_ghost_tool_placement();
@ -2587,7 +2587,7 @@ static money64 try_place_ghost_large_scenery(
return res->Cost;
}
static money64 try_place_ghost_banner(CoordsXYZD loc, ObjectEntryIndex entryIndex)
static money64 TryPlaceGhostBanner(CoordsXYZD loc, ObjectEntryIndex entryIndex)
{
scenery_remove_ghost_tool_placement();
@ -2610,7 +2610,7 @@ static money64 try_place_ghost_banner(CoordsXYZD loc, ObjectEntryIndex entryInde
*
* rct2: 0x006E287B
*/
static void top_toolbar_tool_update_scenery(const ScreenCoordsXY& screenPos)
static void TopToolbarToolUpdateScenery(const ScreenCoordsXY& screenPos)
{
map_invalidate_selection_rect();
map_invalidate_map_selection_tiles();
@ -2650,7 +2650,7 @@ static void top_toolbar_tool_update_scenery(const ScreenCoordsXY& screenPos)
uint8_t quadrant;
Direction rotation;
sub_6E1F34_small_scenery(screenPos, selection.EntryIndex, mapTile, &quadrant, &rotation);
Sub6E1F34SmallScenery(screenPos, selection.EntryIndex, mapTile, &quadrant, &rotation);
if (mapTile.IsNull())
{
@ -2711,7 +2711,7 @@ static void top_toolbar_tool_update_scenery(const ScreenCoordsXY& screenPos)
for (; attemptsLeft != 0; attemptsLeft--)
{
cost = try_place_ghost_small_scenery(
cost = TryPlaceGhostSmallScenery(
{ mapTile, gSceneryPlaceZ, rotation }, quadrant, selection.EntryIndex, gWindowSceneryPrimaryColour,
gWindowScenerySecondaryColour);
@ -2728,7 +2728,7 @@ static void top_toolbar_tool_update_scenery(const ScreenCoordsXY& screenPos)
CoordsXY mapTile = {};
int32_t z;
sub_6E1F34_path_item(screenPos, selection.EntryIndex, mapTile, &z);
Sub6E1F34PathItem(screenPos, selection.EntryIndex, mapTile, &z);
if (mapTile.IsNull())
{
@ -2753,7 +2753,7 @@ static void top_toolbar_tool_update_scenery(const ScreenCoordsXY& screenPos)
scenery_remove_ghost_tool_placement();
cost = try_place_ghost_path_addition({ mapTile, z }, selection.EntryIndex);
cost = TryPlaceGhostPathAddition({ mapTile, z }, selection.EntryIndex);
gSceneryPlaceCost = cost;
break;
@ -2763,7 +2763,7 @@ static void top_toolbar_tool_update_scenery(const ScreenCoordsXY& screenPos)
CoordsXY mapTile = {};
uint8_t edge;
sub_6E1F34_wall(screenPos, selection.EntryIndex, mapTile, &edge);
Sub6E1F34Wall(screenPos, selection.EntryIndex, mapTile, &edge);
if (mapTile.IsNull())
{
@ -2801,7 +2801,7 @@ static void top_toolbar_tool_update_scenery(const ScreenCoordsXY& screenPos)
cost = 0;
for (; attemptsLeft != 0; attemptsLeft--)
{
cost = try_place_ghost_wall(
cost = TryPlaceGhostWall(
{ mapTile, gSceneryPlaceZ }, edge, selection.EntryIndex, gWindowSceneryPrimaryColour,
gWindowScenerySecondaryColour, gWindowSceneryTertiaryColour);
@ -2818,7 +2818,7 @@ static void top_toolbar_tool_update_scenery(const ScreenCoordsXY& screenPos)
CoordsXY mapTile = {};
Direction direction;
sub_6E1F34_large_scenery(screenPos, selection.EntryIndex, mapTile, &direction);
Sub6E1F34LargeScenery(screenPos, selection.EntryIndex, mapTile, &direction);
if (mapTile.IsNull())
{
@ -2867,7 +2867,7 @@ static void top_toolbar_tool_update_scenery(const ScreenCoordsXY& screenPos)
cost = 0;
for (; attemptsLeft != 0; attemptsLeft--)
{
cost = try_place_ghost_large_scenery(
cost = TryPlaceGhostLargeScenery(
{ mapTile, gSceneryPlaceZ, direction }, selection.EntryIndex, gWindowSceneryPrimaryColour,
gWindowScenerySecondaryColour);
@ -2885,7 +2885,7 @@ static void top_toolbar_tool_update_scenery(const ScreenCoordsXY& screenPos)
Direction direction;
int32_t z;
sub_6E1F34_banner(screenPos, selection.EntryIndex, mapTile, &z, &direction);
Sub6E1F34Banner(screenPos, selection.EntryIndex, mapTile, &z, &direction);
if (mapTile.IsNull())
{
@ -2911,7 +2911,7 @@ static void top_toolbar_tool_update_scenery(const ScreenCoordsXY& screenPos)
scenery_remove_ghost_tool_placement();
cost = try_place_ghost_banner({ mapTile, z, direction }, selection.EntryIndex);
cost = TryPlaceGhostBanner({ mapTile, z, direction }, selection.EntryIndex);
gSceneryPlaceCost = cost;
break;
@ -2923,24 +2923,24 @@ static void top_toolbar_tool_update_scenery(const ScreenCoordsXY& screenPos)
*
* rct2: 0x0066CB25
*/
static void window_top_toolbar_tool_update(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowTopToolbarToolUpdate(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
{
switch (widgetIndex)
{
case WIDX_CLEAR_SCENERY:
top_toolbar_tool_update_scenery_clear(screenCoords);
TopToolbarToolUpdateSceneryClear(screenCoords);
break;
case WIDX_LAND:
if (gLandPaintMode)
top_toolbar_tool_update_land_paint(screenCoords);
TopToolbarToolUpdateLandPaint(screenCoords);
else
top_toolbar_tool_update_land(screenCoords);
TopToolbarToolUpdateLand(screenCoords);
break;
case WIDX_WATER:
top_toolbar_tool_update_water(screenCoords);
TopToolbarToolUpdateWater(screenCoords);
break;
case WIDX_SCENERY:
top_toolbar_tool_update_scenery(screenCoords);
TopToolbarToolUpdateScenery(screenCoords);
break;
#ifdef ENABLE_SCRIPTING
default:
@ -2958,7 +2958,7 @@ static void window_top_toolbar_tool_update(rct_window* w, rct_widgetindex widget
*
* rct2: 0x0066CB73
*/
static void window_top_toolbar_tool_down(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowTopToolbarToolDown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
{
switch (widgetIndex)
{
@ -2997,7 +2997,7 @@ static void window_top_toolbar_tool_down(rct_window* w, rct_widgetindex widgetIn
}
break;
case WIDX_SCENERY:
window_top_toolbar_scenery_tool_down(screenCoords, w, widgetIndex);
WindowTopToolbarSceneryToolDown(screenCoords, w, widgetIndex);
break;
#ifdef ENABLE_SCRIPTING
default:
@ -3015,7 +3015,7 @@ static void window_top_toolbar_tool_down(rct_window* w, rct_widgetindex widgetIn
*
* rct2: 0x006644DD
*/
static money64 selection_raise_land(uint8_t flags)
static money64 SelectionRaiseLand(uint8_t flags)
{
int32_t centreX = (gMapSelectPositionA.x + gMapSelectPositionB.x) / 2;
int32_t centreY = (gMapSelectPositionA.y + gMapSelectPositionB.y) / 2;
@ -3046,7 +3046,7 @@ static money64 selection_raise_land(uint8_t flags)
*
* rct2: 0x006645B3
*/
static money64 selection_lower_land(uint8_t flags)
static money64 SelectionLowerLand(uint8_t flags)
{
int32_t centreX = (gMapSelectPositionA.x + gMapSelectPositionB.x) / 2;
int32_t centreY = (gMapSelectPositionA.y + gMapSelectPositionB.y) / 2;
@ -3077,7 +3077,7 @@ static money64 selection_lower_land(uint8_t flags)
* part of window_top_toolbar_tool_drag(0x0066CB4E)
* rct2: 0x00664454
*/
static void window_top_toolbar_land_tool_drag(const ScreenCoordsXY& screenPos)
static void WindowTopToolbarLandToolDrag(const ScreenCoordsXY& screenPos)
{
rct_window* window = window_find_from_point(screenPos);
if (window == nullptr)
@ -3100,7 +3100,7 @@ static void window_top_toolbar_land_tool_drag(const ScreenCoordsXY& screenPos)
{
gInputDragLast.y += tile_height;
selection_raise_land(GAME_COMMAND_FLAG_APPLY);
SelectionRaiseLand(GAME_COMMAND_FLAG_APPLY);
gLandToolRaiseCost = MONEY64_UNDEFINED;
gLandToolLowerCost = MONEY64_UNDEFINED;
@ -3109,7 +3109,7 @@ static void window_top_toolbar_land_tool_drag(const ScreenCoordsXY& screenPos)
{
gInputDragLast.y -= tile_height;
selection_lower_land(GAME_COMMAND_FLAG_APPLY);
SelectionLowerLand(GAME_COMMAND_FLAG_APPLY);
gLandToolRaiseCost = MONEY64_UNDEFINED;
gLandToolLowerCost = MONEY64_UNDEFINED;
@ -3120,7 +3120,7 @@ static void window_top_toolbar_land_tool_drag(const ScreenCoordsXY& screenPos)
* part of window_top_toolbar_tool_drag(0x0066CB4E)
* rct2: 0x006E6D4B
*/
static void window_top_toolbar_water_tool_drag(const ScreenCoordsXY& screenPos)
static void WindowTopToolbarWaterToolDrag(const ScreenCoordsXY& screenPos)
{
rct_window* window = window_find_from_point(screenPos);
if (!window)
@ -3173,7 +3173,7 @@ static void window_top_toolbar_water_tool_drag(const ScreenCoordsXY& screenPos)
*
* rct2: 0x0066CB4E
*/
static void window_top_toolbar_tool_drag(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowTopToolbarToolDrag(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
{
switch (widgetIndex)
{
@ -3206,21 +3206,21 @@ static void window_top_toolbar_tool_drag(rct_window* w, rct_widgetindex widgetIn
{
if (!_landToolBlocked)
{
window_top_toolbar_land_tool_drag(screenCoords);
WindowTopToolbarLandToolDrag(screenCoords);
}
}
break;
case WIDX_WATER:
if (!_landToolBlocked)
{
window_top_toolbar_water_tool_drag(screenCoords);
WindowTopToolbarWaterToolDrag(screenCoords);
}
break;
case WIDX_SCENERY:
if (gWindowSceneryPaintEnabled & 1)
window_top_toolbar_scenery_tool_down(screenCoords, w, widgetIndex);
WindowTopToolbarSceneryToolDown(screenCoords, w, widgetIndex);
if (gWindowSceneryEyedropperEnabled)
window_top_toolbar_scenery_tool_down(screenCoords, w, widgetIndex);
WindowTopToolbarSceneryToolDown(screenCoords, w, widgetIndex);
break;
#ifdef ENABLE_SCRIPTING
default:
@ -3238,7 +3238,7 @@ static void window_top_toolbar_tool_drag(rct_window* w, rct_widgetindex widgetIn
*
* rct2: 0x0066CC5B
*/
static void window_top_toolbar_tool_up(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowTopToolbarToolUp(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
{
_landToolBlocked = false;
switch (widgetIndex)
@ -3274,7 +3274,7 @@ static void window_top_toolbar_tool_up(rct_window* w, rct_widgetindex widgetInde
*
* rct2: 0x0066CA58
*/
static void window_top_toolbar_tool_abort(rct_window* w, rct_widgetindex widgetIndex)
static void WindowTopToolbarToolAbort(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -3296,7 +3296,7 @@ static void window_top_toolbar_tool_abort(rct_window* w, rct_widgetindex widgetI
}
}
static void top_toolbar_init_map_menu(rct_window* w, rct_widget* widget)
static void TopToolbarInitMapMenu(rct_window* w, rct_widget* widget)
{
auto i = 0;
gDropdownItemsFormat[i++] = STR_SHORTCUT_SHOW_MAP;
@ -3326,7 +3326,7 @@ static void top_toolbar_init_map_menu(rct_window* w, rct_widget* widget)
gDropdownDefaultIndex = DDIDX_SHOW_MAP;
}
static void top_toolbar_map_menu_dropdown(int16_t dropdownIndex)
static void TopToolbarMapMenuDropdown(int16_t dropdownIndex)
{
int32_t customStartIndex = 3;
if ((gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) && gEditorStep == EditorStep::LandscapeEditor)
@ -3362,7 +3362,7 @@ static void top_toolbar_map_menu_dropdown(int16_t dropdownIndex)
}
}
static void top_toolbar_init_fastforward_menu(rct_window* w, rct_widget* widget)
static void TopToolbarInitFastforwardMenu(rct_window* w, rct_widget* widget)
{
int32_t num_items = 4;
gDropdownItemsFormat[0] = STR_TOGGLE_OPTION;
@ -3410,7 +3410,7 @@ static void top_toolbar_init_fastforward_menu(rct_window* w, rct_widget* widget)
}
}
static void top_toolbar_fastforward_menu_dropdown(int16_t dropdownIndex)
static void TopToolbarFastforwardMenuDropdown(int16_t dropdownIndex)
{
rct_window* w = window_get_main();
if (w)
@ -3425,7 +3425,7 @@ static void top_toolbar_fastforward_menu_dropdown(int16_t dropdownIndex)
}
}
static void top_toolbar_init_rotate_menu(rct_window* w, rct_widget* widget)
static void TopToolbarInitRotateMenu(rct_window* w, rct_widget* widget)
{
gDropdownItemsFormat[0] = STR_ROTATE_CLOCKWISE;
gDropdownItemsFormat[1] = STR_ROTATE_ANTI_CLOCKWISE;
@ -3436,7 +3436,7 @@ static void top_toolbar_init_rotate_menu(rct_window* w, rct_widget* widget)
gDropdownDefaultIndex = DDIDX_ROTATE_CLOCKWISE;
}
static void top_toolbar_rotate_menu_dropdown(int16_t dropdownIndex)
static void TopToolbarRotateMenuDropdown(int16_t dropdownIndex)
{
rct_window* w = window_get_main();
if (w)
@ -3454,7 +3454,7 @@ static void top_toolbar_rotate_menu_dropdown(int16_t dropdownIndex)
}
}
static void top_toolbar_init_cheats_menu(rct_window* w, rct_widget* widget)
static void TopToolbarInitCheatsMenu(rct_window* w, rct_widget* widget)
{
using namespace Dropdown;
@ -3511,7 +3511,7 @@ static void top_toolbar_init_cheats_menu(rct_window* w, rct_widget* widget)
gDropdownDefaultIndex = DDIDX_CHEATS;
}
static void top_toolbar_cheats_menu_dropdown(int16_t dropdownIndex)
static void TopToolbarCheatsMenuDropdown(int16_t dropdownIndex)
{
switch (dropdownIndex)
{
@ -3546,7 +3546,7 @@ static void top_toolbar_cheats_menu_dropdown(int16_t dropdownIndex)
}
}
static void top_toolbar_init_debug_menu(rct_window* w, rct_widget* widget)
static void TopToolbarInitDebugMenu(rct_window* w, rct_widget* widget)
{
gDropdownItemsFormat[DDIDX_CONSOLE] = STR_TOGGLE_OPTION;
gDropdownItemsArgs[DDIDX_CONSOLE] = STR_DEBUG_DROPDOWN_CONSOLE;
@ -3560,7 +3560,7 @@ static void top_toolbar_init_debug_menu(rct_window* w, rct_widget* widget)
Dropdown::SetChecked(DDIDX_DEBUG_PAINT, window_find_by_class(WC_DEBUG_PAINT) != nullptr);
}
static void top_toolbar_init_network_menu(rct_window* w, rct_widget* widget)
static void TopToolbarInitNetworkMenu(rct_window* w, rct_widget* widget)
{
gDropdownItemsFormat[DDIDX_MULTIPLAYER] = STR_MULTIPLAYER;
gDropdownItemsFormat[DDIDX_MULTIPLAYER_RECONNECT] = STR_MULTIPLAYER_RECONNECT;
@ -3574,7 +3574,7 @@ static void top_toolbar_init_network_menu(rct_window* w, rct_widget* widget)
gDropdownDefaultIndex = DDIDX_MULTIPLAYER;
}
static void top_toolbar_debug_menu_dropdown(int16_t dropdownIndex)
static void TopToolbarDebugMenuDropdown(int16_t dropdownIndex)
{
rct_window* w = window_get_main();
if (w != nullptr)
@ -3601,7 +3601,7 @@ static void top_toolbar_debug_menu_dropdown(int16_t dropdownIndex)
}
}
static void top_toolbar_network_menu_dropdown(int16_t dropdownIndex)
static void TopToolbarNetworkMenuDropdown(int16_t dropdownIndex)
{
rct_window* w = window_get_main();
if (w != nullptr)
@ -3622,7 +3622,7 @@ static void top_toolbar_network_menu_dropdown(int16_t dropdownIndex)
*
* rct2: 0x0066CDE4
*/
static void top_toolbar_init_view_menu(rct_window* w, rct_widget* widget)
static void TopToolbarInitViewMenu(rct_window* w, rct_widget* widget)
{
using namespace Dropdown;
constexpr Item items[] = {
@ -3697,7 +3697,7 @@ static void top_toolbar_init_view_menu(rct_window* w, rct_widget* widget)
*
* rct2: 0x0066CF8A
*/
static void top_toolbar_view_menu_dropdown(int16_t dropdownIndex)
static void TopToolbarViewMenuDropdown(int16_t dropdownIndex)
{
rct_window* w = window_get_main();
if (w != nullptr)
@ -3766,7 +3766,7 @@ static void top_toolbar_view_menu_dropdown(int16_t dropdownIndex)
*
* rct2: 0x0066CCE7
*/
static void toggle_footpath_window()
static void ToggleFootpathWindow()
{
if (window_find_by_class(WC_FOOTPATH) == nullptr)
{
@ -3783,7 +3783,7 @@ static void toggle_footpath_window()
*
* rct2: 0x0066CD54
*/
static void toggle_land_window(rct_window* topToolbar, rct_widgetindex widgetIndex)
static void ToggleLandWindow(rct_window* topToolbar, rct_widgetindex widgetIndex)
{
if ((input_test_flag(INPUT_FLAG_TOOL_ACTIVE)) && gCurrentToolWidget.window_classification == WC_TOP_TOOLBAR
&& gCurrentToolWidget.widget_index == WIDX_LAND)
@ -3804,7 +3804,7 @@ static void toggle_land_window(rct_window* topToolbar, rct_widgetindex widgetInd
*
* rct2: 0x0066CD0C
*/
static void toggle_clear_scenery_window(rct_window* topToolbar, rct_widgetindex widgetIndex)
static void ToggleClearSceneryWindow(rct_window* topToolbar, rct_widgetindex widgetIndex)
{
if ((input_test_flag(INPUT_FLAG_TOOL_ACTIVE) && gCurrentToolWidget.window_classification == WC_TOP_TOOLBAR
&& gCurrentToolWidget.widget_index == WIDX_CLEAR_SCENERY))
@ -3824,7 +3824,7 @@ static void toggle_clear_scenery_window(rct_window* topToolbar, rct_widgetindex
*
* rct2: 0x0066CD9C
*/
static void toggle_water_window(rct_window* topToolbar, rct_widgetindex widgetIndex)
static void ToggleWaterWindow(rct_window* topToolbar, rct_widgetindex widgetIndex)
{
if ((input_test_flag(INPUT_FLAG_TOOL_ACTIVE)) && gCurrentToolWidget.window_classification == WC_TOP_TOOLBAR
&& gCurrentToolWidget.widget_index == WIDX_WATER)
@ -3845,7 +3845,7 @@ static void toggle_water_window(rct_window* topToolbar, rct_widgetindex widgetIn
*
* rct2: 0x0066D104
*/
bool land_tool_is_active()
bool LandToolIsActive()
{
if (!(input_test_flag(INPUT_FLAG_TOOL_ACTIVE)))
return false;
@ -3860,7 +3860,7 @@ bool land_tool_is_active()
*
* rct2: 0x0066D125
*/
bool clear_scenery_tool_is_active()
bool ClearSceneryToolIsActive()
{
if (!(input_test_flag(INPUT_FLAG_TOOL_ACTIVE)))
return false;
@ -3875,7 +3875,7 @@ bool clear_scenery_tool_is_active()
*
* rct2: 0x0066D125
*/
bool water_tool_is_active()
bool WaterToolIsActive()
{
if (!(input_test_flag(INPUT_FLAG_TOOL_ACTIVE)))
return false;

54
src/openrct2-ui/windows/TrackDesignManage.cpp
View File

@ -54,28 +54,28 @@ static rct_widget window_track_delete_prompt_widgets[] = {
#pragma region Events
static void window_track_manage_close(rct_window *w);
static void window_track_manage_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_track_manage_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void window_track_manage_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowTrackManageClose(rct_window *w);
static void WindowTrackManageMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowTrackManageTextinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void WindowTrackManagePaint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_track_delete_prompt_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_track_delete_prompt_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowTrackDeletePromptMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowTrackDeletePromptPaint(rct_window *w, rct_drawpixelinfo *dpi);
// 0x009940EC
static rct_window_event_list window_track_manage_events([](auto& events)
{
events.close = &window_track_manage_close;
events.mouse_up = &window_track_manage_mouseup;
events.text_input = &window_track_manage_textinput;
events.paint = &window_track_manage_paint;
events.close = &WindowTrackManageClose;
events.mouse_up = &WindowTrackManageMouseup;
events.text_input = &WindowTrackManageTextinput;
events.paint = &WindowTrackManagePaint;
});
// 0x0099415C
static rct_window_event_list window_track_delete_prompt_events([](auto& events)
{
events.mouse_up = &window_track_delete_prompt_mouseup;
events.paint = &window_track_delete_prompt_paint;
events.mouse_up = &WindowTrackDeletePromptMouseup;
events.paint = &WindowTrackDeletePromptPaint;
});
// clang-format on
@ -83,14 +83,14 @@ static rct_window_event_list window_track_delete_prompt_events([](auto& events)
static track_design_file_ref* _trackDesignFileReference;
static void window_track_delete_prompt_open();
static void window_track_design_list_reload_tracks();
static void WindowTrackDeletePromptOpen();
static void WindowTrackDesignListReloadTracks();
/**
*
* rct2: 0x006D348F
*/
rct_window* window_track_manage_open(track_design_file_ref* tdFileRef)
rct_window* WindowTrackManageOpen(track_design_file_ref* tdFileRef)
{
window_close_by_class(WC_MANAGE_TRACK_DESIGN);
@ -115,7 +115,7 @@ rct_window* window_track_manage_open(track_design_file_ref* tdFileRef)
*
* rct2: 0x006D364C
*/
static void window_track_manage_close(rct_window* w)
static void WindowTrackManageClose(rct_window* w)
{
rct_window* trackDesignListWindow = window_find_by_class(WC_TRACK_DESIGN_LIST);
if (trackDesignListWindow != nullptr)
@ -128,7 +128,7 @@ static void window_track_manage_close(rct_window* w)
*
* rct2: 0x006D3523
*/
static void window_track_manage_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowTrackManageMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -137,12 +137,12 @@ static void window_track_manage_mouseup(rct_window* w, rct_widgetindex widgetInd
window_close(w);
break;
case WIDX_RENAME:
window_text_input_raw_open(
WindowTextInputRawOpen(
w, widgetIndex, STR_TRACK_DESIGN_RENAME_TITLE, STR_TRACK_DESIGN_RENAME_DESC, {},
_trackDesignFileReference->name, 127);
break;
case WIDX_DELETE:
window_track_delete_prompt_open();
WindowTrackDeletePromptOpen();
break;
}
}
@ -151,7 +151,7 @@ static void window_track_manage_mouseup(rct_window* w, rct_widgetindex widgetInd
*
* rct2: 0x006D3523
*/
static void window_track_manage_textinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
static void WindowTrackManageTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
{
if (widgetIndex != WIDX_RENAME || str_is_null_or_empty(text))
{
@ -174,7 +174,7 @@ static void window_track_manage_textinput(rct_window* w, rct_widgetindex widgetI
{
window_close_by_class(WC_TRACK_DELETE_PROMPT);
window_close(w);
window_track_design_list_reload_tracks();
WindowTrackDesignListReloadTracks();
}
else
{
@ -186,7 +186,7 @@ static void window_track_manage_textinput(rct_window* w, rct_widgetindex widgetI
*
* rct2: 0x006D3523
*/
static void window_track_manage_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowTrackManagePaint(rct_window* w, rct_drawpixelinfo* dpi)
{
Formatter::Common().Add<char*>(_trackDesignFileReference->name);
WindowDrawWidgets(w, dpi);
@ -196,7 +196,7 @@ static void window_track_manage_paint(rct_window* w, rct_drawpixelinfo* dpi)
*
* rct2: 0x006D35CD
*/
static void window_track_delete_prompt_open()
static void WindowTrackDeletePromptOpen()
{
window_close_by_class(WC_TRACK_DELETE_PROMPT);
@ -216,7 +216,7 @@ static void window_track_delete_prompt_open()
*
* rct2: 0x006D3823
*/
static void window_track_delete_prompt_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowTrackDeletePromptMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -229,7 +229,7 @@ static void window_track_delete_prompt_mouseup(rct_window* w, rct_widgetindex wi
if (track_repository_delete(_trackDesignFileReference->path))
{
window_close_by_class(WC_MANAGE_TRACK_DESIGN);
window_track_design_list_reload_tracks();
WindowTrackDesignListReloadTracks();
}
else
{
@ -243,7 +243,7 @@ static void window_track_delete_prompt_mouseup(rct_window* w, rct_widgetindex wi
*
* rct2: 0x006D37EE
*/
static void window_track_delete_prompt_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowTrackDeletePromptPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
@ -254,7 +254,7 @@ static void window_track_delete_prompt_paint(rct_window* w, rct_drawpixelinfo* d
STR_ARE_YOU_SURE_YOU_WANT_TO_PERMANENTLY_DELETE_TRACK, ft, { TextAlignment::CENTRE });
}
static void window_track_design_list_reload_tracks()
static void WindowTrackDesignListReloadTracks()
{
rct_window* trackListWindow = window_find_by_class(WC_TRACK_DESIGN_LIST);
if (trackListWindow != nullptr)

144
src/openrct2-ui/windows/TrackDesignPlace.cpp
View File

@ -70,27 +70,27 @@ static rct_widget window_track_place_widgets[] = {
WIDGETS_END,
};
static void window_track_place_close(rct_window *w);
static void window_track_place_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_track_place_update(rct_window *w);
static void window_track_place_toolupdate(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void window_track_place_tooldown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void window_track_place_toolabort(rct_window *w, rct_widgetindex widgetIndex);
static void window_track_place_unknown14(rct_window *w);
static void window_track_place_invalidate(rct_window *w);
static void window_track_place_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowTrackPlaceClose(rct_window *w);
static void WindowTrackPlaceMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowTrackPlaceUpdate(rct_window *w);
static void WindowTrackPlaceToolupdate(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowTrackPlaceTooldown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowTrackPlaceToolabort(rct_window *w, rct_widgetindex widgetIndex);
static void WindowTrackPlaceUnknown14(rct_window *w);
static void WindowTrackPlaceInvalidate(rct_window *w);
static void WindowTrackPlacePaint(rct_window *w, rct_drawpixelinfo *dpi);
static rct_window_event_list window_track_place_events([](auto& events)
{
events.close = &window_track_place_close;
events.mouse_up = &window_track_place_mouseup;
events.update = &window_track_place_update;
events.tool_update = &window_track_place_toolupdate;
events.tool_down = &window_track_place_tooldown;
events.tool_abort = &window_track_place_toolabort;
events.viewport_rotate = &window_track_place_unknown14;
events.invalidate = &window_track_place_invalidate;
events.paint = &window_track_place_paint;
events.close = &WindowTrackPlaceClose;
events.mouse_up = &WindowTrackPlaceMouseup;
events.update = &WindowTrackPlaceUpdate;
events.tool_update = &WindowTrackPlaceToolupdate;
events.tool_down = &WindowTrackPlaceTooldown;
events.tool_abort = &WindowTrackPlaceToolabort;
events.viewport_rotate = &WindowTrackPlaceUnknown14;
events.invalidate = &WindowTrackPlaceInvalidate;
events.paint = &WindowTrackPlacePaint;
});
// clang-format on
@ -104,24 +104,24 @@ static money32 _window_track_place_last_cost;
static std::unique_ptr<TrackDesign> _trackDesign;
static void window_track_place_clear_provisional();
static int32_t window_track_place_get_base_z(const CoordsXY& loc);
static void WindowTrackPlaceClearProvisional();
static int32_t WindowTrackPlaceGetBaseZ(const CoordsXY& loc);
static void window_track_place_clear_mini_preview();
static void window_track_place_draw_mini_preview(TrackDesign* td6);
static void window_track_place_draw_mini_preview_track(
static void WindowTrackPlaceClearMiniPreview();
static void WindowTrackPlaceDrawMiniPreview(TrackDesign* td6);
static void WindowTrackPlaceDrawMiniPreviewTrack(
TrackDesign* td6, int32_t pass, const CoordsXY& origin, CoordsXY min, CoordsXY max);
static void window_track_place_draw_mini_preview_maze(
static void WindowTrackPlaceDrawMiniPreviewMaze(
TrackDesign* td6, int32_t pass, const CoordsXY& origin, CoordsXY min, CoordsXY max);
static ScreenCoordsXY draw_mini_preview_get_pixel_position(const CoordsXY& location);
static bool draw_mini_preview_is_pixel_in_bounds(const ScreenCoordsXY& pixel);
static uint8_t* draw_mini_preview_get_pixel_ptr(const ScreenCoordsXY& pixel);
static ScreenCoordsXY DrawMiniPreviewGetPixelPosition(const CoordsXY& location);
static bool DrawMiniPreviewIsPixelInBounds(const ScreenCoordsXY& pixel);
static uint8_t* DrawMiniPreviewGetPixelPtr(const ScreenCoordsXY& pixel);
/**
*
* rct2: 0x006D182E
*/
static void window_track_place_clear_mini_preview()
static void WindowTrackPlaceClearMiniPreview()
{
// Fill with transparent colour.
std::fill(_window_track_place_mini_preview.begin(), _window_track_place_mini_preview.end(), PALETTE_INDEX_0);
@ -131,7 +131,7 @@ static void window_track_place_clear_mini_preview()
*
* rct2: 0x006CFCA0
*/
rct_window* window_track_place_open(const track_design_file_ref* tdFileRef)
rct_window* WindowTrackPlaceOpen(const track_design_file_ref* tdFileRef)
{
_trackDesign = TrackDesignImport(tdFileRef->path);
if (_trackDesign == nullptr)
@ -155,8 +155,8 @@ rct_window* window_track_place_open(const track_design_file_ref* tdFileRef)
_windowTrackPlaceLast.SetNull();
_currentTrackPieceDirection = (2 - get_current_rotation()) & 3;
window_track_place_clear_mini_preview();
window_track_place_draw_mini_preview(_trackDesign.get());
WindowTrackPlaceClearMiniPreview();
WindowTrackPlaceDrawMiniPreview(_trackDesign.get());
return w;
}
@ -165,9 +165,9 @@ rct_window* window_track_place_open(const track_design_file_ref* tdFileRef)
*
* rct2: 0x006D0119
*/
static void window_track_place_close(rct_window* w)
static void WindowTrackPlaceClose(rct_window* w)
{
window_track_place_clear_provisional();
WindowTrackPlaceClearProvisional();
viewport_set_visibility(0);
map_invalidate_map_selection_tiles();
gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_CONSTRUCT;
@ -182,7 +182,7 @@ static void window_track_place_close(rct_window* w)
*
* rct2: 0x006CFEAC
*/
static void window_track_place_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowTrackPlaceMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -190,18 +190,18 @@ static void window_track_place_mouseup(rct_window* w, rct_widgetindex widgetInde
window_close(w);
break;
case WIDX_ROTATE:
window_track_place_clear_provisional();
WindowTrackPlaceClearProvisional();
_currentTrackPieceDirection = (_currentTrackPieceDirection + 1) & 3;
w->Invalidate();
_windowTrackPlaceLast.SetNull();
window_track_place_draw_mini_preview(_trackDesign.get());
WindowTrackPlaceDrawMiniPreview(_trackDesign.get());
break;
case WIDX_MIRROR:
TrackDesignMirror(_trackDesign.get());
_currentTrackPieceDirection = (0 - _currentTrackPieceDirection) & 3;
w->Invalidate();
_windowTrackPlaceLast.SetNull();
window_track_place_draw_mini_preview(_trackDesign.get());
WindowTrackPlaceDrawMiniPreview(_trackDesign.get());
break;
case WIDX_SELECT_DIFFERENT_DESIGN:
window_close(w);
@ -218,7 +218,7 @@ static void window_track_place_mouseup(rct_window* w, rct_widgetindex widgetInde
*
* rct2: 0x006CFCA0
*/
static void window_track_place_update(rct_window* w)
static void WindowTrackPlaceUpdate(rct_window* w)
{
if (!(input_test_flag(INPUT_FLAG_TOOL_ACTIVE)))
if (gCurrentToolWidget.window_classification != WC_TRACK_DESIGN_PLACE)
@ -248,7 +248,7 @@ static GameActions::Result::Ptr FindValidTrackDesignPlaceHeight(CoordsXYZ& loc,
*
* rct2: 0x006CFF2D
*/
static void window_track_place_toolupdate(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowTrackPlaceToolupdate(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
{
int16_t mapZ;
@ -261,7 +261,7 @@ static void window_track_place_toolupdate(rct_window* w, rct_widgetindex widgetI
CoordsXY mapCoords = ViewportInteractionGetTileStartAtCursor(screenCoords);
if (mapCoords.IsNull())
{
window_track_place_clear_provisional();
WindowTrackPlaceClearProvisional();
return;
}
@ -275,12 +275,12 @@ static void window_track_place_toolupdate(rct_window* w, rct_widgetindex widgetI
money32 cost = MONEY32_UNDEFINED;
// Get base Z position
mapZ = window_track_place_get_base_z(mapCoords);
mapZ = WindowTrackPlaceGetBaseZ(mapCoords);
CoordsXYZ trackLoc = { mapCoords, mapZ };
if (game_is_not_paused() || gCheatsBuildInPauseMode)
{
window_track_place_clear_provisional();
WindowTrackPlaceClearProvisional();
auto res = FindValidTrackDesignPlaceHeight(trackLoc, GAME_COMMAND_FLAG_NO_SPEND | GAME_COMMAND_FLAG_GHOST);
if (res->Error == GameActions::Status::Ok)
@ -315,9 +315,9 @@ static void window_track_place_toolupdate(rct_window* w, rct_widgetindex widgetI
*
* rct2: 0x006CFF34
*/
static void window_track_place_tooldown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowTrackPlaceTooldown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
{
window_track_place_clear_provisional();
WindowTrackPlaceClearProvisional();
map_invalidate_map_selection_tiles();
gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE;
gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_CONSTRUCT;
@ -328,7 +328,7 @@ static void window_track_place_tooldown(rct_window* w, rct_widgetindex widgetInd
return;
// Try increasing Z until a feasible placement is found
int16_t mapZ = window_track_place_get_base_z(mapCoords);
int16_t mapZ = WindowTrackPlaceGetBaseZ(mapCoords);
CoordsXYZ trackLoc = { mapCoords, mapZ };
auto res = FindValidTrackDesignPlaceHeight(trackLoc, 0);
@ -382,30 +382,30 @@ static void window_track_place_tooldown(rct_window* w, rct_widgetindex widgetInd
*
* rct2: 0x006D015C
*/
static void window_track_place_toolabort(rct_window* w, rct_widgetindex widgetIndex)
static void WindowTrackPlaceToolabort(rct_window* w, rct_widgetindex widgetIndex)
{
window_track_place_clear_provisional();
WindowTrackPlaceClearProvisional();
}
/**
*
* rct2: 0x006CFF01
*/
static void window_track_place_unknown14(rct_window* w)
static void WindowTrackPlaceUnknown14(rct_window* w)
{
window_track_place_draw_mini_preview(_trackDesign.get());
WindowTrackPlaceDrawMiniPreview(_trackDesign.get());
}
static void window_track_place_invalidate(rct_window* w)
static void WindowTrackPlaceInvalidate(rct_window* w)
{
window_track_place_draw_mini_preview(_trackDesign.get());
WindowTrackPlaceDrawMiniPreview(_trackDesign.get());
}
/**
*
* rct2: 0x006D017F
*/
static void window_track_place_clear_provisional()
static void WindowTrackPlaceClearProvisional()
{
if (_window_track_place_last_was_valid)
{
@ -448,7 +448,7 @@ void TrackPlaceRestoreProvisional()
*
* rct2: 0x006D17C6
*/
static int32_t window_track_place_get_base_z(const CoordsXY& loc)
static int32_t WindowTrackPlaceGetBaseZ(const CoordsXY& loc)
{
auto surfaceElement = map_get_surface_element_at(loc);
if (surfaceElement == nullptr)
@ -477,7 +477,7 @@ static int32_t window_track_place_get_base_z(const CoordsXY& loc)
*
* rct2: 0x006CFD9D
*/
static void window_track_place_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowTrackPlacePaint(rct_window* w, rct_drawpixelinfo* dpi)
{
auto ft = Formatter::Common();
ft.Add<char*>(_trackDesign->name.c_str());
@ -509,9 +509,9 @@ static void window_track_place_paint(rct_window* w, rct_drawpixelinfo* dpi)
*
* rct2: 0x006D1845
*/
static void window_track_place_draw_mini_preview(TrackDesign* td6)
static void WindowTrackPlaceDrawMiniPreview(TrackDesign* td6)
{
window_track_place_clear_mini_preview();
WindowTrackPlaceClearMiniPreview();
// First pass is used to determine the width and height of the image so it can centre it
CoordsXY min = { 0, 0 };
@ -527,16 +527,16 @@ static void window_track_place_draw_mini_preview(TrackDesign* td6)
if (td6->type == RIDE_TYPE_MAZE)
{
window_track_place_draw_mini_preview_maze(td6, pass, origin, min, max);
WindowTrackPlaceDrawMiniPreviewMaze(td6, pass, origin, min, max);
}
else
{
window_track_place_draw_mini_preview_track(td6, pass, origin, min, max);
WindowTrackPlaceDrawMiniPreviewTrack(td6, pass, origin, min, max);
}
}
}
static void window_track_place_draw_mini_preview_track(
static void WindowTrackPlaceDrawMiniPreviewTrack(
TrackDesign* td6, int32_t pass, const CoordsXY& origin, CoordsXY min, CoordsXY max)
{
const uint8_t rotation = (_currentTrackPieceDirection + get_current_rotation()) & 3;
@ -567,10 +567,10 @@ static void window_track_place_draw_mini_preview_track(
}
else
{
auto pixelPosition = draw_mini_preview_get_pixel_position(rotatedAndOffsetTrackBlock);
if (draw_mini_preview_is_pixel_in_bounds(pixelPosition))
auto pixelPosition = DrawMiniPreviewGetPixelPosition(rotatedAndOffsetTrackBlock);
if (DrawMiniPreviewIsPixelInBounds(pixelPosition))
{
uint8_t* pixel = draw_mini_preview_get_pixel_ptr(pixelPosition);
uint8_t* pixel = DrawMiniPreviewGetPixelPtr(pixelPosition);
auto bits = trackBlock->var_08.Rotate(curTrackRotation & 3).GetBaseQuarterOccupied();
@ -626,10 +626,10 @@ static void window_track_place_draw_mini_preview_track(
}
else
{
auto pixelPosition = draw_mini_preview_get_pixel_position(rotatedAndOffsetEntrance);
if (draw_mini_preview_is_pixel_in_bounds(pixelPosition))
auto pixelPosition = DrawMiniPreviewGetPixelPosition(rotatedAndOffsetEntrance);
if (DrawMiniPreviewIsPixelInBounds(pixelPosition))
{
uint8_t* pixel = draw_mini_preview_get_pixel_ptr(pixelPosition);
uint8_t* pixel = DrawMiniPreviewGetPixelPtr(pixelPosition);
uint8_t colour = entrance.isExit ? _PaletteIndexColourExit : _PaletteIndexColourEntrance;
for (int32_t i = 0; i < 4; i++)
{
@ -643,7 +643,7 @@ static void window_track_place_draw_mini_preview_track(
}
}
static void window_track_place_draw_mini_preview_maze(
static void WindowTrackPlaceDrawMiniPreviewMaze(
TrackDesign* td6, int32_t pass, const CoordsXY& origin, CoordsXY min, CoordsXY max)
{
uint8_t rotation = (_currentTrackPieceDirection + get_current_rotation()) & 3;
@ -660,10 +660,10 @@ static void window_track_place_draw_mini_preview_maze(
}
else
{
auto pixelPosition = draw_mini_preview_get_pixel_position(rotatedMazeCoords);
if (draw_mini_preview_is_pixel_in_bounds(pixelPosition))
auto pixelPosition = DrawMiniPreviewGetPixelPosition(rotatedMazeCoords);
if (DrawMiniPreviewIsPixelInBounds(pixelPosition))
{
uint8_t* pixel = draw_mini_preview_get_pixel_ptr(pixelPosition);
uint8_t* pixel = DrawMiniPreviewGetPixelPtr(pixelPosition);
uint8_t colour = _PaletteIndexColourTrack;
@ -685,18 +685,18 @@ static void window_track_place_draw_mini_preview_maze(
}
}
static ScreenCoordsXY draw_mini_preview_get_pixel_position(const CoordsXY& location)
static ScreenCoordsXY DrawMiniPreviewGetPixelPosition(const CoordsXY& location)
{
auto tilePos = TileCoordsXY(location);
return { (80 + (tilePos.y - tilePos.x) * 4), (38 + (tilePos.y + tilePos.x) * 2) };
}
static bool draw_mini_preview_is_pixel_in_bounds(const ScreenCoordsXY& pixel)
static bool DrawMiniPreviewIsPixelInBounds(const ScreenCoordsXY& pixel)
{
return pixel.x >= 0 && pixel.y >= 0 && pixel.x <= 160 && pixel.y <= 75;
}
static uint8_t* draw_mini_preview_get_pixel_ptr(const ScreenCoordsXY& pixel)
static uint8_t* DrawMiniPreviewGetPixelPtr(const ScreenCoordsXY& pixel)
{
return &_window_track_place_mini_preview[pixel.y * TRACK_MINI_PREVIEW_WIDTH + pixel.x];
}

2
src/openrct2-ui/windows/TrackList.cpp
View File

@ -749,7 +749,7 @@ public:
}
};
rct_window* window_track_list_open(const RideSelection item)
rct_window* WindowTrackListOpen(const RideSelection item)
{
window_close_construction_windows();
ScreenCoordsXY screenPos{};

2
src/openrct2-ui/windows/ViewClipping.cpp
View File

@ -398,7 +398,7 @@ private:
}
};
rct_window* window_view_clipping_open()
rct_window* WindowViewClippingOpen()
{
auto* window = window_bring_to_front_by_class(WC_VIEW_CLIPPING);
if (window == nullptr)

4
src/openrct2-ui/windows/Viewport.cpp
View File

@ -80,7 +80,7 @@ public:
if (viewport == nullptr)
{
Close();
window_error_open("Unexpected Error", "Failed to create viewport window.");
WindowErrorOpen("Unexpected Error", "Failed to create viewport window.");
return;
}
@ -214,7 +214,7 @@ public:
}
};
rct_window* window_viewport_open()
rct_window* WindowViewportOpen()
{
int32_t screenWidth = context_get_width();
int32_t screenHeight = context_get_height();

8
src/openrct2-ui/windows/Water.cpp
View File

@ -58,7 +58,7 @@ public:
void OnClose() override
{
// If the tool wasn't changed, turn tool off
if (water_tool_is_active())
if (WaterToolIsActive())
{
tool_cancel();
}
@ -101,7 +101,7 @@ public:
void OnUpdate() override
{
// Close window if another tool is open
if (!water_tool_is_active())
if (!WaterToolIsActive())
{
Close();
}
@ -180,11 +180,11 @@ private:
Formatter ft;
ft.Add<int16_t>(MINIMUM_TOOL_SIZE);
ft.Add<int16_t>(MAXIMUM_TOOL_SIZE);
window_text_input_open(this, WIDX_PREVIEW, STR_SELECTION_SIZE, STR_ENTER_SELECTION_SIZE, ft, STR_NONE, STR_NONE, 3);
WindowTextInputOpen(this, WIDX_PREVIEW, STR_SELECTION_SIZE, STR_ENTER_SELECTION_SIZE, ft, STR_NONE, STR_NONE, 3);
}
};
rct_window* window_water_open()
rct_window* WindowWaterOpen()
{
return WindowFocusOrCreate<WaterWindow>(WC_WATER, ScreenCoordsXY(context_get_width() - WW, 29), WW, WH, 0);
}

224
src/openrct2-ui/windows/Window.h
View File

@ -35,168 +35,168 @@ extern colour_t gWindowScenerySecondaryColour;
extern colour_t gWindowSceneryTertiaryColour;
extern bool gWindowSceneryEyedropperEnabled;
rct_window* window_about_open();
rct_window* WindowAboutOpen();
void WindowCampaignRefreshRides();
rct_window* window_changelog_open(int personality);
rct_window* window_cheats_open();
rct_window* window_clear_scenery_open();
rct_window* custom_currency_window_open();
rct_window* window_debug_paint_open();
rct_window* window_editor_inventions_list_open();
rct_window* window_editor_main_open();
rct_window* window_editor_objective_options_open();
rct_window* window_editor_scenario_options_open();
rct_window* window_footpath_open();
rct_window* WindowChangelogOpen(int personality);
rct_window* WindowCheatsOpen();
rct_window* WindowClearSceneryOpen();
rct_window* CustomCurrencyWindowOpen();
rct_window* WindowDebugPaintOpen();
rct_window* WindowEditorInventionsListOpen();
rct_window* WindowEditorMainOpen();
rct_window* WindowEditorObjectiveOptionsOpen();
rct_window* WindowEditorScenarioOptionsOpen();
rct_window* WindowFootpathOpen();
void WindowFootpathResetSelectedPath();
rct_window* window_guest_open(Peep* peep);
rct_window* window_land_open();
rct_window* window_land_rights_open();
rct_window* window_main_open();
rct_window* window_mapgen_open();
rct_window* window_multiplayer_open();
rct_window* window_news_open();
rct_window* window_news_options_open();
rct_window* window_options_open();
rct_window* window_save_prompt_open();
rct_window* WindowGuestOpen(Peep* peep);
rct_window* WindowLandOpen();
rct_window* WindowLandRightsOpen();
rct_window* WindowMainOpen();
rct_window* WindowMapgenOpen();
rct_window* WindowMultiplayerOpen();
rct_window* WindowNewsOpen();
rct_window* WindowNewsOptionsOpen();
rct_window* WindowOptionsOpen();
rct_window* WindowSavePromptOpen();
#ifndef DISABLE_NETWORK
rct_window* window_server_list_open();
rct_window* window_server_start_open();
rct_window* WindowServerListOpen();
rct_window* WindowServerStartOpen();
#endif
rct_window* window_shortcut_keys_open();
rct_window* window_staff_list_open();
rct_window* window_staff_open(Peep* peep);
rct_window* WindowShortcutKeysOpen();
rct_window* WindowStaffListOpen();
rct_window* WindowStaffOpen(Peep* peep);
void WindowStaffListRefresh();
rct_window* window_themes_open();
rct_window* window_title_exit_open();
rct_window* window_title_logo_open();
rct_window* window_title_menu_open();
rct_window* window_title_options_open();
rct_window* window_viewport_open();
rct_window* window_water_open();
rct_window* window_view_clipping_open();
rct_window* WindowThemesOpen();
rct_window* WindowTitleExitOpen();
rct_window* WindowTitleLogoOpen();
rct_window* WindowTitleMenuOpen();
rct_window* WindowTitleOptionsOpen();
rct_window* WindowViewportOpen();
rct_window* WindowWaterOpen();
rct_window* WindowViewClippingOpen();
// WC_FINANCES
rct_window* window_finances_open();
rct_window* window_finances_research_open();
rct_window* WindowFinancesOpen();
rct_window* WindowFinancesResearchOpen();
// WC_PARK_INFORMATION
rct_window* window_park_awards_open();
rct_window* window_park_entrance_open();
rct_window* window_park_guests_open();
rct_window* window_park_objective_open();
rct_window* window_park_rating_open();
rct_window* WindowParkAwardsOpen();
rct_window* WindowParkEntranceOpen();
rct_window* WindowParkGuestsOpen();
rct_window* WindowParkObjectiveOpen();
rct_window* WindowParkRatingOpen();
rct_window* window_banner_open(rct_windownumber number);
rct_window* window_ride_demolish_prompt_open(Ride* ride);
rct_window* window_ride_refurbish_prompt_open(Ride* ride);
rct_window* window_sign_open(rct_windownumber number);
rct_window* window_sign_small_open(rct_windownumber number);
rct_window* window_player_open(uint8_t id);
rct_window* window_new_campaign_open(int16_t campaignType);
rct_window* WindowBannerOpen(rct_windownumber number);
rct_window* WindowRideDemolishPromptOpen(Ride* ride);
rct_window* WindowRideRefurbishPromptOpen(Ride* ride);
rct_window* WindowSignOpen(rct_windownumber number);
rct_window* WindowSignSmallOpen(rct_windownumber number);
rct_window* WindowPlayerOpen(uint8_t id);
rct_window* WindowNewCampaignOpen(int16_t campaignType);
rct_window* window_install_track_open(const utf8* path);
void window_guest_list_refresh_list();
rct_window* window_guest_list_open();
rct_window* window_guest_list_open_with_filter(GuestListFilterType type, int32_t index);
rct_window* window_staff_fire_prompt_open(Peep* peep);
void window_title_editor_open(int32_t tab);
void window_title_command_editor_open(struct TitleSequence* sequence, int32_t command, bool insert);
rct_window* window_scenarioselect_open(scenarioselect_callback callback, bool titleEditor);
rct_window* window_scenarioselect_open(std::function<void(std::string_view)> callback, bool titleEditor, bool disableLocking);
rct_window* WindowInstallTrackOpen(const utf8* path);
void WindowGuestListRefreshList();
rct_window* WindowGuestListOpen();
rct_window* WindowGuestListOpenWithFilter(GuestListFilterType type, int32_t index);
rct_window* WindowStaffFirePromptOpen(Peep* peep);
void WindowTitleEditorOpen(int32_t tab);
void WindowTitleCommandEditorOpen(struct TitleSequence* sequence, int32_t command, bool insert);
rct_window* WindowScenarioselectOpen(scenarioselect_callback callback, bool titleEditor);
rct_window* WindowScenarioselectOpen(std::function<void(std::string_view)> callback, bool titleEditor, bool disableLocking);
rct_window* window_error_open(rct_string_id title, rct_string_id message, const class Formatter& formatter);
rct_window* window_error_open(std::string_view title, std::string_view message);
rct_window* WindowErrorOpen(rct_string_id title, rct_string_id message, const class Formatter& formatter);
rct_window* WindowErrorOpen(std::string_view title, std::string_view message);
struct TrackDesign;
rct_window* window_loadsave_open(
rct_window* WindowLoadsaveOpen(
int32_t type, std::string_view defaultPath, std::function<void(int32_t result, std::string_view)> callback,
TrackDesign* trackDesign);
rct_window* window_track_place_open(const struct track_design_file_ref* tdFileRef);
rct_window* window_track_manage_open(struct track_design_file_ref* tdFileRef);
rct_window* WindowTrackPlaceOpen(const struct track_design_file_ref* tdFileRef);
rct_window* WindowTrackManageOpen(struct track_design_file_ref* tdFileRef);
void TrackPlaceClearProvisionalTemporarily();
void TrackPlaceRestoreProvisional();
rct_window* window_map_open();
void window_map_reset();
rct_window* WindowMapOpen();
void WindowMapReset();
rct_window* window_research_open();
void window_research_development_page_paint(rct_window* w, rct_drawpixelinfo* dpi, rct_widgetindex baseWidgetIndex);
void window_research_funding_page_paint(rct_window* w, rct_drawpixelinfo* dpi, rct_widgetindex baseWidgetIndex);
rct_window* WindowResearchOpen();
void WindowResearchDevelopmentPagePaint(rct_window* w, rct_drawpixelinfo* dpi, rct_widgetindex baseWidgetIndex);
void WindowResearchFundingPagePaint(rct_window* w, rct_drawpixelinfo* dpi, rct_widgetindex baseWidgetIndex);
rct_window* window_new_ride_open();
rct_window* window_new_ride_open_research();
void window_new_ride_init_vars();
void window_new_ride_focus(RideSelection rideItem);
rct_window* WindowNewRideOpen();
rct_window* WindowNewRideOpenResearch();
void WindowNewRideInitVars();
void WindowNewRideFocus(RideSelection rideItem);
rct_window* window_ride_list_open();
void window_ride_list_refresh_list(rct_window* w);
rct_window* WindowRideListOpen();
void WindowRideListRefreshList(rct_window* w);
rct_window* window_ride_main_open(Ride* ride);
rct_window* window_ride_open_track(TileElement* tileElement);
rct_window* window_ride_open_vehicle(Vehicle* vehicle);
void window_ride_measurements_design_cancel();
rct_window* WindowRideMainOpen(Ride* ride);
rct_window* WindowRideOpenTrack(TileElement* tileElement);
rct_window* WindowRideOpenVehicle(Vehicle* vehicle);
void WindowRideMeasurementsDesignCancel();
// rct2: 0x00F635EE
extern RideSelection _window_track_list_item;
rct_window* window_track_list_open(RideSelection item);
rct_window* WindowTrackListOpen(RideSelection item);
void SetMapTooltip(Formatter& ft);
const Formatter& GetMapTooltip();
void window_map_tooltip_update_visibility();
void WindowMapTooltipUpdateVisibility();
rct_window* window_maze_construction_open();
void window_maze_construction_update_pressed_widgets();
rct_window* WindowMazeConstructionOpen();
void WindowMazeConstructionUpdatePressedWidgets();
rct_window* window_network_status_open(const char* text, close_callback onClose);
rct_window* window_network_status_open_password();
void window_network_status_close();
rct_window* WindowNetworkStatusOpen(const char* text, close_callback onClose);
rct_window* WindowNetworkStatusOpenPassword();
void WindowNetworkStatusClose();
void window_text_input_key(rct_window* w, char keychar);
void window_text_input_open(
void WindowTextInputKey(rct_window* w, char keychar);
void WindowTextInputOpen(
rct_window* call_w, rct_widgetindex call_widget, rct_string_id title, rct_string_id description,
const Formatter& descriptionArgs, rct_string_id existing_text, uintptr_t existing_args, int32_t maxLength);
void window_text_input_raw_open(
void WindowTextInputRawOpen(
rct_window* call_w, rct_widgetindex call_widget, rct_string_id title, rct_string_id description,
const Formatter& descriptionArgs, const_utf8string existing_text, int32_t maxLength);
void window_text_input_open(
void WindowTextInputOpen(
std::string_view title, std::string_view description, std::string_view initialValue, size_t maxLength,
std::function<void(std::string_view)> okCallback, std::function<void()> cancelCallback);
rct_window* window_object_load_error_open(utf8* path, size_t numMissingObjects, const ObjectEntryDescriptor* missingObjects);
rct_window* WindowObjectLoadErrorOpen(utf8* path, size_t numMissingObjects, const ObjectEntryDescriptor* missingObjects);
rct_window* window_ride_construction_open();
void window_ride_construction_update_active_elements_impl();
void window_ride_construction_update_enabled_track_pieces();
rct_window* WindowRideConstructionOpen();
void WindowRideConstructionUpdateActiveElementsImpl();
void WindowRideConstructionUpdateEnabledTrackPieces();
rct_window* window_top_toolbar_open();
bool land_tool_is_active();
bool clear_scenery_tool_is_active();
bool water_tool_is_active();
rct_window* WindowTopToolbarOpen();
bool LandToolIsActive();
bool ClearSceneryToolIsActive();
bool WaterToolIsActive();
rct_window* window_scenery_open();
bool window_scenery_set_selected_item(const ScenerySelection& scenery);
void window_scenery_set_default_placement_configuration();
void window_scenery_init();
void window_scenery_reset_selected_scenery_items();
rct_window* WindowSceneryOpen();
bool WindowScenerySetSelectedItem(const ScenerySelection& scenery);
void WindowScenerySetDefaultPlacementConfiguration();
void WindowSceneryInit();
void WindowSceneryResetSelectedSceneryItems();
extern uint8_t gToolbarDirtyFlags;
rct_window* window_game_bottom_toolbar_open();
void window_game_bottom_toolbar_invalidate_news_item();
rct_window* WindowGameBottomToolbarOpen();
void WindowGameBottomToolbarInvalidateNewsItem();
rct_window* window_editor_bottom_toolbar_open();
rct_window* WindowEditorBottomToolbarOpen();
rct_window* window_tile_inspector_open();
void window_tile_inspector_clear_clipboard();
rct_window* WindowTileInspectorOpen();
void WindowTileInspectorClearClipboard();
rct_window* window_editor_object_selection_open();
rct_window* WindowEditorObjectSelectionOpen();
void window_tooltip_reset(const ScreenCoordsXY& screenCoords);
void window_tooltip_show(const OpenRCT2String& message, ScreenCoordsXY screenCoords);
void window_tooltip_open(rct_window* widgetWindow, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
void window_tooltip_close();
void WindowTooltipReset(const ScreenCoordsXY& screenCoords);
void WindowTooltipShow(const OpenRCT2String& message, ScreenCoordsXY screenCoords);
void WindowTooltipOpen(rct_window* widgetWindow, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
void WindowTooltipClose();
rct_window* window_scenery_scatter_open();
rct_window* WindowSceneryScatterOpen();
// clang-format off
#define WINDOW_SHIM_RAW(TITLE, WIDTH, HEIGHT, CLOSE_STR) \