diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index a5252060d7..654f73626f 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -4539,6 +4539,8 @@ STR_6229 :{WINDOW_COLOUR_2}{STRINGID}: {STRINGID} STR_6230 :{STRINGID}: {MOVE_X}{185}{STRINGID} STR_6231 :{WINDOW_COLOUR_2}{STRINGID}: {MOVE_X}{185}{STRINGID} STR_6232 :Frozen +STR_6233 :Cut-away view +STR_6234 :Highlight path issues ############# # Scenarios # diff --git a/distribution/changelog.txt b/distribution/changelog.txt index d7af6b2859..2bd2b621d1 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -2,6 +2,7 @@ ------------------------------------------------------------------------ - Feature: [#7187] Option for early scenario completion. - Feature: [#7267] Leverage more historical data in Finances window. +- Feature: [#7332] Keyboard shortcuts for view path issues and cutaway view. - Improved: Raising land near the map edge makes the affected area smaller instead of showing an 'off edge map' error. 0.1.2 (2018-03-18) diff --git a/src/openrct2-ui/input/KeyboardShortcut.cpp b/src/openrct2-ui/input/KeyboardShortcut.cpp index 231dd247b4..a483c476b1 100644 --- a/src/openrct2-ui/input/KeyboardShortcut.cpp +++ b/src/openrct2-ui/input/KeyboardShortcut.cpp @@ -746,6 +746,22 @@ static void shortcut_load_game() } } +static void shortcut_view_clipping() +{ + if (gScreenFlags & SCREEN_FLAGS_TITLE_DEMO) + return; + + context_open_window(WC_VIEW_CLIPPING); +} + +static void shortcut_highlight_path_issues_toggle() +{ + if (gScreenFlags & SCREEN_FLAGS_TITLE_DEMO) + return; + + toggle_view_flag(VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES); +} + namespace { const shortcut_action shortcut_table[SHORTCUT_COUNT] = @@ -817,6 +833,8 @@ namespace shortcut_load_game, shortcut_clear_scenery, shortcut_gridlines_toggle, + shortcut_view_clipping, + shortcut_highlight_path_issues_toggle, }; } diff --git a/src/openrct2-ui/input/KeyboardShortcuts.cpp b/src/openrct2-ui/input/KeyboardShortcuts.cpp index f4be79eec0..e111c7b878 100644 --- a/src/openrct2-ui/input/KeyboardShortcuts.cpp +++ b/src/openrct2-ui/input/KeyboardShortcuts.cpp @@ -305,4 +305,6 @@ const uint16 KeyboardShortcuts::DefaultKeys[SHORTCUT_COUNT] = PLATFORM_MODIFIER | SDL_SCANCODE_L, // SHORTCUT_LOAD_GAME SDL_SCANCODE_B, // SHORTCUT_CLEAR_SCENERY SDL_SCANCODE_7, // SHORTCUT_GRIDLINES_DISPLAY_TOGGLE + SHORTCUT_UNDEFINED, // SHORTCUT_VIEW_CLIPPING + SDL_SCANCODE_I, // SHORTCUT_HIGHLIGHT_PATH_ISSUES_TOGGLE }; diff --git a/src/openrct2-ui/input/KeyboardShortcuts.h b/src/openrct2-ui/input/KeyboardShortcuts.h index c57cef569a..f66049a486 100644 --- a/src/openrct2-ui/input/KeyboardShortcuts.h +++ b/src/openrct2-ui/input/KeyboardShortcuts.h @@ -97,6 +97,8 @@ enum SHORTCUT_LOAD_GAME, SHORTCUT_CLEAR_SCENERY, SHORTCUT_GRIDLINES_DISPLAY_TOGGLE, + SHORTCUT_VIEW_CLIPPING, + SHORTCUT_HIGHLIGHT_PATH_ISSUES_TOGGLE, SHORTCUT_COUNT, diff --git a/src/openrct2-ui/windows/ShortcutKeys.cpp b/src/openrct2-ui/windows/ShortcutKeys.cpp index f5b5f5df8c..67778aee21 100644 --- a/src/openrct2-ui/windows/ShortcutKeys.cpp +++ b/src/openrct2-ui/windows/ShortcutKeys.cpp @@ -153,6 +153,8 @@ const rct_string_id ShortcutStringIds[SHORTCUT_COUNT] = { STR_LOAD_GAME, STR_SHORTCUT_CLEAR_SCENERY, STR_SHORTCUT_GRIDLINES_DISPLAY_TOGGLE, + STR_SHORTCUT_VIEW_CLIPPING, + STR_SHORTCUT_HIGHLIGHT_PATH_ISSUES_TOGGLE, }; diff --git a/src/openrct2/localisation/StringIds.h b/src/openrct2/localisation/StringIds.h index 75dfb9ee03..b3dd1d354c 100644 --- a/src/openrct2/localisation/StringIds.h +++ b/src/openrct2/localisation/StringIds.h @@ -3897,6 +3897,9 @@ enum { STR_FROZEN = 6232, + STR_SHORTCUT_VIEW_CLIPPING = 6233, + STR_SHORTCUT_HIGHLIGHT_PATH_ISSUES_TOGGLE = 6234, + // Have to include resource strings (from scenarios and objects) for the time being now that language is partially working STR_COUNT = 32768 };