Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/OpenSHC/Audio/mss/SoundSystem/playDarMehqOrGlory.cpp
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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;
}
Expand Down
6 changes: 3 additions & 3 deletions src/OpenSHC/Game/GameCore/switchToMenuView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 {
Expand Down Expand Up @@ -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)();
Expand Down
Loading