diff --git a/src/openrct2-ui/input/InputManager.cpp b/src/openrct2-ui/input/InputManager.cpp index 5c4bb40572..9bfe6b471c 100644 --- a/src/openrct2-ui/input/InputManager.cpp +++ b/src/openrct2-ui/input/InputManager.cpp @@ -194,7 +194,7 @@ void InputManager::Process(const InputEvent& e) auto& console = GetInGameConsole(); if (console.IsOpen()) { - if (!shortcutManager.ProcessEventForSpecificShortcut(e, ShortcutId::DebugToggleConsole)) + if (!shortcutManager.ProcessEventForSpecificShortcut(e, ShortcutId::kDebugToggleConsole)) { ProcessInGameConsole(e); } @@ -305,10 +305,10 @@ void InputManager::ProcessHoldEvents() auto& shortcutManager = GetShortcutManager(); if (!shortcutManager.IsPendingShortcutChange()) { - ProcessViewScrollEvent(ShortcutId::ViewScrollUp, { 0, -1 }); - ProcessViewScrollEvent(ShortcutId::ViewScrollDown, { 0, 1 }); - ProcessViewScrollEvent(ShortcutId::ViewScrollLeft, { -1, 0 }); - ProcessViewScrollEvent(ShortcutId::ViewScrollRight, { 1, 0 }); + ProcessViewScrollEvent(ShortcutId::kViewScrollUp, { 0, -1 }); + ProcessViewScrollEvent(ShortcutId::kViewScrollDown, { 0, 1 }); + ProcessViewScrollEvent(ShortcutId::kViewScrollLeft, { -1, 0 }); + ProcessViewScrollEvent(ShortcutId::kViewScrollRight, { 1, 0 }); } } } diff --git a/src/openrct2-ui/input/ShortcutIds.h b/src/openrct2-ui/input/ShortcutIds.h index d7c8bfba03..a8e5dad0a6 100644 --- a/src/openrct2-ui/input/ShortcutIds.h +++ b/src/openrct2-ui/input/ShortcutIds.h @@ -31,97 +31,96 @@ namespace OpenRCT2::Ui::ShortcutId constexpr std::string_view kInterfaceDisableClearance = "interface.misc.disable_clearance"; constexpr std::string_view kInterfaceMultiplayerChat = "interface.misc.multiplayer_chat"; - // Interface / graphics - constexpr std::string_view InterfaceScaleToggleWindowMode = "interface.graphics.toggle_window_mode"; - constexpr std::string_view InterfaceScaleIncrease = "interface.graphics.increase"; - constexpr std::string_view InterfaceScaleDecrease = "interface.graphics.decrease"; + constexpr std::string_view kInterfaceScaleToggleWindowMode = "interface.graphics.toggle_window_mode"; + constexpr std::string_view kInterfaceScaleIncrease = "interface.graphics.increase"; + constexpr std::string_view kInterfaceScaleDecrease = "interface.graphics.decrease"; // Interface / open - constexpr std::string_view InterfaceOpenLand = "interface.open.land"; - constexpr std::string_view InterfaceOpenWater = "interface.open.water"; - constexpr std::string_view InterfaceClearScenery = "interface.open.clear_scenery"; - constexpr std::string_view InterfaceOpenScenery = "interface.open.scenery"; - constexpr std::string_view InterfaceOpenFootpaths = "interface.open.footpaths"; - constexpr std::string_view InterfaceOpenNewRide = "interface.open.new_ride"; - constexpr std::string_view InterfaceOpenFinances = "interface.open.finances"; - constexpr std::string_view InterfaceOpenResearch = "interface.open.research"; - constexpr std::string_view InterfaceOpenRides = "interface.open.rides"; - constexpr std::string_view InterfaceOpenPark = "interface.open.park"; - constexpr std::string_view InterfaceOpenGuests = "interface.open.guests"; - constexpr std::string_view InterfaceOpenStaff = "interface.open.staff"; - constexpr std::string_view InterfaceOpenMessages = "interface.open.messages"; - constexpr std::string_view InterfaceOpenMap = "interface.open.map"; - constexpr std::string_view InterfaceShowOptions = "interface.open.options"; - constexpr std::string_view InterfaceOpenKeyboardShortcuts = "interface.open.keyboard_shortcuts"; - constexpr std::string_view InterfaceOpenTransparencyOptions = "interface.open.transparency_options"; - constexpr std::string_view InterfaceOpenCheats = "interface.open.cheats"; - constexpr std::string_view InterfaceOpenTileInspector = "interface.open.tileinspector"; - constexpr std::string_view InterfaceMultiplayerShow = "interface.open.multiplayer"; + constexpr std::string_view kInterfaceOpenLand = "interface.open.land"; + constexpr std::string_view kInterfaceOpenWater = "interface.open.water"; + constexpr std::string_view kInterfaceClearScenery = "interface.open.clear_scenery"; + constexpr std::string_view kInterfaceOpenScenery = "interface.open.scenery"; + constexpr std::string_view kInterfaceOpenFootpaths = "interface.open.footpaths"; + constexpr std::string_view kInterfaceOpenNewRide = "interface.open.new_ride"; + constexpr std::string_view kInterfaceOpenFinances = "interface.open.finances"; + constexpr std::string_view kInterfaceOpenResearch = "interface.open.research"; + constexpr std::string_view kInterfaceOpenRides = "interface.open.rides"; + constexpr std::string_view kInterfaceOpenPark = "interface.open.park"; + constexpr std::string_view kInterfaceOpenGuests = "interface.open.guests"; + constexpr std::string_view kInterfaceOpenStaff = "interface.open.staff"; + constexpr std::string_view kInterfaceOpenMessages = "interface.open.messages"; + constexpr std::string_view kInterfaceOpenMap = "interface.open.map"; + constexpr std::string_view kInterfaceShowOptions = "interface.open.options"; + constexpr std::string_view kInterfaceOpenKeyboardShortcuts = "interface.open.keyboard_shortcuts"; + constexpr std::string_view kInterfaceOpenTransparencyOptions = "interface.open.transparency_options"; + constexpr std::string_view kInterfaceOpenCheats = "interface.open.cheats"; + constexpr std::string_view kInterfaceOpenTileInspector = "interface.open.tileinspector"; + constexpr std::string_view kInterfaceMultiplayerShow = "interface.open.multiplayer"; // View / general - constexpr std::string_view ViewGeneralZoomOut = "view.general.zoom_out"; - constexpr std::string_view ViewGeneralZoomIn = "view.general.zoom_in"; - constexpr std::string_view ViewGeneralRotateClockwise = "view.general.rotate_clockwise"; - constexpr std::string_view ViewGeneralRotateAnticlockwise = "view.general.rotate_anticlockwise"; + constexpr std::string_view kViewGeneralZoomOut = "view.general.zoom_out"; + constexpr std::string_view kViewGeneralZoomIn = "view.general.zoom_in"; + constexpr std::string_view kViewGeneralRotateClockwise = "view.general.rotate_clockwise"; + constexpr std::string_view kViewGeneralRotateAnticlockwise = "view.general.rotate_anticlockwise"; // View / scroll - constexpr std::string_view ViewScrollUp = "view.scroll.up"; - constexpr std::string_view ViewScrollLeft = "view.scroll.left"; - constexpr std::string_view ViewScrollRight = "view.scroll.right"; - constexpr std::string_view ViewScrollDown = "view.scroll.down"; + constexpr std::string_view kViewScrollUp = "view.scroll.up"; + constexpr std::string_view kViewScrollLeft = "view.scroll.left"; + constexpr std::string_view kViewScrollRight = "view.scroll.right"; + constexpr std::string_view kViewScrollDown = "view.scroll.down"; // View / toggle - constexpr std::string_view ViewToggleUnderground = "view.toggle.show_underground"; - constexpr std::string_view ViewToggleTransparentWater = "view.toggle.transparent_water"; - constexpr std::string_view ViewToggleBaseLand = "view.toggle.hide_base_land"; - constexpr std::string_view ViewToggleVerticalLand = "view.toggle.hide_vertical_land"; - constexpr std::string_view ViewToggleRides = "view.toggle.transparent_rides"; - constexpr std::string_view ViewToggleVehicles = "view.toggle.transparent_vehicles"; - constexpr std::string_view ViewToggleVegetation = "view.toggle.transparent_vegetation"; - constexpr std::string_view ViewToggleScenery = "view.toggle.transparent_scenery"; - constexpr std::string_view ViewToggleFootpaths = "view.toggle.transparent_footpaths"; - constexpr std::string_view ViewToggleSupports = "view.toggle.hide_supports"; - constexpr std::string_view ViewToggleGuests = "view.toggle.hide_guests"; - constexpr std::string_view ViewToggleStaff = "view.toggle.hide_staff"; - constexpr std::string_view ViewToggleLandHeightMarkers = "view.toggle.show_land_height"; - constexpr std::string_view ViewToggleTrackHeightMarkers = "view.toggle.show_track_height"; - constexpr std::string_view ViewToggleFootpathHeightMarkers = "view.toggle.show_footpath_height"; - constexpr std::string_view ViewToggleGridlines = "view.toggle.show_gridlines"; - constexpr std::string_view ViewToggleCutAway = "view.toggle.toggle_cut_away"; - constexpr std::string_view ViewToogleFootpathIssues = "view.toggle.highlight_path_issues"; + constexpr std::string_view kViewToggleUnderground = "view.toggle.show_underground"; + constexpr std::string_view kViewToggleTransparentWater = "view.toggle.transparent_water"; + constexpr std::string_view kViewToggleBaseLand = "view.toggle.hide_base_land"; + constexpr std::string_view kViewToggleVerticalLand = "view.toggle.hide_vertical_land"; + constexpr std::string_view kViewToggleRides = "view.toggle.transparent_rides"; + constexpr std::string_view kViewToggleVehicles = "view.toggle.transparent_vehicles"; + constexpr std::string_view kViewToggleVegetation = "view.toggle.transparent_vegetation"; + constexpr std::string_view kViewToggleScenery = "view.toggle.transparent_scenery"; + constexpr std::string_view kViewToggleFootpaths = "view.toggle.transparent_footpaths"; + constexpr std::string_view kViewToggleSupports = "view.toggle.hide_supports"; + constexpr std::string_view kViewToggleGuests = "view.toggle.hide_guests"; + constexpr std::string_view kViewToggleStaff = "view.toggle.hide_staff"; + constexpr std::string_view kViewToggleLandHeightMarkers = "view.toggle.show_land_height"; + constexpr std::string_view kViewToggleTrackHeightMarkers = "view.toggle.show_track_height"; + constexpr std::string_view kViewToggleFootpathHeightMarkers = "view.toggle.show_footpath_height"; + constexpr std::string_view kViewToggleGridlines = "view.toggle.show_gridlines"; + constexpr std::string_view kViewToggleCutAway = "view.toggle.toggle_cut_away"; + constexpr std::string_view kViewToggleFootpathIssues = "view.toggle.highlight_path_issues"; // Window / ride construction - constexpr std::string_view WindowRideConstructionTurnLeft = "window.rideconstruction.turn_left"; - constexpr std::string_view WindowRideConstructionTurnRight = "window.rideconstruction.turn_right"; - constexpr std::string_view WindowRideConstructionDefault = "window.rideconstruction.default"; - constexpr std::string_view WindowRideConstructionSlopeDown = "window.rideconstruction.slope_down"; - constexpr std::string_view WindowRideConstructionSlopeUp = "window.rideconstruction.slope_up"; - constexpr std::string_view WindowRideConstructionChainLift = "window.rideconstruction.chain_lift"; - constexpr std::string_view WindowRideConstructionBankLeft = "window.rideconstruction.bank_left"; - constexpr std::string_view WindowRideConstructionBankRight = "window.rideconstruction.bank_right"; - constexpr std::string_view WindowRideConstructionPrevious = "window.rideconstruction.previous"; - constexpr std::string_view WindowRideConstructionNext = "window.rideconstruction.next"; - constexpr std::string_view WindowRideConstructionBuild = "window.rideconstruction.build"; - constexpr std::string_view WindowRideConstructionDemolish = "window.rideconstruction.demolish"; + constexpr std::string_view kWindowRideConstructionTurnLeft = "window.rideconstruction.turn_left"; + constexpr std::string_view kWindowRideConstructionTurnRight = "window.rideconstruction.turn_right"; + constexpr std::string_view kWindowRideConstructionDefault = "window.rideconstruction.default"; + constexpr std::string_view kWindowRideConstructionSlopeDown = "window.rideconstruction.slope_down"; + constexpr std::string_view kWindowRideConstructionSlopeUp = "window.rideconstruction.slope_up"; + constexpr std::string_view kWindowRideConstructionChainLift = "window.rideconstruction.chain_lift"; + constexpr std::string_view kWindowRideConstructionBankLeft = "window.rideconstruction.bank_left"; + constexpr std::string_view kWindowRideConstructionBankRight = "window.rideconstruction.bank_right"; + constexpr std::string_view kWindowRideConstructionPrevious = "window.rideconstruction.previous"; + constexpr std::string_view kWindowRideConstructionNext = "window.rideconstruction.next"; + constexpr std::string_view kWindowRideConstructionBuild = "window.rideconstruction.build"; + constexpr std::string_view kWindowRideConstructionDemolish = "window.rideconstruction.demolish"; // Window / tile inspector - constexpr std::string_view WindowTileInspectorToggleInvisibility = "window.tileinspector.toggle_invisibility"; - constexpr std::string_view WindowTileInspectorCopy = "window.tileinspector.copy"; - constexpr std::string_view WindowTileInspectorPaste = "window.tileinspector.paste"; - constexpr std::string_view WindowTileInspectorSort = "window.tileinspector.sort"; - constexpr std::string_view WindowTileInspectorRemove = "window.tileinspector.remove"; - constexpr std::string_view WindowTileInspectorMoveUp = "window.tileinspector.move_up"; - constexpr std::string_view WindowTileInspectorMoveDown = "window.tileinspector.move_down"; - constexpr std::string_view WindowTileInspectorIncreaseX = "window.tileinspector.increase_x"; - constexpr std::string_view WindowTileInspectorDecreaseX = "window.tileinspector.decrease_x"; - constexpr std::string_view WindowTileInspectorIncreaseY = "window.tileinspector.increase_y"; - constexpr std::string_view WindowTileInspectorDecreaseY = "window.tileinspector.decrease_y"; - constexpr std::string_view WindowTileInspectorIncreaseHeight = "window.tileinspector.increase_height"; - constexpr std::string_view WindowTileInspectorDecreaseHeight = "window.tileinspector.decrease_height"; - constexpr std::string_view WindowTileInspectorChangeWallSlope = "window.tileinspector.toggle_wall_slope"; + constexpr std::string_view kWindowTileInspectorToggleInvisibility = "window.tileinspector.toggle_invisibility"; + constexpr std::string_view kWindowTileInspectorCopy = "window.tileinspector.copy"; + constexpr std::string_view kWindowTileInspectorPaste = "window.tileinspector.paste"; + constexpr std::string_view kWindowTileInspectorSort = "window.tileinspector.sort"; + constexpr std::string_view kWindowTileInspectorRemove = "window.tileinspector.remove"; + constexpr std::string_view kWindowTileInspectorMoveUp = "window.tileinspector.move_up"; + constexpr std::string_view kWindowTileInspectorMoveDown = "window.tileinspector.move_down"; + constexpr std::string_view kWindowTileInspectorIncreaseX = "window.tileinspector.increase_x"; + constexpr std::string_view kWindowTileInspectorDecreaseX = "window.tileinspector.decrease_x"; + constexpr std::string_view kWindowTileInspectorIncreaseY = "window.tileinspector.increase_y"; + constexpr std::string_view kWindowTileInspectorDecreaseY = "window.tileinspector.decrease_y"; + constexpr std::string_view kWindowTileInspectorIncreaseHeight = "window.tileinspector.increase_height"; + constexpr std::string_view kWindowTileInspectorDecreaseHeight = "window.tileinspector.decrease_height"; + constexpr std::string_view kWindowTileInspectorChangeWallSlope = "window.tileinspector.toggle_wall_slope"; // Debug - constexpr std::string_view DebugToggleConsole = "debug.console"; - constexpr std::string_view DebugTogglePaintDebugWindow = "debug.toggle_paint_debug_window"; - constexpr std::string_view DebugAdvanceTick = "debug.advance_tick"; + constexpr std::string_view kDebugToggleConsole = "debug.console"; + constexpr std::string_view kDebugTogglePaintDebugWindow = "debug.toggle_paint_debug_window"; + constexpr std::string_view kDebugAdvanceTick = "debug.advance_tick"; } // namespace OpenRCT2::Ui::ShortcutId diff --git a/src/openrct2-ui/input/ShortcutManager.cpp b/src/openrct2-ui/input/ShortcutManager.cpp index d11ca7723c..a24f6853ca 100644 --- a/src/openrct2-ui/input/ShortcutManager.cpp +++ b/src/openrct2-ui/input/ShortcutManager.cpp @@ -360,86 +360,86 @@ std::string_view ShortcutManager::GetLegacyShortcutId(size_t index) ShortcutId::kInterfaceCloseAll, ShortcutId::kInterfaceCancelConstruction, ShortcutId::kInterfacePause, - ShortcutId::ViewGeneralZoomOut, - ShortcutId::ViewGeneralZoomIn, - ShortcutId::ViewGeneralRotateClockwise, - ShortcutId::ViewGeneralRotateAnticlockwise, + ShortcutId::kViewGeneralZoomOut, + ShortcutId::kViewGeneralZoomIn, + ShortcutId::kViewGeneralRotateClockwise, + ShortcutId::kViewGeneralRotateAnticlockwise, ShortcutId::kInterfaceRotateConstruction, - ShortcutId::ViewToggleUnderground, - ShortcutId::ViewToggleBaseLand, - ShortcutId::ViewToggleVerticalLand, - ShortcutId::ViewToggleRides, - ShortcutId::ViewToggleScenery, - ShortcutId::ViewToggleSupports, - ShortcutId::ViewToggleGuests, - ShortcutId::ViewToggleLandHeightMarkers, - ShortcutId::ViewToggleTrackHeightMarkers, - ShortcutId::ViewToggleFootpathHeightMarkers, - ShortcutId::InterfaceOpenLand, - ShortcutId::InterfaceOpenWater, - ShortcutId::InterfaceOpenScenery, - ShortcutId::InterfaceOpenFootpaths, - ShortcutId::InterfaceOpenNewRide, - ShortcutId::InterfaceOpenFinances, - ShortcutId::InterfaceOpenResearch, - ShortcutId::InterfaceOpenRides, - ShortcutId::InterfaceOpenPark, - ShortcutId::InterfaceOpenGuests, - ShortcutId::InterfaceOpenStaff, - ShortcutId::InterfaceOpenMessages, - ShortcutId::InterfaceOpenMap, + ShortcutId::kViewToggleUnderground, + ShortcutId::kViewToggleBaseLand, + ShortcutId::kViewToggleVerticalLand, + ShortcutId::kViewToggleRides, + ShortcutId::kViewToggleScenery, + ShortcutId::kViewToggleSupports, + ShortcutId::kViewToggleGuests, + ShortcutId::kViewToggleLandHeightMarkers, + ShortcutId::kViewToggleTrackHeightMarkers, + ShortcutId::kViewToggleFootpathHeightMarkers, + ShortcutId::kInterfaceOpenLand, + ShortcutId::kInterfaceOpenWater, + ShortcutId::kInterfaceOpenScenery, + ShortcutId::kInterfaceOpenFootpaths, + ShortcutId::kInterfaceOpenNewRide, + ShortcutId::kInterfaceOpenFinances, + ShortcutId::kInterfaceOpenResearch, + ShortcutId::kInterfaceOpenRides, + ShortcutId::kInterfaceOpenPark, + ShortcutId::kInterfaceOpenGuests, + ShortcutId::kInterfaceOpenStaff, + ShortcutId::kInterfaceOpenMessages, + ShortcutId::kInterfaceOpenMap, ShortcutId::kInterfaceScreenshot, ShortcutId::kInterfaceDecreaseSpeed, ShortcutId::kInterfaceIncreaseSpeed, - ShortcutId::InterfaceOpenCheats, + ShortcutId::kInterfaceOpenCheats, ShortcutId::kInterfaceToggleToolbars, - ShortcutId::ViewScrollUp, - ShortcutId::ViewScrollLeft, - ShortcutId::ViewScrollDown, - ShortcutId::ViewScrollRight, + ShortcutId::kViewScrollUp, + ShortcutId::kViewScrollLeft, + ShortcutId::kViewScrollDown, + ShortcutId::kViewScrollRight, ShortcutId::kInterfaceMultiplayerChat, ShortcutId::kInterfaceSaveGame, - ShortcutId::InterfaceShowOptions, + ShortcutId::kInterfaceShowOptions, ShortcutId::kInterfaceMute, - ShortcutId::InterfaceScaleToggleWindowMode, - ShortcutId::InterfaceMultiplayerShow, + ShortcutId::kInterfaceScaleToggleWindowMode, + ShortcutId::kInterfaceMultiplayerShow, std::string_view(), - ShortcutId::DebugTogglePaintDebugWindow, - ShortcutId::ViewToggleFootpaths, - ShortcutId::WindowRideConstructionTurnLeft, - ShortcutId::WindowRideConstructionTurnRight, - ShortcutId::WindowRideConstructionDefault, - ShortcutId::WindowRideConstructionSlopeDown, - ShortcutId::WindowRideConstructionSlopeUp, - ShortcutId::WindowRideConstructionChainLift, - ShortcutId::WindowRideConstructionBankLeft, - ShortcutId::WindowRideConstructionBankRight, - ShortcutId::WindowRideConstructionPrevious, - ShortcutId::WindowRideConstructionNext, - ShortcutId::WindowRideConstructionBuild, - ShortcutId::WindowRideConstructionDemolish, + ShortcutId::kDebugTogglePaintDebugWindow, + ShortcutId::kViewToggleFootpaths, + ShortcutId::kWindowRideConstructionTurnLeft, + ShortcutId::kWindowRideConstructionTurnRight, + ShortcutId::kWindowRideConstructionDefault, + ShortcutId::kWindowRideConstructionSlopeDown, + ShortcutId::kWindowRideConstructionSlopeUp, + ShortcutId::kWindowRideConstructionChainLift, + ShortcutId::kWindowRideConstructionBankLeft, + ShortcutId::kWindowRideConstructionBankRight, + ShortcutId::kWindowRideConstructionPrevious, + ShortcutId::kWindowRideConstructionNext, + ShortcutId::kWindowRideConstructionBuild, + ShortcutId::kWindowRideConstructionDemolish, ShortcutId::kInterfaceLoadGame, - ShortcutId::InterfaceClearScenery, - ShortcutId::ViewToggleGridlines, - ShortcutId::ViewToggleCutAway, - ShortcutId::ViewToogleFootpathIssues, - ShortcutId::InterfaceOpenTileInspector, - ShortcutId::DebugAdvanceTick, + ShortcutId::kInterfaceClearScenery, + ShortcutId::kViewToggleGridlines, + ShortcutId::kViewToggleCutAway, + ShortcutId::kViewToggleFootpathIssues, + ShortcutId::kInterfaceOpenTileInspector, + ShortcutId::kDebugAdvanceTick, ShortcutId::kInterfaceSceneryPicker, - ShortcutId::InterfaceScaleIncrease, - ShortcutId::InterfaceScaleDecrease, - ShortcutId::WindowTileInspectorToggleInvisibility, - ShortcutId::WindowTileInspectorCopy, - ShortcutId::WindowTileInspectorPaste, - ShortcutId::WindowTileInspectorRemove, - ShortcutId::WindowTileInspectorMoveUp, - ShortcutId::WindowTileInspectorMoveDown, - ShortcutId::WindowTileInspectorIncreaseX, - ShortcutId::WindowTileInspectorDecreaseX, - ShortcutId::WindowTileInspectorIncreaseY, - ShortcutId::WindowTileInspectorDecreaseY, - ShortcutId::WindowTileInspectorIncreaseHeight, - ShortcutId::WindowTileInspectorDecreaseHeight, + ShortcutId::kInterfaceScaleIncrease, + ShortcutId::kInterfaceScaleDecrease, + ShortcutId::kWindowTileInspectorToggleInvisibility, + ShortcutId::kWindowTileInspectorCopy, + ShortcutId::kWindowTileInspectorPaste, + ShortcutId::kWindowTileInspectorRemove, + ShortcutId::kWindowTileInspectorMoveUp, + ShortcutId::kWindowTileInspectorMoveDown, + ShortcutId::kWindowTileInspectorIncreaseX, + ShortcutId::kWindowTileInspectorDecreaseX, + ShortcutId::kWindowTileInspectorIncreaseY, + ShortcutId::kWindowTileInspectorDecreaseY, + ShortcutId::kWindowTileInspectorIncreaseHeight, + ShortcutId::kWindowTileInspectorDecreaseHeight, ShortcutId::kInterfaceDisableClearance, }; return index < std::size(_legacyMap) ? _legacyMap[index] : std::string_view(); diff --git a/src/openrct2-ui/input/Shortcuts.cpp b/src/openrct2-ui/input/Shortcuts.cpp index f864305897..10a1dad985 100644 --- a/src/openrct2-ui/input/Shortcuts.cpp +++ b/src/openrct2-ui/input/Shortcuts.cpp @@ -777,34 +777,34 @@ void ShortcutManager::RegisterDefaultShortcuts() ChatToggle(); } }); - RegisterShortcut(ShortcutId::InterfaceScaleToggleWindowMode, STR_SHORTCUT_WINDOWED_MODE_TOGGLE, "ALT+RETURN", ToggleWindowedMode); - RegisterShortcut(ShortcutId::InterfaceScaleIncrease, STR_SHORTCUT_SCALE_UP, ShortcutScaleUp); - RegisterShortcut(ShortcutId::InterfaceScaleDecrease, STR_SHORTCUT_SCALE_DOWN, ShortcutScaleDown); - RegisterShortcut(ShortcutId::InterfaceOpenLand, STR_SHORTCUT_ADJUST_LAND, "F1", ShortcutAdjustLand); - RegisterShortcut(ShortcutId::InterfaceOpenWater, STR_SHORTCUT_ADJUST_WATER, "F2", ShortcutAdjustWater); - RegisterShortcut(ShortcutId::InterfaceClearScenery, STR_SHORTCUT_CLEAR_SCENERY, "B", ShortcutClearScenery); - RegisterShortcut(ShortcutId::InterfaceOpenScenery, STR_SHORTCUT_BUILD_SCENERY, "F3", ShortcutBuildScenery); - RegisterShortcut(ShortcutId::InterfaceOpenFootpaths, STR_SHORTCUT_BUILD_PATHS, "F4", ShortcutBuildPaths); - RegisterShortcut(ShortcutId::InterfaceOpenNewRide, STR_SHORTCUT_BUILD_NEW_RIDE, "F5", ShortcutBuildNewRide); - RegisterShortcut(ShortcutId::InterfaceOpenFinances, STR_SHORTCUT_SHOW_FINANCIAL_INFORMATION, "F", ShortcutShowFinancialInformation); - RegisterShortcut(ShortcutId::InterfaceOpenResearch, STR_SHORTCUT_SHOW_RESEARCH_INFORMATION, "D", ShortcutShowResearchInformation); - RegisterShortcut(ShortcutId::InterfaceOpenRides, STR_SHORTCUT_SHOW_RIDES_LIST, "R", ShortcutShowRidesList); - RegisterShortcut(ShortcutId::InterfaceOpenPark, STR_SHORTCUT_SHOW_PARK_INFORMATION, "P", ShortcutShowParkInformation); - RegisterShortcut(ShortcutId::InterfaceOpenGuests, STR_SHORTCUT_SHOW_GUEST_LIST, "G", ShortcutShowGuestList); - RegisterShortcut(ShortcutId::InterfaceOpenStaff, STR_SHORTCUT_SHOW_STAFF_LIST, "S", ShortcutShowStaffList); - RegisterShortcut(ShortcutId::InterfaceOpenMessages, STR_SHORTCUT_SHOW_RECENT_MESSAGES, "M", ShortcutShowRecentMessages); - RegisterShortcut(ShortcutId::InterfaceOpenMap, STR_SHORTCUT_SHOW_MAP, "TAB", ShortcutShowMap); - RegisterShortcut(ShortcutId::InterfaceShowOptions, STR_SHORTCUT_SHOW_OPTIONS, std::bind(ContextOpenWindow, WindowClass::Options)); - RegisterShortcut(ShortcutId::InterfaceOpenKeyboardShortcuts, STR_SHORTCUT_OPEN_KEYBOARD_SHORTCUTS_WINDOW, "SHIFT+/", ShortcutOpenKeyboardShortcutsWindow); - RegisterShortcut(ShortcutId::InterfaceOpenTransparencyOptions, STR_SHORTCUT_OPEN_TRANSPARENCY_OPTIONS, "CTRL+T", ShortcutOpenTransparencyWindow); - RegisterShortcut(ShortcutId::InterfaceOpenCheats, STR_SHORTCUT_OPEN_CHEATS_WINDOW, "CTRL+ALT+C", ShortcutOpenCheatWindow); - RegisterShortcut(ShortcutId::InterfaceOpenTileInspector, STR_SHORTCUT_OPEN_TILE_INSPECTOR, []() { + RegisterShortcut(ShortcutId::kInterfaceScaleToggleWindowMode, STR_SHORTCUT_WINDOWED_MODE_TOGGLE, "ALT+RETURN", ToggleWindowedMode); + RegisterShortcut(ShortcutId::kInterfaceScaleIncrease, STR_SHORTCUT_SCALE_UP, ShortcutScaleUp); + RegisterShortcut(ShortcutId::kInterfaceScaleDecrease, STR_SHORTCUT_SCALE_DOWN, ShortcutScaleDown); + RegisterShortcut(ShortcutId::kInterfaceOpenLand, STR_SHORTCUT_ADJUST_LAND, "F1", ShortcutAdjustLand); + RegisterShortcut(ShortcutId::kInterfaceOpenWater, STR_SHORTCUT_ADJUST_WATER, "F2", ShortcutAdjustWater); + RegisterShortcut(ShortcutId::kInterfaceClearScenery, STR_SHORTCUT_CLEAR_SCENERY, "B", ShortcutClearScenery); + RegisterShortcut(ShortcutId::kInterfaceOpenScenery, STR_SHORTCUT_BUILD_SCENERY, "F3", ShortcutBuildScenery); + RegisterShortcut(ShortcutId::kInterfaceOpenFootpaths, STR_SHORTCUT_BUILD_PATHS, "F4", ShortcutBuildPaths); + RegisterShortcut(ShortcutId::kInterfaceOpenNewRide, STR_SHORTCUT_BUILD_NEW_RIDE, "F5", ShortcutBuildNewRide); + RegisterShortcut(ShortcutId::kInterfaceOpenFinances, STR_SHORTCUT_SHOW_FINANCIAL_INFORMATION, "F", ShortcutShowFinancialInformation); + RegisterShortcut(ShortcutId::kInterfaceOpenResearch, STR_SHORTCUT_SHOW_RESEARCH_INFORMATION, "D", ShortcutShowResearchInformation); + RegisterShortcut(ShortcutId::kInterfaceOpenRides, STR_SHORTCUT_SHOW_RIDES_LIST, "R", ShortcutShowRidesList); + RegisterShortcut(ShortcutId::kInterfaceOpenPark, STR_SHORTCUT_SHOW_PARK_INFORMATION, "P", ShortcutShowParkInformation); + RegisterShortcut(ShortcutId::kInterfaceOpenGuests, STR_SHORTCUT_SHOW_GUEST_LIST, "G", ShortcutShowGuestList); + RegisterShortcut(ShortcutId::kInterfaceOpenStaff, STR_SHORTCUT_SHOW_STAFF_LIST, "S", ShortcutShowStaffList); + RegisterShortcut(ShortcutId::kInterfaceOpenMessages, STR_SHORTCUT_SHOW_RECENT_MESSAGES, "M", ShortcutShowRecentMessages); + RegisterShortcut(ShortcutId::kInterfaceOpenMap, STR_SHORTCUT_SHOW_MAP, "TAB", ShortcutShowMap); + RegisterShortcut(ShortcutId::kInterfaceShowOptions, STR_SHORTCUT_SHOW_OPTIONS, std::bind(ContextOpenWindow, WindowClass::Options)); + RegisterShortcut(ShortcutId::kInterfaceOpenKeyboardShortcuts, STR_SHORTCUT_OPEN_KEYBOARD_SHORTCUTS_WINDOW, "SHIFT+/", ShortcutOpenKeyboardShortcutsWindow); + RegisterShortcut(ShortcutId::kInterfaceOpenTransparencyOptions, STR_SHORTCUT_OPEN_TRANSPARENCY_OPTIONS, "CTRL+T", ShortcutOpenTransparencyWindow); + RegisterShortcut(ShortcutId::kInterfaceOpenCheats, STR_SHORTCUT_OPEN_CHEATS_WINDOW, "CTRL+ALT+C", ShortcutOpenCheatWindow); + RegisterShortcut(ShortcutId::kInterfaceOpenTileInspector, STR_SHORTCUT_OPEN_TILE_INSPECTOR, []() { if (Config::Get().interface.ToolbarShowCheats) { OpenWindow(WindowClass::TileInspector); } }); - RegisterShortcut(ShortcutId::InterfaceMultiplayerShow, STR_SHORTCUT_SHOW_MULTIPLAYER, []() { + RegisterShortcut(ShortcutId::kInterfaceMultiplayerShow, STR_SHORTCUT_SHOW_MULTIPLAYER, []() { if (NetworkGetMode() != NETWORK_MODE_NONE) { OpenWindow(WindowClass::Multiplayer); @@ -812,70 +812,70 @@ void ShortcutManager::RegisterDefaultShortcuts() }); // View - RegisterShortcut(ShortcutId::ViewGeneralZoomOut, STR_SHORTCUT_ZOOM_VIEW_OUT, "PAGEUP", std::bind(MainWindowZoom, false, false)); - RegisterShortcut(ShortcutId::ViewGeneralZoomIn, STR_SHORTCUT_ZOOM_VIEW_IN, "PAGEDOWN", std::bind(MainWindowZoom, true, false)); - RegisterShortcut(ShortcutId::ViewGeneralRotateClockwise, STR_SHORTCUT_ROTATE_VIEW_CLOCKWISE, "RETURN", "MOUSE 6", std::bind(RotateCamera, 1)); - RegisterShortcut(ShortcutId::ViewGeneralRotateAnticlockwise, STR_SHORTCUT_ROTATE_VIEW_ANTICLOCKWISE, "SHIFT+RETURN", "MOUSE 5", std::bind(RotateCamera, -1)); - RegisterShortcut(ShortcutId::ViewScrollUp, STR_SHORTCUT_SCROLL_MAP_UP, "UP", []() {}); - RegisterShortcut(ShortcutId::ViewScrollLeft, STR_SHORTCUT_SCROLL_MAP_LEFT, "LEFT", []() {}); - RegisterShortcut(ShortcutId::ViewScrollRight, STR_SHORTCUT_SCROLL_MAP_RIGHT, "RIGHT", []() {}); - RegisterShortcut(ShortcutId::ViewScrollDown, STR_SHORTCUT_SCROLL_MAP_DOWN, "DOWN", []() {}); - RegisterShortcut(ShortcutId::ViewToggleUnderground, STR_SHORTCUT_UNDERGROUND_VIEW_TOGGLE, "1", std::bind(ToggleViewFlag, VIEWPORT_FLAG_UNDERGROUND_INSIDE)); - RegisterShortcut(ShortcutId::ViewToggleTransparentWater, STR_VIEWPORT_TRANSPARENT_WATER, "2", ShortcutToggleTransparentWater); - RegisterShortcut(ShortcutId::ViewToggleBaseLand, STR_SHORTCUT_REMOVE_BASE_LAND_TOGGLE, "H", std::bind(ToggleViewFlag, VIEWPORT_FLAG_HIDE_BASE)); - RegisterShortcut(ShortcutId::ViewToggleVerticalLand, STR_SHORTCUT_REMOVE_VERTICAL_LAND_TOGGLE, "V", std::bind(ToggleViewFlag, VIEWPORT_FLAG_HIDE_VERTICAL)); - RegisterShortcut(ShortcutId::ViewToggleRides, STR_SHORTCUT_SEE_THROUGH_RIDES_TOGGLE, "3", std::bind(ToggleViewFlag, VIEWPORT_FLAG_HIDE_RIDES)); - RegisterShortcut(ShortcutId::ViewToggleVehicles, STR_SHORTCUT_SEE_THROUGH_VEHICLES_TOGGLE, std::bind(ToggleViewFlag, VIEWPORT_FLAG_HIDE_VEHICLES)); - RegisterShortcut(ShortcutId::ViewToggleVegetation, STR_SHORTCUT_SEE_THROUGH_VEGETATION_TOGGLE, std::bind(ToggleViewFlag, VIEWPORT_FLAG_HIDE_VEGETATION)); - RegisterShortcut(ShortcutId::ViewToggleScenery, STR_SHORTCUT_SEE_THROUGH_SCENERY_TOGGLE, "4", std::bind(ToggleViewFlag, VIEWPORT_FLAG_HIDE_SCENERY)); - RegisterShortcut(ShortcutId::ViewToggleFootpaths, STR_SHORTCUT_SEE_THROUGH_PATHS_TOGGLE, std::bind(ToggleViewFlag, VIEWPORT_FLAG_HIDE_PATHS)); - RegisterShortcut(ShortcutId::ViewToggleSupports, STR_SHORTCUT_INVISIBLE_SUPPORTS_TOGGLE, "5", std::bind(ToggleViewFlag, VIEWPORT_FLAG_HIDE_SUPPORTS)); - RegisterShortcut(ShortcutId::ViewToggleGuests, STR_SHORTCUT_SEE_THROUGH_GUESTS_TOGGLE, "6", std::bind(ToggleViewFlag, VIEWPORT_FLAG_HIDE_GUESTS)); - RegisterShortcut(ShortcutId::ViewToggleStaff, STR_SHORTCUT_SEE_THROUGH_STAFF_TOGGLE, std::bind(ToggleViewFlag, VIEWPORT_FLAG_HIDE_STAFF)); - RegisterShortcut(ShortcutId::ViewToggleLandHeightMarkers, STR_SHORTCUT_HEIGHT_MARKS_ON_LAND_TOGGLE, "8", std::bind(ToggleViewFlag, VIEWPORT_FLAG_LAND_HEIGHTS)); - RegisterShortcut(ShortcutId::ViewToggleTrackHeightMarkers, STR_SHORTCUT_HEIGHT_MARKS_ON_RIDE_TRACKS_TOGGLE, "9", std::bind(ToggleViewFlag, VIEWPORT_FLAG_TRACK_HEIGHTS)); - RegisterShortcut(ShortcutId::ViewToggleFootpathHeightMarkers, STR_SHORTCUT_HEIGHT_MARKS_ON_PATHS_TOGGLE, "0", std::bind(ToggleViewFlag, VIEWPORT_FLAG_PATH_HEIGHTS)); - RegisterShortcut(ShortcutId::ViewToggleGridlines, STR_SHORTCUT_GRIDLINES_DISPLAY_TOGGLE, "7", std::bind(ToggleViewFlag, VIEWPORT_FLAG_GRIDLINES)); - RegisterShortcut(ShortcutId::ViewToggleCutAway, STR_SHORTCUT_VIEW_CLIPPING, std::bind(OpenWindow, WindowClass::ViewClipping)); - RegisterShortcut(ShortcutId::ViewToogleFootpathIssues, STR_SHORTCUT_HIGHLIGHT_PATH_ISSUES_TOGGLE, "I", std::bind(ToggleViewFlag, VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES)); + RegisterShortcut(ShortcutId::kViewGeneralZoomOut, STR_SHORTCUT_ZOOM_VIEW_OUT, "PAGEUP", std::bind(MainWindowZoom, false, false)); + RegisterShortcut(ShortcutId::kViewGeneralZoomIn, STR_SHORTCUT_ZOOM_VIEW_IN, "PAGEDOWN", std::bind(MainWindowZoom, true, false)); + RegisterShortcut(ShortcutId::kViewGeneralRotateClockwise, STR_SHORTCUT_ROTATE_VIEW_CLOCKWISE, "RETURN", "MOUSE 6", std::bind(RotateCamera, 1)); + RegisterShortcut(ShortcutId::kViewGeneralRotateAnticlockwise, STR_SHORTCUT_ROTATE_VIEW_ANTICLOCKWISE, "SHIFT+RETURN", "MOUSE 5", std::bind(RotateCamera, -1)); + RegisterShortcut(ShortcutId::kViewScrollUp, STR_SHORTCUT_SCROLL_MAP_UP, "UP", []() {}); + RegisterShortcut(ShortcutId::kViewScrollLeft, STR_SHORTCUT_SCROLL_MAP_LEFT, "LEFT", []() {}); + RegisterShortcut(ShortcutId::kViewScrollRight, STR_SHORTCUT_SCROLL_MAP_RIGHT, "RIGHT", []() {}); + RegisterShortcut(ShortcutId::kViewScrollDown, STR_SHORTCUT_SCROLL_MAP_DOWN, "DOWN", []() {}); + RegisterShortcut(ShortcutId::kViewToggleUnderground, STR_SHORTCUT_UNDERGROUND_VIEW_TOGGLE, "1", std::bind(ToggleViewFlag, VIEWPORT_FLAG_UNDERGROUND_INSIDE)); + RegisterShortcut(ShortcutId::kViewToggleTransparentWater, STR_VIEWPORT_TRANSPARENT_WATER, "2", ShortcutToggleTransparentWater); + RegisterShortcut(ShortcutId::kViewToggleBaseLand, STR_SHORTCUT_REMOVE_BASE_LAND_TOGGLE, "H", std::bind(ToggleViewFlag, VIEWPORT_FLAG_HIDE_BASE)); + RegisterShortcut(ShortcutId::kViewToggleVerticalLand, STR_SHORTCUT_REMOVE_VERTICAL_LAND_TOGGLE, "V", std::bind(ToggleViewFlag, VIEWPORT_FLAG_HIDE_VERTICAL)); + RegisterShortcut(ShortcutId::kViewToggleRides, STR_SHORTCUT_SEE_THROUGH_RIDES_TOGGLE, "3", std::bind(ToggleViewFlag, VIEWPORT_FLAG_HIDE_RIDES)); + RegisterShortcut(ShortcutId::kViewToggleVehicles, STR_SHORTCUT_SEE_THROUGH_VEHICLES_TOGGLE, std::bind(ToggleViewFlag, VIEWPORT_FLAG_HIDE_VEHICLES)); + RegisterShortcut(ShortcutId::kViewToggleVegetation, STR_SHORTCUT_SEE_THROUGH_VEGETATION_TOGGLE, std::bind(ToggleViewFlag, VIEWPORT_FLAG_HIDE_VEGETATION)); + RegisterShortcut(ShortcutId::kViewToggleScenery, STR_SHORTCUT_SEE_THROUGH_SCENERY_TOGGLE, "4", std::bind(ToggleViewFlag, VIEWPORT_FLAG_HIDE_SCENERY)); + RegisterShortcut(ShortcutId::kViewToggleFootpaths, STR_SHORTCUT_SEE_THROUGH_PATHS_TOGGLE, std::bind(ToggleViewFlag, VIEWPORT_FLAG_HIDE_PATHS)); + RegisterShortcut(ShortcutId::kViewToggleSupports, STR_SHORTCUT_INVISIBLE_SUPPORTS_TOGGLE, "5", std::bind(ToggleViewFlag, VIEWPORT_FLAG_HIDE_SUPPORTS)); + RegisterShortcut(ShortcutId::kViewToggleGuests, STR_SHORTCUT_SEE_THROUGH_GUESTS_TOGGLE, "6", std::bind(ToggleViewFlag, VIEWPORT_FLAG_HIDE_GUESTS)); + RegisterShortcut(ShortcutId::kViewToggleStaff, STR_SHORTCUT_SEE_THROUGH_STAFF_TOGGLE, std::bind(ToggleViewFlag, VIEWPORT_FLAG_HIDE_STAFF)); + RegisterShortcut(ShortcutId::kViewToggleLandHeightMarkers, STR_SHORTCUT_HEIGHT_MARKS_ON_LAND_TOGGLE, "8", std::bind(ToggleViewFlag, VIEWPORT_FLAG_LAND_HEIGHTS)); + RegisterShortcut(ShortcutId::kViewToggleTrackHeightMarkers, STR_SHORTCUT_HEIGHT_MARKS_ON_RIDE_TRACKS_TOGGLE, "9", std::bind(ToggleViewFlag, VIEWPORT_FLAG_TRACK_HEIGHTS)); + RegisterShortcut(ShortcutId::kViewToggleFootpathHeightMarkers, STR_SHORTCUT_HEIGHT_MARKS_ON_PATHS_TOGGLE, "0", std::bind(ToggleViewFlag, VIEWPORT_FLAG_PATH_HEIGHTS)); + RegisterShortcut(ShortcutId::kViewToggleGridlines, STR_SHORTCUT_GRIDLINES_DISPLAY_TOGGLE, "7", std::bind(ToggleViewFlag, VIEWPORT_FLAG_GRIDLINES)); + RegisterShortcut(ShortcutId::kViewToggleCutAway, STR_SHORTCUT_VIEW_CLIPPING, std::bind(OpenWindow, WindowClass::ViewClipping)); + RegisterShortcut(ShortcutId::kViewToggleFootpathIssues, STR_SHORTCUT_HIGHLIGHT_PATH_ISSUES_TOGGLE, "I", std::bind(ToggleViewFlag, VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES)); // Window - RegisterShortcut(ShortcutId::WindowRideConstructionTurnLeft, STR_SHORTCUT_CONSTRUCTION_TURN_LEFT, "NUMPAD 4", ShortcutConstructionTurnLeft); - RegisterShortcut(ShortcutId::WindowRideConstructionTurnRight, STR_SHORTCUT_CONSTRUCTION_TURN_RIGHT, "NUMPAD 6", ShortcutConstructionTurnRight); - RegisterShortcut(ShortcutId::WindowRideConstructionDefault, STR_SHORTCUT_CONSTRUCTION_USE_TRACK_DEFAULT, "NUMPAD 5", WindowRideConstructionKeyboardShortcutUseTrackDefault); - RegisterShortcut(ShortcutId::WindowRideConstructionSlopeDown, STR_SHORTCUT_CONSTRUCTION_SLOPE_DOWN, "NUMPAD 2", ShortcutConstructionSlopeDown); - RegisterShortcut(ShortcutId::WindowRideConstructionSlopeUp, STR_SHORTCUT_CONSTRUCTION_SLOPE_UP, "NUMPAD 8", ShortcutConstructionSlopeUp); - RegisterShortcut(ShortcutId::WindowRideConstructionChainLift, STR_SHORTCUT_CONSTRUCTION_CHAIN_LIFT_TOGGLE, "NUMPAD +", WindowRideConstructionKeyboardShortcutChainLiftToggle); - RegisterShortcut(ShortcutId::WindowRideConstructionBankLeft, STR_SHORTCUT_CONSTRUCTION_BANK_LEFT, "NUMPAD 1", WindowRideConstructionKeyboardShortcutBankLeft); - RegisterShortcut(ShortcutId::WindowRideConstructionBankRight, STR_SHORTCUT_CONSTRUCTION_BANK_RIGHT, "NUMPAD 3", WindowRideConstructionKeyboardShortcutBankRight); - RegisterShortcut(ShortcutId::WindowRideConstructionPrevious, STR_SHORTCUT_CONSTRUCTION_PREVIOUS_TRACK, "NUMPAD 7", WindowRideConstructionKeyboardShortcutPreviousTrack); - RegisterShortcut(ShortcutId::WindowRideConstructionNext, STR_SHORTCUT_CONSTRUCTION_NEXT_TRACK, "NUMPAD 9", WindowRideConstructionKeyboardShortcutNextTrack); - RegisterShortcut(ShortcutId::WindowRideConstructionBuild, STR_SHORTCUT_CONSTRUCTION_BUILD_CURRENT, "NUMPAD 0", ShortcutConstructionBuildCurrent); - RegisterShortcut(ShortcutId::WindowRideConstructionDemolish, STR_SHORTCUT_CONSTRUCTION_DEMOLISH_CURRENT, "NUMPAD -", ShortcutConstructionDemolishCurrent); - RegisterShortcut(ShortcutId::WindowTileInspectorToggleInvisibility, STR_SHORTCUT_TOGGLE_INVISIBILITY, WindowTileInspectorKeyboardShortcutToggleInvisibility); - RegisterShortcut(ShortcutId::WindowTileInspectorCopy, STR_SHORTCUT_COPY_ELEMENT, std::bind(TileInspectorMouseUp, WC_TILE_INSPECTOR__WIDX_BUTTON_COPY)); - RegisterShortcut(ShortcutId::WindowTileInspectorPaste, STR_SHORTCUT_PASTE_ELEMENT, std::bind(TileInspectorMouseUp, WC_TILE_INSPECTOR__WIDX_BUTTON_PASTE)); - RegisterShortcut(ShortcutId::WindowTileInspectorSort, STR_SHORTCUT_SORT_ELEMENTS, std::bind(TileInspectorMouseUp, WC_TILE_INSPECTOR__WIDX_BUTTON_SORT)); - RegisterShortcut(ShortcutId::WindowTileInspectorRemove, STR_SHORTCUT_REMOVE_ELEMENT, std::bind(TileInspectorMouseUp, WC_TILE_INSPECTOR__WIDX_BUTTON_REMOVE)); - RegisterShortcut(ShortcutId::WindowTileInspectorMoveUp, STR_SHORTCUT_MOVE_ELEMENT_UP, std::bind(TileInspectorMouseUp, WC_TILE_INSPECTOR__WIDX_BUTTON_MOVE_UP)); - RegisterShortcut(ShortcutId::WindowTileInspectorMoveDown, STR_SHORTCUT_MOVE_ELEMENT_DOWN, std::bind(TileInspectorMouseUp, WC_TILE_INSPECTOR__WIDX_BUTTON_MOVE_DOWN)); - RegisterShortcut(ShortcutId::WindowTileInspectorIncreaseX, STR_SHORTCUT_INCREASE_X_COORD, std::bind(TileInspectorMouseDown, WC_TILE_INSPECTOR__WIDX_SPINNER_X_INCREASE)); - RegisterShortcut(ShortcutId::WindowTileInspectorDecreaseX, STR_SHORTCUT_DECREASE_X_COORD, std::bind(TileInspectorMouseDown, WC_TILE_INSPECTOR__WIDX_SPINNER_X_DECREASE)); - RegisterShortcut(ShortcutId::WindowTileInspectorIncreaseY, STR_SHORTCUT_INCREASE_Y_COORD, std::bind(TileInspectorMouseDown, WC_TILE_INSPECTOR__WIDX_SPINNER_Y_INCREASE)); - RegisterShortcut(ShortcutId::WindowTileInspectorDecreaseY, STR_SHORTCUT_DECREASE_Y_COORD, std::bind(TileInspectorMouseDown, WC_TILE_INSPECTOR__WIDX_SPINNER_Y_DECREASE)); - RegisterShortcut(ShortcutId::WindowTileInspectorIncreaseHeight, STR_SHORTCUT_INCREASE_ELEM_HEIGHT, ShortcutIncreaseElementHeight); - RegisterShortcut(ShortcutId::WindowTileInspectorDecreaseHeight, STR_SHORTCUT_DECREASE_ELEM_HEIGHT, ShortcutDecreaseElementHeight); - RegisterShortcut(ShortcutId::WindowTileInspectorChangeWallSlope, STR_SHORTCUT_TOGGLE_WALL_SLOPE, ShortcutToggleWallSlope); + RegisterShortcut(ShortcutId::kWindowRideConstructionTurnLeft, STR_SHORTCUT_CONSTRUCTION_TURN_LEFT, "NUMPAD 4", ShortcutConstructionTurnLeft); + RegisterShortcut(ShortcutId::kWindowRideConstructionTurnRight, STR_SHORTCUT_CONSTRUCTION_TURN_RIGHT, "NUMPAD 6", ShortcutConstructionTurnRight); + RegisterShortcut(ShortcutId::kWindowRideConstructionDefault, STR_SHORTCUT_CONSTRUCTION_USE_TRACK_DEFAULT, "NUMPAD 5", WindowRideConstructionKeyboardShortcutUseTrackDefault); + RegisterShortcut(ShortcutId::kWindowRideConstructionSlopeDown, STR_SHORTCUT_CONSTRUCTION_SLOPE_DOWN, "NUMPAD 2", ShortcutConstructionSlopeDown); + RegisterShortcut(ShortcutId::kWindowRideConstructionSlopeUp, STR_SHORTCUT_CONSTRUCTION_SLOPE_UP, "NUMPAD 8", ShortcutConstructionSlopeUp); + RegisterShortcut(ShortcutId::kWindowRideConstructionChainLift, STR_SHORTCUT_CONSTRUCTION_CHAIN_LIFT_TOGGLE, "NUMPAD +", WindowRideConstructionKeyboardShortcutChainLiftToggle); + RegisterShortcut(ShortcutId::kWindowRideConstructionBankLeft, STR_SHORTCUT_CONSTRUCTION_BANK_LEFT, "NUMPAD 1", WindowRideConstructionKeyboardShortcutBankLeft); + RegisterShortcut(ShortcutId::kWindowRideConstructionBankRight, STR_SHORTCUT_CONSTRUCTION_BANK_RIGHT, "NUMPAD 3", WindowRideConstructionKeyboardShortcutBankRight); + RegisterShortcut(ShortcutId::kWindowRideConstructionPrevious, STR_SHORTCUT_CONSTRUCTION_PREVIOUS_TRACK, "NUMPAD 7", WindowRideConstructionKeyboardShortcutPreviousTrack); + RegisterShortcut(ShortcutId::kWindowRideConstructionNext, STR_SHORTCUT_CONSTRUCTION_NEXT_TRACK, "NUMPAD 9", WindowRideConstructionKeyboardShortcutNextTrack); + RegisterShortcut(ShortcutId::kWindowRideConstructionBuild, STR_SHORTCUT_CONSTRUCTION_BUILD_CURRENT, "NUMPAD 0", ShortcutConstructionBuildCurrent); + RegisterShortcut(ShortcutId::kWindowRideConstructionDemolish, STR_SHORTCUT_CONSTRUCTION_DEMOLISH_CURRENT, "NUMPAD -", ShortcutConstructionDemolishCurrent); + RegisterShortcut(ShortcutId::kWindowTileInspectorToggleInvisibility, STR_SHORTCUT_TOGGLE_INVISIBILITY, WindowTileInspectorKeyboardShortcutToggleInvisibility); + RegisterShortcut(ShortcutId::kWindowTileInspectorCopy, STR_SHORTCUT_COPY_ELEMENT, std::bind(TileInspectorMouseUp, WC_TILE_INSPECTOR__WIDX_BUTTON_COPY)); + RegisterShortcut(ShortcutId::kWindowTileInspectorPaste, STR_SHORTCUT_PASTE_ELEMENT, std::bind(TileInspectorMouseUp, WC_TILE_INSPECTOR__WIDX_BUTTON_PASTE)); + RegisterShortcut(ShortcutId::kWindowTileInspectorSort, STR_SHORTCUT_SORT_ELEMENTS, std::bind(TileInspectorMouseUp, WC_TILE_INSPECTOR__WIDX_BUTTON_SORT)); + RegisterShortcut(ShortcutId::kWindowTileInspectorRemove, STR_SHORTCUT_REMOVE_ELEMENT, std::bind(TileInspectorMouseUp, WC_TILE_INSPECTOR__WIDX_BUTTON_REMOVE)); + RegisterShortcut(ShortcutId::kWindowTileInspectorMoveUp, STR_SHORTCUT_MOVE_ELEMENT_UP, std::bind(TileInspectorMouseUp, WC_TILE_INSPECTOR__WIDX_BUTTON_MOVE_UP)); + RegisterShortcut(ShortcutId::kWindowTileInspectorMoveDown, STR_SHORTCUT_MOVE_ELEMENT_DOWN, std::bind(TileInspectorMouseUp, WC_TILE_INSPECTOR__WIDX_BUTTON_MOVE_DOWN)); + RegisterShortcut(ShortcutId::kWindowTileInspectorIncreaseX, STR_SHORTCUT_INCREASE_X_COORD, std::bind(TileInspectorMouseDown, WC_TILE_INSPECTOR__WIDX_SPINNER_X_INCREASE)); + RegisterShortcut(ShortcutId::kWindowTileInspectorDecreaseX, STR_SHORTCUT_DECREASE_X_COORD, std::bind(TileInspectorMouseDown, WC_TILE_INSPECTOR__WIDX_SPINNER_X_DECREASE)); + RegisterShortcut(ShortcutId::kWindowTileInspectorIncreaseY, STR_SHORTCUT_INCREASE_Y_COORD, std::bind(TileInspectorMouseDown, WC_TILE_INSPECTOR__WIDX_SPINNER_Y_INCREASE)); + RegisterShortcut(ShortcutId::kWindowTileInspectorDecreaseY, STR_SHORTCUT_DECREASE_Y_COORD, std::bind(TileInspectorMouseDown, WC_TILE_INSPECTOR__WIDX_SPINNER_Y_DECREASE)); + RegisterShortcut(ShortcutId::kWindowTileInspectorIncreaseHeight, STR_SHORTCUT_INCREASE_ELEM_HEIGHT, ShortcutIncreaseElementHeight); + RegisterShortcut(ShortcutId::kWindowTileInspectorDecreaseHeight, STR_SHORTCUT_DECREASE_ELEM_HEIGHT, ShortcutDecreaseElementHeight); + RegisterShortcut(ShortcutId::kWindowTileInspectorChangeWallSlope, STR_SHORTCUT_TOGGLE_WALL_SLOPE, ShortcutToggleWallSlope); // Debug - RegisterShortcut(ShortcutId::DebugToggleConsole, STR_CONSOLE, "`", ShortcutToggleConsole); - RegisterShortcut(ShortcutId::DebugAdvanceTick, STR_SHORTCUT_ADVANCE_TO_NEXT_TICK, []() { + RegisterShortcut(ShortcutId::kDebugToggleConsole, STR_CONSOLE, "`", ShortcutToggleConsole); + RegisterShortcut(ShortcutId::kDebugAdvanceTick, STR_SHORTCUT_ADVANCE_TO_NEXT_TICK, []() { if (!(gScreenFlags & (SCREEN_FLAGS_TITLE_DEMO | SCREEN_FLAGS_SCENARIO_EDITOR | SCREEN_FLAGS_TRACK_MANAGER))) { gDoSingleUpdate = true; } }); - RegisterShortcut(ShortcutId::DebugTogglePaintDebugWindow, STR_SHORTCUT_DEBUG_PAINT_TOGGLE, []() { + RegisterShortcut(ShortcutId::kDebugTogglePaintDebugWindow, STR_SHORTCUT_DEBUG_PAINT_TOGGLE, []() { if (!(gScreenFlags & SCREEN_FLAGS_TITLE_DEMO)) { auto window = WindowFindByClass(WindowClass::DebugPaint);