From ee45004c32045958699d113e6546de067343c8d3 Mon Sep 17 00:00:00 2001 From: kotijekriv Date: Sun, 8 Nov 2026 00:01:27 +0100 Subject: [PATCH] Fix two files that stopped compiling after the e32319b21 header sync The Ghidra sync e32319b21 renamed DAT_00b95954 to INT_00b95954 (an int now). playDarMehqOrGlory and switchToMenuView still included and named the old one; they move to main's name. No header or status line changes. Co-Authored-By: Claude Opus 5.5 --- src/OpenSHC/Audio/mss/SoundSystem/playDarMehqOrGlory.cpp | 4 ++-- src/OpenSHC/Game/GameCore/switchToMenuView.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/OpenSHC/Audio/mss/SoundSystem/playDarMehqOrGlory.cpp b/src/OpenSHC/Audio/mss/SoundSystem/playDarMehqOrGlory.cpp index 8cef357725..8f873c0d0f 100644 --- a/src/OpenSHC/Audio/mss/SoundSystem/playDarMehqOrGlory.cpp +++ b/src/OpenSHC/Audio/mss/SoundSystem/playDarMehqOrGlory.cpp @@ -1,7 +1,7 @@ #include "../SoundSystem.func.hpp" -#include "OpenSHC/Globals/DAT_00b95954.hpp" #include "OpenSHC/Globals/DAT_SFXDefinedData.hpp" +#include "OpenSHC/Globals/INT_00b95954.hpp" namespace OpenSHC { namespace Audio { @@ -10,7 +10,7 @@ namespace Audio { // FUNCTION: STRONGHOLDCRUSADER 0x0047A5E0 void SoundSystem::playDarMehqOrGlory() { - if (*DAT_00b95954::ptr == 1) { + if (*INT_00b95954::ptr == 1) { MACRO_CALL_MEMBER(SoundSystem_Func::openSound, this)(DAT_SFXDefinedData::ptr->Pointers[0x26].musicFile); return; } diff --git a/src/OpenSHC/Game/GameCore/switchToMenuView.cpp b/src/OpenSHC/Game/GameCore/switchToMenuView.cpp index 2108852630..88813fd61b 100644 --- a/src/OpenSHC/Game/GameCore/switchToMenuView.cpp +++ b/src/OpenSHC/Game/GameCore/switchToMenuView.cpp @@ -9,7 +9,6 @@ #include "OpenSHC/UI/Helpers.func.hpp" #include "OpenSHC/UI/MenuHandlerState.func.hpp" -#include "OpenSHC/Globals/DAT_00b95954.hpp" #include "OpenSHC/Globals/DAT_BinkControlState.hpp" #include "OpenSHC/Globals/DAT_CurrentMenuID_3.hpp" #include "OpenSHC/Globals/DAT_GameCore.hpp" @@ -20,6 +19,7 @@ #include "OpenSHC/Globals/DAT_SoundSystemState.hpp" #include "OpenSHC/Globals/DAT_TileMapState.hpp" #include "OpenSHC/Globals/DAT_UnitsState.hpp" +#include "OpenSHC/Globals/INT_00b95954.hpp" namespace OpenSHC { namespace Game { @@ -235,11 +235,11 @@ namespace Game { return; case UI::Enums::MVT_CREDITS: MACRO_CALL_MEMBER(Audio::MSS::SoundSystem_Func::setSomeSoundTime, DAT_SoundSystemState::ptr)(); - if (DAT_00b95954::instance == 0) { + if (INT_00b95954::instance == 0) { MACRO_CALL_MEMBER(Audio::MSS::SoundSystem_Func::setupVolumeAndSoundIDWithMultiplier, DAT_SoundSystemState::ptr)((DE::SHCDE::eMusicIDs)15, 100); } - if (DAT_00b95954::instance == 1) { + if (INT_00b95954::instance == 1) { MACRO_CALL_MEMBER(Audio::MSS::SoundSystem_Func::setupVolumeAndSoundIDWithMultiplier, DAT_SoundSystemState::ptr)((DE::SHCDE::eMusicIDs)38, 100); MACRO_CALL_MEMBER(Audio::MSS::SoundSystem_Func::markMusicChangePending, DAT_SoundSystemState::ptr)();