From d26bb53f13226f930b4a88625f838ef4e428f6d1 Mon Sep 17 00:00:00 2001
From: Aaron van Geffen <aaron@aaronweb.net>
Date: Sat, 11 May 2024 12:51:53 +0200
Subject: [PATCH] Rename two shortcut string ids that did not follow
 conventions

---
 src/openrct2-ui/UiStringIds.h       | 10 ++++++----
 src/openrct2-ui/input/Shortcuts.cpp |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/openrct2-ui/UiStringIds.h b/src/openrct2-ui/UiStringIds.h
index 9917069d3a02..a581588ce95b 100644
--- a/src/openrct2-ui/UiStringIds.h
+++ b/src/openrct2-ui/UiStringIds.h
@@ -15,7 +15,7 @@ namespace OpenRCT2
 {
     enum : StringId
     {
-        // Interface
+        // General
         STR_ADJUST_LARGER_LAND_TIP = 2379,
         STR_ADJUST_SMALLER_LAND_TIP = 2378,
         STR_BROKEN = 3124,
@@ -60,8 +60,7 @@ namespace OpenRCT2
         STR_WINDOW_TITLE_TIP = 829,
         STR_WHITE_STRING = 5139,
 
-        // Input
-        STR_ADVANCE_TO_NEXT_TICK = 6268,
+        // Colour dropdown tooltips
         STR_COLOUR_AQUAMARINE_TIP = 5526,
         STR_COLOUR_AQUA_DARK_TIP = 6569,
         STR_COLOUR_BLACK_TIP = 5516,
@@ -118,9 +117,11 @@ namespace OpenRCT2
         STR_COLOUR_VOID_TIP = 6574,
         STR_COLOUR_WHITE_TIP = 5518,
         STR_COLOUR_YELLOW_TIP = 5534,
-        STR_SEND_MESSAGE = 5493,
+
+        // Shortcuts
         STR_SHORTCUT_ADJUST_LAND = 2511,
         STR_SHORTCUT_ADJUST_WATER = 2512,
+        STR_SHORTCUT_ADVANCE_TO_NEXT_TICK = 6268,
         STR_SHORTCUT_BACKSPACE = 2533,
         STR_SHORTCUT_BUILD_NEW_RIDE = 2515,
         STR_SHORTCUT_BUILD_PATHS = 2514,
@@ -233,6 +234,7 @@ namespace OpenRCT2
         STR_SHORTCUT_SEE_THROUGH_STAFF_TOGGLE = 6487,
         STR_SHORTCUT_SEE_THROUGH_VEGETATION_TOGGLE = 6484,
         STR_SHORTCUT_SEE_THROUGH_VEHICLES_TOGGLE = 6485,
+        STR_SHORTCUT_SEND_MESSAGE = 5493,
         STR_SHORTCUT_SHOW_FINANCIAL_INFORMATION = 2516,
         STR_SHORTCUT_SHOW_GUEST_LIST = 2520,
         STR_SHORTCUT_SHOW_MULTIPLAYER = 5812,
diff --git a/src/openrct2-ui/input/Shortcuts.cpp b/src/openrct2-ui/input/Shortcuts.cpp
index 8a029fb344d2..85b30e512be0 100644
--- a/src/openrct2-ui/input/Shortcuts.cpp
+++ b/src/openrct2-ui/input/Shortcuts.cpp
@@ -799,7 +799,7 @@ void ShortcutManager::RegisterDefaultShortcuts()
     RegisterShortcut(ShortcutId::InterfaceSceneryPicker, STR_SHORTCUT_OPEN_SCENERY_PICKER, ShortcutOpenSceneryPicker);
     RegisterShortcut(
         ShortcutId::InterfaceDisableClearance, STR_SHORTCUT_TOGGLE_CLEARANCE_CHECKS, ShortcutToggleClearanceChecks);
-    RegisterShortcut(ShortcutId::InterfaceMultiplayerChat, STR_SEND_MESSAGE, "C", []() {
+    RegisterShortcut(ShortcutId::InterfaceMultiplayerChat, STR_SHORTCUT_SEND_MESSAGE, "C", []() {
         if (!(gScreenFlags & SCREEN_FLAGS_TITLE_DEMO) && ChatAvailable())
         {
             ChatToggle();
@@ -897,7 +897,7 @@ void ShortcutManager::RegisterDefaultShortcuts()
 
     // Debug
     RegisterShortcut(ShortcutId::DebugToggleConsole, STR_CONSOLE, "`", ShortcutToggleConsole);
-    RegisterShortcut(ShortcutId::DebugAdvanceTick, STR_ADVANCE_TO_NEXT_TICK, []() {
+    RegisterShortcut(ShortcutId::DebugAdvanceTick, STR_SHORTCUT_ADVANCE_TO_NEXT_TICK, []() {
         if (!(gScreenFlags & (SCREEN_FLAGS_TITLE_DEMO | SCREEN_FLAGS_SCENARIO_EDITOR | SCREEN_FLAGS_TRACK_MANAGER)))
         {
             gDoSingleUpdate = true;