clank/rodecomp
1
0
Fork 0
Code Issues Wiki Activity

Maintenance: Fold alias global gl_25378 g_groundMarkAltB (0x1737cd8) into its evidenced owner member g_session.unknown_56A0. 0x1737CD

Browse source 
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.
This commit is contained in:
ragnarok-clanker 2026-11-03 21:36:34 +00:00
commit 3506359556
3 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Source/Client/Mode/GameMode.cpp
View file

@ -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;
}

5
Source/Contents/Sound/SoundMaker.cpp
View file

@ -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();

1
Source/Contents/Sound/SoundMaker.h
View file

@ -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