diff options
| author | Max Roncace <me@caseif.net> | 2025-12-11 18:34:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-11 15:34:16 -0800 |
| commit | 8ad2d661a2c33a3c3e60d2a7089c9f5463ae2ab0 (patch) | |
| tree | e60bbe0b605fa455fc8bdabb8b38dccf5ff0e629 /src/Z2AudioLib | |
| parent | ae4ad9f47779db56713bca41f6535bea31ec5490 (diff) | |
Clean up conditional compilation a bit (#2943)
Diffstat (limited to 'src/Z2AudioLib')
| -rw-r--r-- | src/Z2AudioLib/Z2SeMgr.cpp | 12 | ||||
| -rw-r--r-- | src/Z2AudioLib/Z2SoundObject.cpp | 6 | ||||
| -rw-r--r-- | src/Z2AudioLib/Z2SpeechMgr2.cpp | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/Z2AudioLib/Z2SeMgr.cpp b/src/Z2AudioLib/Z2SeMgr.cpp index 7ec10da077..934e15110c 100644 --- a/src/Z2AudioLib/Z2SeMgr.cpp +++ b/src/Z2AudioLib/Z2SeMgr.cpp @@ -30,12 +30,12 @@ Z2MultiSeObj::Z2MultiSeObj() { } void Z2SeMgr::initSe() { - #if VERSION == VERSION_SHIELD_DEBUG - dbg_field_0x68.releaseSound(); - dbg_field_0x6c = 0.5f; - dbg_field_0x70 = 0.0f; - dbg_field_0x74 = 0.0f; - dbg_field_0x78 = 0.0f; + #if VERSION >= VERSION_WII_USA_R0 + wii_field_0x68.releaseSound(); + wii_field_0x6c = 0.5f; + wii_field_0x70 = 0.0f; + wii_field_0x74 = 0.0f; + wii_field_0x78 = 0.0f; #endif for (u8 i = 0; i < 10; i++) { diff --git a/src/Z2AudioLib/Z2SoundObject.cpp b/src/Z2AudioLib/Z2SoundObject.cpp index e6d48cdc59..b2738d2549 100644 --- a/src/Z2AudioLib/Z2SoundObject.cpp +++ b/src/Z2AudioLib/Z2SoundObject.cpp @@ -14,7 +14,7 @@ #endif Z2SoundObjBase::Z2SoundObjBase() -#if VERSION == VERSION_SHIELD_DEBUG +#if DEBUG : JSULink<Z2SoundObjBase>(this) #endif { @@ -30,7 +30,7 @@ Z2SoundObjBase::~Z2SoundObjBase() { } void Z2SoundObjBase::init(Vec* posPtr, u8 handleNum) { - #if VERSION == VERSION_SHIELD_DEBUG + #if DEBUG Z2GetSoundObjMgr()->getAllList()->append(this); #endif @@ -40,7 +40,7 @@ void Z2SoundObjBase::init(Vec* posPtr, u8 handleNum) { } void Z2SoundObjBase::deleteObject() { - #if VERSION == VERSION_SHIELD_DEBUG + #if DEBUG Z2GetSoundObjMgr()->getAllList()->remove(this); #endif diff --git a/src/Z2AudioLib/Z2SpeechMgr2.cpp b/src/Z2AudioLib/Z2SpeechMgr2.cpp index b6a1757f2b..8b1402ff5b 100644 --- a/src/Z2AudioLib/Z2SpeechMgr2.cpp +++ b/src/Z2AudioLib/Z2SpeechMgr2.cpp @@ -475,7 +475,7 @@ void Z2SpeechMgr2::setString(const u16* s, s16 textNum, u8 speakerID, u16 mood) mTextNum = textNum; } - #if VERSION == VERSION_SHIELD_DEBUG + #if VERSION >= VERSION_WII_USA_R2 for (int i = 0; i <= mTextNum; i++) #else for (int i = 0; i < mTextNum; i++) |