From bd8d3934e0df5b5ffd4e09560bcc8018d4144710 Mon Sep 17 00:00:00 2001 From: Kane Date: Sun, 1 Aug 2021 17:20:34 +1000 Subject: [PATCH] Close #15143: Add a shortcut key for Giant Screenshot --- data/language/en-GB.txt | 1 + distribution/changelog.txt | 1 + src/openrct2-ui/input/ShortcutIds.h | 1 + src/openrct2-ui/input/Shortcuts.cpp | 1 + src/openrct2/localisation/StringIds.h | 2 ++ 5 files changed, 6 insertions(+) diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index 73618a460e..80803ef36f 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -3653,6 +3653,7 @@ STR_6452 :{WINDOW_COLOUR_2}Sells: {BLACK}{STRING} STR_6453 :Copy version info STR_6454 :Can’t rename banner… STR_6455 :Can’t rename sign… +STR_6456 :Giant Screenshot ############# # Scenarios # diff --git a/distribution/changelog.txt b/distribution/changelog.txt index b42eb9e744..527824ffe7 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -1,6 +1,7 @@ 0.3.4.1+ (in development) ------------------------------------------------------------------------ - Feature: [#15084] [Plugin] Add "vehicle.crash" hook +- Feature: [#15143] Added a shortcut key for Giant Screenshot. - Fix: [#14316] Closing the Track Designs Manager window causes broken state. - Fix: [#15096] Crash when placing entrances in the scenario editor near the map corner. - Fix: [#15142] ToonTowner's mine roofs were moved into the pirate theme scenery group instead of the mine theme scenery group. diff --git a/src/openrct2-ui/input/ShortcutIds.h b/src/openrct2-ui/input/ShortcutIds.h index 4facaa43ba..16417a30f7 100644 --- a/src/openrct2-ui/input/ShortcutIds.h +++ b/src/openrct2-ui/input/ShortcutIds.h @@ -23,6 +23,7 @@ namespace OpenRCT2::Ui::ShortcutId constexpr std::string_view InterfaceIncreaseSpeed = "interface.misc.increase_speed"; constexpr std::string_view InterfaceToggleToolbars = "interface.misc.toggle_toolbars"; constexpr std::string_view InterfaceScreenshot = "interface.misc.screenshot"; + constexpr std::string_view InterfaceGiantScreenshot = "interface.misc.giant_screenshot"; constexpr std::string_view InterfaceLoadGame = "interface.misc.load_game"; constexpr std::string_view InterfaceSaveGame = "interface.misc.save_game"; constexpr std::string_view InterfaceMute = "interface.misc.mute"; diff --git a/src/openrct2-ui/input/Shortcuts.cpp b/src/openrct2-ui/input/Shortcuts.cpp index df9b193e9d..662f692f3f 100644 --- a/src/openrct2-ui/input/Shortcuts.cpp +++ b/src/openrct2-ui/input/Shortcuts.cpp @@ -773,6 +773,7 @@ void ShortcutManager::RegisterDefaultShortcuts() RegisterShortcut(ShortcutId::InterfaceLoadGame, STR_LOAD_GAME, "CTRL+L", []() { ShortcutLoadGame(); }); RegisterShortcut(ShortcutId::InterfaceSaveGame, STR_SAVE_GAME, "CTRL+F10", []() { ShortcutQuickSaveGame(); }); RegisterShortcut(ShortcutId::InterfaceScreenshot, STR_SHORTCUT_SCREENSHOT, "CTRL+S", []() { gScreenshotCountdown = 2; }); + RegisterShortcut(ShortcutId::InterfaceGiantScreenshot, STR_SHORTCUT_GIANT_SCREENSHOT, "CTRL+SHIFT+S", []() { screenshot_giant(); }); RegisterShortcut(ShortcutId::InterfaceMute, STR_SHORTCUT_MUTE_SOUND, []() { OpenRCT2::Audio::ToggleAllSounds(); }); RegisterShortcut(ShortcutId::InterfaceDisableClearance, STR_SHORTCUT_TOGGLE_CLEARANCE_CHECKS, []() { ShortcutToggleClearanceChecks(); }); RegisterShortcut(ShortcutId::MultiplayerChat, STR_SEND_MESSAGE, "C", []() { diff --git a/src/openrct2/localisation/StringIds.h b/src/openrct2/localisation/StringIds.h index 8a4a4ab5e2..148b2821bf 100644 --- a/src/openrct2/localisation/StringIds.h +++ b/src/openrct2/localisation/StringIds.h @@ -3908,6 +3908,8 @@ enum STR_CANT_RENAME_BANNER = 6454, STR_CANT_RENAME_SIGN = 6455, + STR_SHORTCUT_GIANT_SCREENSHOT = 6456, + // Have to include resource strings (from scenarios and objects) for the time being now that language is partially working /* MAX_STR_COUNT = 32768 */ // MAX_STR_COUNT - upper limit for number of strings, not the current count strings };