Resolve #5835: Add keyboard shortcut for scenery remover

data/language/en-GB.txt

@@ -4442,6 +4442,7 @@ STR_6130    :Copy entire list to clipboard
 STR_6131    :Object source
 STR_6132    :Ignore research status
 STR_6133    :{SMALLFONT}{BLACK}Access rides and scenery that have not yet been invented
+STR_6134    :Clear Scenery
 
 #############
 # Scenarios #

distribution/changelog.txt

@@ -1,6 +1,7 @@
 0.1.1 (in development)
 ------------------------------------------------------------------------
 - Feature: [#5815] Add cheat to ignore research status and access rides/scenery not yet invented.
+- Feature: [#5857] Keyboard shortcut for clear scenery.
 - Feature: [#5877] Allow up to 16 stations to be synchronised
 - Feature: [#5970] The Bobsleigh Roller Coaster now supports on-ride photos.
 - Feature: [#5991] Allow all tracked rides that can be tested without guests to the Track Designer

src/openrct2-ui/input/KeyboardShortcuts.cpp

@@ -309,4 +309,5 @@ const uint16 KeyboardShortcuts::DefaultKeys[SHORTCUT_COUNT] =
     SDL_SCANCODE_KP_0,                          // SHORTCUT_RIDE_CONSTRUCTION_BUILD_CURRENT
     SDL_SCANCODE_KP_MINUS,                      // SHORTCUT_RIDE_CONSTRUCTION_DEMOLISH_CURRENT
     PLATFORM_MODIFIER | SDL_SCANCODE_L,         // SHORTCUT_LOAD_GAME
+    SDL_SCANCODE_B,                             // SHORTCUT_CLEAR_SCENERY
 };

src/openrct2-ui/input/KeyboardShortcuts.h

@@ -95,6 +95,7 @@ enum
     SHORTCUT_RIDE_CONSTRUCTION_BUILD_CURRENT,
     SHORTCUT_RIDE_CONSTRUCTION_DEMOLISH_CURRENT,
     SHORTCUT_LOAD_GAME,
+    SHORTCUT_CLEAR_SCENERY,
 
     SHORTCUT_COUNT,
 

src/openrct2-ui/input/keyboard_shortcut.c

@@ -495,6 +495,23 @@ static void shortcut_open_cheat_window()
     window_cheats_open();
 }
 
+static void shortcut_clear_scenery()
+{
+    if (gScreenFlags & SCREEN_FLAGS_TITLE_DEMO)
+        return;
+
+    if (!(gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) || gS6Info.editor_step == EDITOR_STEP_LANDSCAPE_EDITOR) {
+        if (!(gScreenFlags & (SCREEN_FLAGS_TRACK_DESIGNER | SCREEN_FLAGS_TRACK_MANAGER))) {
+            rct_window *window = window_find_by_class(WC_TOP_TOOLBAR);
+            if (window != NULL) {
+                window_invalidate(window);
+                window_event_mouse_up_call(window, WC_TOP_TOOLBAR__WIDX_CLEAR_SCENERY);
+            }
+        }
+    }
+}
+
+
 static void shortcut_open_chat_window()
 {
     if (gScreenFlags & SCREEN_FLAGS_TITLE_DEMO)
@@ -722,6 +739,7 @@ static const shortcut_action shortcut_table[SHORTCUT_COUNT] = {
     shortcut_ride_construction_build_current,
     shortcut_ride_construction_demolish_current,
     shortcut_load_game,
+    shortcut_clear_scenery,
 };
 
 #pragma endregion

src/openrct2-ui/windows/shortcut_keys.c

@@ -150,6 +150,7 @@ const rct_string_id ShortcutStringIds[] = {
     STR_SHORTCUT_RIDE_CONSTRUCTION_BUILD_CURRENT,
     STR_SHORTCUT_RIDE_CONSTRUCTION_DEMOLISH_CURRENT,
     STR_LOAD_GAME,
+    STR_SHORTCUT_CLEAR_SCENERY,
 };
 
 /**

src/openrct2/interface/window.h

@@ -497,6 +497,7 @@ enum {
 #define WC_TOP_TOOLBAR__WIDX_WATER                      9
 #define WC_TOP_TOOLBAR__WIDX_SCENERY                    10
 #define WC_TOP_TOOLBAR__WIDX_PATH                       11
+#define WC_TOP_TOOLBAR__WIDX_CLEAR_SCENERY              17
 #define WC_RIDE_CONSTRUCTION__WIDX_CONSTRUCT            23
 #define WC_RIDE_CONSTRUCTION__WIDX_ENTRANCE             29
 #define WC_RIDE_CONSTRUCTION__WIDX_EXIT                 30

src/openrct2/localisation/string_ids.h

@@ -1962,6 +1962,7 @@ enum {
     STR_SHORTCUT_SHOW_MAP = 2523,
     STR_SHORTCUT_SCREENSHOT = 2524,
     STR_SHORTCUT_KEY_UNKNOWN = 2525,
+
 // STR_2525    :???
 // STR_2526    :???
 // STR_2527    :???
@@ -3804,6 +3805,8 @@ enum {
     STR_CHEAT_IGNORE_RESEARCH_STATUS = 6132,
     STR_CHEAT_IGNORE_RESEARCH_STATUS_TIP = 6133,
 
+    STR_SHORTCUT_CLEAR_SCENERY = 6134,
+
     // Have to include resource strings (from scenarios and objects) for the time being now that language is partially working
     STR_COUNT = 32768
 };

src/openrct2/windows/top_toolbar.c

@@ -78,6 +78,7 @@ validate_global_widx(WC_TOP_TOOLBAR, WIDX_LAND);
 validate_global_widx(WC_TOP_TOOLBAR, WIDX_WATER);
 validate_global_widx(WC_TOP_TOOLBAR, WIDX_SCENERY);
 validate_global_widx(WC_TOP_TOOLBAR, WIDX_PATH);
+validate_global_widx(WC_TOP_TOOLBAR, WIDX_CLEAR_SCENERY);
 
 typedef enum {
     DDIDX_NEW_GAME = 0,