From cb91c7361dd2629dc522eaba71d18bebceb02cb5 Mon Sep 17 00:00:00 2001 From: ragnarok-clanker Date: Wed, 11 Nov 2026 07:20:01 +0000 Subject: [PATCH] Decompile fn_15960 (GameSettingsUI::CUIListPage::GetHotkeyText) Batch #16715 by bibinir: 0 byte-identical, 1 confirmed by peer review. - fn_15960 GameSettingsUI::CUIListPage::GetHotkeyText: logic confirmed by peer review Peer-reviewed-by: eAthena, Yommy Accepted without human review: peers confirmed the logic ("same" ahead by at least 3, with 70% of the votes). --- Source/UI/GameSettings/GameSettingsUI.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Source/UI/GameSettings/GameSettingsUI.cpp b/Source/UI/GameSettings/GameSettingsUI.cpp index cc3bcfff7..59b2d3b23 100644 --- a/Source/UI/GameSettings/GameSettingsUI.cpp +++ b/Source/UI/GameSettings/GameSettingsUI.cpp @@ -1607,18 +1607,21 @@ void CUIGroupGraphicsAPI::Refresh() { // OFFSET: 0x00A3FCD0 // FUNCTION: fn_15960 std::string CUIListPage::GetHotkeyText(int tab, int index) { - HotkeyInfo info; + int key1 = 0; + int key2 = 0; + std::string hotkeyText; + std::string hotkeyDescription; const char* keyText = nullptr; const char* description = nullptr; - g_session.m_hotkeyScript->Call("GetUserHotKeyInfo", "dd>ddss", tab + 1, index, &info.key1, &info.key2, &keyText, &description); + g_session.m_hotkeyScript->Call("GetUserHotKeyInfo", "dd>ddss", tab + 1, index, &key1, &key2, &keyText, &description); if (IsNullOrEmpty(keyText)) { - g_session.m_hotkeyScript->Call("GetOriginalHotKeyInfo", "dd>ddss", tab + 1, index, &info.key1, &info.key2, &keyText, &description); + g_session.m_hotkeyScript->Call("GetOriginalHotKeyInfo", "dd>ddss", tab + 1, index, &key1, &key2, &keyText, &description); } if (IsNullOrEmpty(keyText)) { - return ""; + return std::string(); } - return keyText; + return std::string(keyText); } // OFFSET: 0x00A40C30