mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-11 13:08:33 -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
include/Z2AudioLib/Z2SeMgr.h
+6 -6
View File
@@ -86,12 +86,12 @@ public:
private:
/* 0x000 */ JAISoundHandle mSoundHandle[24];
/* 0x060 */ JAISoundHandles mSoundHandles;
#if VERSION == VERSION_SHIELD_DEBUG
/* 0x068 */ JAISoundHandle dbg_field_0x68;
/* 0x06C */ f32 dbg_field_0x6c;
/* 0x070 */ f32 dbg_field_0x70;
/* 0x074 */ f32 dbg_field_0x74;
/* 0x078 */ f32 dbg_field_0x78;
#if VERSION >= VERSION_WII_USA_R0
/* 0x068 */ JAISoundHandle wii_field_0x68;
/* 0x06C */ f32 wii_field_0x6c;
/* 0x070 */ f32 wii_field_0x70;
/* 0x074 */ f32 wii_field_0x74;
/* 0x078 */ f32 wii_field_0x78;
#endif
/* 0x068 */ Z2MultiSeObj mLevelObjSe[10];
/* 0x1D0 */ u8 mLevelObjectSeCount;
include/Z2AudioLib/Z2SoundObjMgr.h
+2 -2
View File
@@ -100,12 +100,12 @@ public:
bool isForceBattle() { return forceBattle_; }
JSUList<Z2CreatureEnemy>* getEnemyList() { return this; }
#if VERSION == VERSION_SHIELD_DEBUG
#if DEBUG
JSUList<Z2SoundObjBase>* getAllList() { return &allList_; }
#endif
private:
#if VERSION == VERSION_SHIELD_DEBUG
#if DEBUG
/* 0x0C */ JSUList<Z2SoundObjBase> allList_;
#endif
/* 0x0C */ Z2EnemyArea enemyArea_;
include/Z2AudioLib/Z2SoundObject.h
+1 -1
View File
@@ -7,7 +7,7 @@
class Z2SoundStarter;
class Z2SoundObjBase : public Z2SoundHandles
#if VERSION == VERSION_SHIELD_DEBUG
#if DEBUG
, public JSULink<Z2SoundObjBase>
#endif
{