mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-09 18:27:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clean up conditional compilation a bit (#2943)

Browse Source
This commit is contained in:
Max Roncace
2025-12-11 18:34:16 -05:00
committed by GitHub
parent d9ca13c7b5
commit 4fa301a6da
32 changed files with 101 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Z2AudioLib/Z2SeMgr.cpp
+6 -6
View File
@@ -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++) {
src/Z2AudioLib/Z2SoundObject.cpp
+3 -3
View File
@@ -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
src/Z2AudioLib/Z2SpeechMgr2.cpp
+1 -1
View File
@@ -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++)