From 350635955692affd18f8560729785a98fb9cbee2 Mon Sep 17 00:00:00 2001 From: ragnarok-clanker Date: Tue, 3 Nov 2026 21:36:34 +0000 Subject: [PATCH] Maintenance: Fold alias global gl_25378 g_groundMarkAltB (0x1737cd8) into its evidenced owner member g_session.unknown_56A0. 0x1737CD Batch #10394 by ragnarok-clanker: no function's compiled code changes; checked with 8 compiled unit(s), including every includer of Source/Contents/Sound/SoundMaker.h. --- Source/Client/Mode/GameMode.cpp | 8 ++++---- Source/Contents/Sound/SoundMaker.cpp | 5 +---- Source/Contents/Sound/SoundMaker.h | 1 - 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Source/Client/Mode/GameMode.cpp b/Source/Client/Mode/GameMode.cpp index ca40d19d..f87221c2 100644 --- a/Source/Client/Mode/GameMode.cpp +++ b/Source/Client/Mode/GameMode.cpp @@ -4253,7 +4253,7 @@ void CGameMode::ProcessActorClick(int& handled, ActorPickInfo* pick, CGameActor* this->SetCursorAction(11); g_groundMarkAltAid = actor->render.accountId; g_groundMarkAltA = 0; - g_groundMarkAltB = 0; + g_session.unknown_56A0 = 0; g_groundMarkAltSet = 0; g_session.unknown_56AC = 1; } @@ -4600,7 +4600,7 @@ int CGameMode::ProcessGroundClick(int result) { } g_groundMarkAltA = column; - g_groundMarkAltB = row; + g_session.unknown_56A0 = row; g_groundMarkAltAid = 0; g_session.unknown_56AC = 0; if (mercenary && mercenary->HasUnknown0310Entry()) { @@ -6138,7 +6138,7 @@ void CGameMode::ProcessActorPick(int& handled, ActorPickInfo* pick, CGameActor* this->SetCursorAction(11); g_groundMarkAltAid = actor->render.accountId; g_groundMarkAltA = 0; - g_groundMarkAltB = 0; + g_session.unknown_56A0 = 0; g_groundMarkAltSet = 0; g_session.unknown_56AC = 1; } @@ -6758,7 +6758,7 @@ int CGameMode::HandleActorPick(ActorPickInfo* pick, int result) { this->SetCursorAction(11); g_groundMarkAltAid = pick->accountId; g_groundMarkAltA = 0; - g_groundMarkAltB = 0; + g_session.unknown_56A0 = 0; g_groundMarkAltSet = 0; g_session.unknown_56AC = 1; } diff --git a/Source/Contents/Sound/SoundMaker.cpp b/Source/Contents/Sound/SoundMaker.cpp index 437ac317..c23f1429 100644 --- a/Source/Contents/Sound/SoundMaker.cpp +++ b/Source/Contents/Sound/SoundMaker.cpp @@ -1614,9 +1614,6 @@ int g_groundMarkB; // GLOBAL: gl_25377 int g_groundMarkAltA; -// GLOBAL: gl_25378 -int g_groundMarkAltB; - // GLOBAL: gl_25379 int g_groundMarkAltSet; @@ -1722,7 +1719,7 @@ void CNpc::Slot15(int state, int) { } if (g_groundMarkAltSet) { g_groundMarkAltA = 0; - g_groundMarkAltB = 0; + g_session.unknown_56A0 = 0; g_groundMarkAltSet = 0; } this->Slot16(); diff --git a/Source/Contents/Sound/SoundMaker.h b/Source/Contents/Sound/SoundMaker.h index 314c283b..74b5b3f0 100644 --- a/Source/Contents/Sound/SoundMaker.h +++ b/Source/Contents/Sound/SoundMaker.h @@ -42,7 +42,6 @@ extern int g_groundMarkA; extern int g_groundMarkB; extern std::uint32_t g_groundMarkAltAid; extern int g_groundMarkAltA; -extern int g_groundMarkAltB; extern int g_groundMarkAltSet; #endif