diff options
| author | Max Roncace <me@caseif.net> | 2025-12-06 16:34:47 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-06 13:34:47 -0800 |
| commit | a30e617e5a9b8264053788429a587ee1763eae73 (patch) | |
| tree | d4f3dbf04e754e5741ba35b1ba1083851be87597 /include | |
| parent | 9f1a6488512209cc1acc612aa390e9a4686037ca (diff) | |
Various debug conditional compilation cleanup (#2915)
* Global: Define DEBUG as 0 if not already defined
* Clean up DEBUG-guarded code
Diffstat (limited to 'include')
74 files changed, 308 insertions, 318 deletions
diff --git a/include/JSystem/JAudio2/JASDSPInterface.h b/include/JSystem/JAudio2/JASDSPInterface.h index c3f843a074..3081075486 100644 --- a/include/JSystem/JAudio2/JASDSPInterface.h +++ b/include/JSystem/JAudio2/JASDSPInterface.h @@ -119,7 +119,7 @@ namespace JASDsp { extern FxBuf* FX_BUF; extern f32 sDSPVolume; - #ifdef DEBUG + #if DEBUG extern s32 dspMutex; #endif }; diff --git a/include/JSystem/JGadget/define.h b/include/JSystem/JGadget/define.h index 4ae789ada2..394a35a3d0 100644 --- a/include/JSystem/JGadget/define.h +++ b/include/JSystem/JGadget/define.h @@ -33,7 +33,7 @@ private: int mLine; }; -#ifdef DEBUG +#if DEBUG #define JGADGET_ASSERTWARN(line, COND) \ ((COND)) || (JGadget_outMessage(JGadget_outMessage::warning, __FILE__, line) << #COND, false); diff --git a/include/JSystem/JHostIO/JORReflexible.h b/include/JSystem/JHostIO/JORReflexible.h index 04c8f54a37..0f7a7a4db7 100644 --- a/include/JSystem/JHostIO/JORReflexible.h +++ b/include/JSystem/JHostIO/JORReflexible.h @@ -35,14 +35,14 @@ struct JORServer; class JOREventListener { public: -#ifdef DEBUG +#if DEBUG virtual void listenPropertyEvent(const JORPropertyEvent*) = 0; #endif }; class JORReflexible : public JOREventListener { public: -#ifdef DEBUG +#if DEBUG JORReflexible(); static JORServer* getJORServer(); diff --git a/include/JSystem/JKernel/JKRHeap.h b/include/JSystem/JKernel/JKRHeap.h index afea773716..0284012f49 100644 --- a/include/JSystem/JKernel/JKRHeap.h +++ b/include/JSystem/JKernel/JKRHeap.h @@ -266,7 +266,7 @@ inline JKRHeap* JKRGetRootHeap2() { } #endif -#ifdef DEBUG +#if DEBUG inline void JKRSetDebugFillNotuse(u8 status) { data_804508B1 = status; } inline void JKRSetDebugFillNew(u8 status) { data_804508B2 = status; } inline void JKRSetDebugFillDelete(u8 status) { data_804508B3 = status; } diff --git a/include/JSystem/JStudio/JStudio/functionvalue.h b/include/JSystem/JStudio/JStudio/functionvalue.h index a8724f5496..0e409a879a 100644 --- a/include/JSystem/JStudio/JStudio/functionvalue.h +++ b/include/JSystem/JStudio/JStudio/functionvalue.h @@ -313,7 +313,7 @@ public: > { TIterator_data_(const TFunctionValue_list_parameter& rParent, const f32* value) { -#ifdef DEBUG +#if DEBUG pOwn_ = &rParent; #endif pf_ = value; @@ -323,7 +323,7 @@ public: void set(const f32* value) { pf_ = value; } friend bool operator==(const TIterator_data_& r1, const TIterator_data_& r2) { -#ifdef DEBUG +#if DEBUG if (!(r1.pOwn_==r2.pOwn_)) { JGadget_outMessage msg(JGadget_outMessage::warning, __FILE__, 124); msg << "r1.pOwn_==r2.pOwn_"; @@ -333,9 +333,10 @@ public: } f32 operator*() { -#ifdef DEBUG + // this guard is required - removing it breaks float regalloc in std::upper_bound + #if DEBUG JUT_ASSERT(947, pf_!=NULL); -#endif + #endif return *pf_; } @@ -357,7 +358,7 @@ public: } friend s32 operator-(const TIterator_data_& r1, const TIterator_data_& r2) { -#ifdef DEBUG +#if DEBUG if (!(r1.pOwn_==r2.pOwn_)) { JGadget_outMessage msg(JGadget_outMessage::warning, __FILE__, 124); msg << "r1.pOwn_==r2.pOwn_"; @@ -366,7 +367,7 @@ public: return (r1.pf_ - r2.pf_) / suData_size; } -#ifdef DEBUG +#if DEBUG /* 0x00 */ const TFunctionValue_list_parameter* pOwn_; /* 0x04 */ const f32* pf_; #else @@ -421,7 +422,7 @@ public: > { TIterator_data_(const TFunctionValue_hermite& rParent, const f32* value) { -#ifdef DEBUG +#if DEBUG pOwn_ = &rParent; #endif pf_ = value; @@ -435,7 +436,7 @@ public: } friend bool operator==(const TIterator_data_& r1, const TIterator_data_& r2) { -#ifdef DEBUG +#if DEBUG if (!(r1.pOwn_==r2.pOwn_)) { JGadget_outMessage msg(JGadget_outMessage::warning, __FILE__, 124); msg << "r1.pOwn_==r2.pOwn_"; @@ -445,7 +446,7 @@ public: } f32 operator*() { -#ifdef DEBUG +#if DEBUG JUT_ASSERT(1098, pf_!=NULL); #endif return *pf_; @@ -469,7 +470,7 @@ public: } friend s32 operator-(const TIterator_data_& r1, const TIterator_data_& r2) { -#ifdef DEBUG +#if DEBUG if (!(r1.pOwn_==r2.pOwn_)) { JGadget_outMessage msg(JGadget_outMessage::warning, __FILE__, 124); msg << "r1.pOwn_==r2.pOwn_"; @@ -483,7 +484,7 @@ public: return (r1.pf_ - r2.pf_) / r1.uSize_; } -#ifdef DEBUG +#if DEBUG /* 0x00 */ const TFunctionValue_hermite* pOwn_; /* 0x04 */ const f32* pf_; /* 0x08 */ u32 uSize_; diff --git a/include/JSystem/JStudio/JStudio/jstudio-object.h b/include/JSystem/JStudio/JStudio/jstudio-object.h index 090d71a3ff..3f42a456b5 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-object.h +++ b/include/JSystem/JStudio/JStudio/jstudio-object.h @@ -47,7 +47,7 @@ struct TVariableValue { } void setValue_none() { -#ifdef DEBUG +#if DEBUG field_0xc.fv = NULL; #endif field_0x8 = NULL; diff --git a/include/JSystem/JUtility/JUTAssert.h b/include/JSystem/JUtility/JUTAssert.h index 503a2a73e7..0aba36b476 100644 --- a/include/JSystem/JUtility/JUTAssert.h +++ b/include/JSystem/JUtility/JUTAssert.h @@ -3,7 +3,7 @@ #include "dolphin/os.h" -#ifdef DEBUG +#if DEBUG #define JUT_SHOW_ASSERT(LINE, COND) JUTAssertion::showAssert(JUTAssertion::getSDevice(), __FILE__, LINE, #COND) #define JUT_ASSERT(LINE, COND) \ diff --git a/include/SSystem/SComponent/c_cc_s.h b/include/SSystem/SComponent/c_cc_s.h index 471f2c169a..b82cd29a33 100644 --- a/include/SSystem/SComponent/c_cc_s.h +++ b/include/SSystem/SComponent/c_cc_s.h @@ -15,14 +15,14 @@ public: /* 0x0400 */ cCcD_Obj* mpObjTg[0x300]; /* 0x1000 */ cCcD_Obj* mpObjCo[0x100]; /* 0x1400 */ cCcD_Obj* mpObj[0x500]; -#ifdef DEBUG +#if DEBUG /* 0x2800 */ int m_debug_code; #endif /* 0x2800 */ u16 mObjAtCount; /* 0x2802 */ u16 mObjTgCount; /* 0x2804 */ u16 mObjCoCount; /* 0x2806 */ u16 mObjCount; -#ifdef DEBUG +#if DEBUG /* 0x280C */ u16 field_0x280c; /* 0x280E */ u16 field_0x280e; /* 0x2810 */ u16 field_0x2810; diff --git a/include/Z2AudioLib/Z2SeqMgr.h b/include/Z2AudioLib/Z2SeqMgr.h index c200fdd73b..eadb0e0675 100644 --- a/include/Z2AudioLib/Z2SeqMgr.h +++ b/include/Z2AudioLib/Z2SeqMgr.h @@ -198,7 +198,7 @@ public: JAISoundHandle* getMainBgmHandle() { return &mMainBgmHandle; } JAISoundHandle* getSubBgmHandle() { return &mSubBgmHandle; } - #ifdef DEBUG + #if DEBUG f32 field_0x00_debug; u8 field_0x04_debug; #endif diff --git a/include/d/actor/d_a_alink.h b/include/d/actor/d_a_alink.h index a010fcca58..84eb80f610 100644 --- a/include/d/actor/d_a_alink.h +++ b/include/d/actor/d_a_alink.h @@ -211,7 +211,7 @@ struct daAlink_WlAnmData { class daAlinkHIO_data_c : public JORReflexible { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_data_c(); ~daAlinkHIO_data_c(); @@ -220,13 +220,13 @@ public: void baseCopy(); void update(); -#ifdef DEBUG +#if DEBUG virtual void listenPropertyEvent(const JORPropertyEvent* event); #endif #endif public: -#ifdef DEBUG +#if DEBUG /* 0x04 */ int m_anm_num; /* 0x08 */ int m_u8_num; /* 0x0C */ int m_s16_num; @@ -278,7 +278,7 @@ public: class daAlinkHIO_basic_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_basic_c(); ~daAlinkHIO_basic_c() {} @@ -286,7 +286,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_basic_c1 m; #endif }; @@ -329,7 +329,7 @@ public: class daAlinkHIO_move_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_move_c(); ~daAlinkHIO_move_c() {} @@ -337,7 +337,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_move_c1 m; #endif }; @@ -375,7 +375,7 @@ public: class daAlinkHIO_noActAtnMove_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_noActAtnMove_c(); ~daAlinkHIO_noActAtnMove_c() {} @@ -383,7 +383,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_noActAtnMove_c1 m; #endif }; @@ -417,7 +417,7 @@ public: class daAlinkHIO_frontRoll_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_frontRoll_c(); ~daAlinkHIO_frontRoll_c() {} @@ -425,7 +425,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_frontRoll_c1 m; #endif }; @@ -447,7 +447,7 @@ public: class daAlinkHIO_backJump_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_backJump_c(); ~daAlinkHIO_backJump_c() {} @@ -455,7 +455,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_backJump_c1 m; #endif }; @@ -481,7 +481,7 @@ public: class daAlinkHIO_sideStep_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_sideStep_c(); ~daAlinkHIO_sideStep_c() {} @@ -489,7 +489,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_sideStep_c1 m; #endif }; @@ -519,7 +519,7 @@ public: class daAlinkHIO_slide_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_slide_c(); ~daAlinkHIO_slide_c() {} @@ -527,7 +527,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_slide_c1 m; #endif }; @@ -565,7 +565,7 @@ public: class daAlinkHIO_atnMove_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_atnMove_c(); ~daAlinkHIO_atnMove_c(); @@ -573,7 +573,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_atnMove_c1 m; #endif }; @@ -613,7 +613,7 @@ public: class daAlinkHIO_cutNormal_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_cutNormal_c(int, float); ~daAlinkHIO_cutNormal_c(); @@ -669,7 +669,7 @@ public: class daAlinkHIO_cutFinish_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_cutFinish_c(int, float); ~daAlinkHIO_cutFinish_c(); @@ -706,7 +706,7 @@ public: class daAlinkHIO_cutFnJU_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_cutFnJU_c(); ~daAlinkHIO_cutFnJU_c(); @@ -714,7 +714,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_cutFnJU_c1 m; #endif }; // Size: 0x88 @@ -743,7 +743,7 @@ public: class daAlinkHIO_cutDash_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_cutDash_c(int, float); ~daAlinkHIO_cutDash_c(); @@ -775,7 +775,7 @@ public: class daAlinkHIO_cutJump_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_cutJump_c(); ~daAlinkHIO_cutJump_c(); @@ -783,7 +783,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_cutJump_c1 m; #endif }; // Size: 0x78 @@ -826,7 +826,7 @@ public: class daAlinkHIO_cutTurn_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_cutTurn_c(); ~daAlinkHIO_cutTurn_c(); @@ -834,7 +834,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_cutTurn_c1 m; #endif }; // Size: 0xCC @@ -869,7 +869,7 @@ public: class daAlinkHIO_hoCut_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_hoCut_c(int, float); ~daAlinkHIO_hoCut_c(); @@ -902,7 +902,7 @@ public: class daAlinkHIO_hoCutCharge_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_hoCutCharge_c(); ~daAlinkHIO_hoCutCharge_c(); @@ -910,7 +910,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_hoCutCharge_c1 m; #endif }; // Size: 0x88 @@ -936,7 +936,7 @@ public: class daAlinkHIO_cutDown_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_cutDown_c(); ~daAlinkHIO_cutDown_c(); @@ -944,7 +944,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_cutDown_c1 m; #endif }; // Size: 0xA8 @@ -972,7 +972,7 @@ public: class daAlinkHIO_cutHead_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_cutHead_c(); ~daAlinkHIO_cutHead_c(); @@ -980,7 +980,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_cutHead_c1 m; #endif }; // Size: 0x94 @@ -1009,7 +1009,7 @@ public: class daAlinkHIO_cutLargeJump_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_cutLargeJump_c(); ~daAlinkHIO_cutLargeJump_c(); @@ -1017,7 +1017,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_cutLargeJump_c1 m; #endif }; // Size: 0xA8 @@ -1086,7 +1086,7 @@ public: class daAlinkHIO_cut_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_cut_c(); ~daAlinkHIO_cut_c(); @@ -1096,7 +1096,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x034 */ daAlinkHIO_cutNormal_c mCutVertical; /* 0x08C */ daAlinkHIO_cutNormal_c mCutLeft; /* 0x0E4 */ daAlinkHIO_cutNormal_c mCutRight; @@ -1147,7 +1147,7 @@ public: class daAlinkHIO_guardAttack_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_guardAttack_c(int, float); ~daAlinkHIO_guardAttack_c(); @@ -1179,7 +1179,7 @@ public: class daAlinkHIO_turnMove_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_turnMove_c(); ~daAlinkHIO_turnMove_c(); @@ -1187,7 +1187,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_turnMove_c1 m; #endif }; @@ -1224,7 +1224,7 @@ public: class daAlinkHIO_guard_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_guard_c(); ~daAlinkHIO_guard_c(); @@ -1232,7 +1232,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x034 */ daAlinkHIO_guardAttack_c mAtPush; /* 0x090 */ daAlinkHIO_guardAttack_c mAtKick; /* 0x0EC */ daAlinkHIO_turnMove_c mTurnMove; @@ -1263,7 +1263,7 @@ public: class daAlinkHIO_crouch_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_crouch_c(); ~daAlinkHIO_crouch_c(); @@ -1271,7 +1271,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_crouch_c1 m; #endif }; @@ -1318,7 +1318,7 @@ public: class daAlinkHIO_autoJump_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_autoJump_c(); ~daAlinkHIO_autoJump_c(); @@ -1326,7 +1326,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_autoJump_c1 m; #endif }; @@ -1348,7 +1348,7 @@ public: class daAlinkHIO_smallJump_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_smallJump_c(); ~daAlinkHIO_smallJump_c(); @@ -1356,7 +1356,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_smallJump_c1 m; #endif }; @@ -1377,7 +1377,7 @@ public: class daAlinkHIO_wallCatch_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wallCatch_c(); ~daAlinkHIO_wallCatch_c(); @@ -1385,7 +1385,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wallCatch_c1 m; #endif }; @@ -1403,7 +1403,7 @@ public: class daAlinkHIO_wallFall_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wallFall_c(); ~daAlinkHIO_wallFall_c(); @@ -1411,7 +1411,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wallFall_c1 m; #endif }; @@ -1432,7 +1432,7 @@ public: class daAlinkHIO_wallMove_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wallMove_c(); ~daAlinkHIO_wallMove_c(); @@ -1440,7 +1440,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wallMove_c1 m; #endif }; @@ -1468,7 +1468,7 @@ public: class daAlinkHIO_wallHang_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wallHang_c(); ~daAlinkHIO_wallHang_c(); @@ -1476,7 +1476,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_smallJump_c mSmallJump; /* 0x00 */ daAlinkHIO_wallCatch_c mWallCatch; /* 0x00 */ daAlinkHIO_wallFall_c mWallFall; @@ -1515,7 +1515,7 @@ public: class daAlinkHIO_pushpull_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_pushpull_c(); ~daAlinkHIO_pushpull_c(); @@ -1523,7 +1523,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_pushpull_c1 m; #endif }; @@ -1549,7 +1549,7 @@ public: class daAlinkHIO_damNormal_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_damNormal_c(); ~daAlinkHIO_damNormal_c(); @@ -1557,7 +1557,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_damNormal_c1 m; #endif }; @@ -1593,7 +1593,7 @@ public: class daAlinkHIO_damLaHu_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_damLaHu_c(int); ~daAlinkHIO_damLaHu_c(); @@ -1601,7 +1601,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_damLaHu_c1 m; #endif }; @@ -1621,7 +1621,7 @@ public: class daAlinkHIO_damHorse_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_damHorse_c(); ~daAlinkHIO_damHorse_c(); @@ -1629,7 +1629,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_damHorse_c1 m; #endif }; @@ -1656,7 +1656,7 @@ public: class daAlinkHIO_damFall_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_damFall_c(); ~daAlinkHIO_damFall_c(); @@ -1664,7 +1664,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_damFall_c1 m; #endif }; @@ -1686,7 +1686,7 @@ public: class daAlinkHIO_damCaught_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_damCaught_c(); ~daAlinkHIO_damCaught_c(); @@ -1694,7 +1694,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_damCaught_c1 m; #endif }; @@ -1722,7 +1722,7 @@ public: class daAlinkHIO_damSwim_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_damSwim_c(); ~daAlinkHIO_damSwim_c(); @@ -1730,7 +1730,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_damSwim_c1 m; #endif }; @@ -1776,7 +1776,7 @@ public: class daAlinkHIO_damage_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_damage_c(); ~daAlinkHIO_damage_c(); @@ -1784,7 +1784,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_damage_c1 m; /* 0x34 */ daAlinkHIO_damNormal_c mDamNormal; /* 0x00 */ daAlinkHIO_damLaHu_c mDamLarge; @@ -1821,7 +1821,7 @@ public: class daAlinkHIO_horse_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_horse_c(); ~daAlinkHIO_horse_c(); @@ -1829,7 +1829,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_horse_c1 m; #endif }; @@ -1860,7 +1860,7 @@ public: class daAlinkHIO_canoe_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_canoe_c(); ~daAlinkHIO_canoe_c(); @@ -1868,7 +1868,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_canoe_c1 m; #endif }; @@ -1905,7 +1905,7 @@ public: class daAlinkHIO_bow_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_bow_c(); ~daAlinkHIO_bow_c(); @@ -1913,7 +1913,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_bow_c1 m; #endif }; @@ -1941,7 +1941,7 @@ public: class daAlinkHIO_boom_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_boom_c(); ~daAlinkHIO_boom_c(); @@ -1949,7 +1949,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_boom_c1 m; #endif }; @@ -1985,7 +1985,7 @@ public: class daAlinkHIO_bomb_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_bomb_c(); ~daAlinkHIO_bomb_c(); @@ -1993,7 +1993,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_bomb_c1 m; #endif }; @@ -2058,7 +2058,7 @@ public: class daAlinkHIO_light_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_light_c(int); ~daAlinkHIO_light_c(); @@ -2066,7 +2066,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_huLight_c1 m; #endif }; @@ -2094,7 +2094,7 @@ public: class daAlinkHIO_kandelaar_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_kandelaar_c(); ~daAlinkHIO_kandelaar_c(); @@ -2102,7 +2102,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_kandelaar_c1 m; #endif }; @@ -2133,7 +2133,7 @@ public: class daAlinkHIO_magneBoots_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_magneBoots_c(); ~daAlinkHIO_magneBoots_c(); @@ -2141,7 +2141,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_magneBoots_c1 m; #endif }; @@ -2159,7 +2159,7 @@ public: class daAlinkHIO_fmChain_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_fmChain_c(); ~daAlinkHIO_fmChain_c(); @@ -2167,7 +2167,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_fmChain_c1 m; #endif }; @@ -2199,7 +2199,7 @@ public: class daAlinkHIO_hookshot_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_hookshot_c(); ~daAlinkHIO_hookshot_c(); @@ -2207,7 +2207,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_hookshot_c1 m; #endif }; @@ -2237,7 +2237,7 @@ public: class daAlinkHIO_spinner_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_spinner_c(); ~daAlinkHIO_spinner_c(); @@ -2245,7 +2245,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_spinner_c1 m; #endif }; @@ -2293,7 +2293,7 @@ public: class daAlinkHIO_ironBall_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_ironBall_c(); ~daAlinkHIO_ironBall_c(); @@ -2301,7 +2301,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_ironBall_c1 m; #endif }; @@ -2323,7 +2323,7 @@ public: class daAlinkHIO_copyRod_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_copyRod_c(); ~daAlinkHIO_copyRod_c(); @@ -2331,7 +2331,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_copyRod_c1 m; #endif }; @@ -2351,7 +2351,7 @@ public: class daAlinkHIO_pickUp_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_pickUp_c(); ~daAlinkHIO_pickUp_c(); @@ -2359,7 +2359,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_pickUp_c1 m; #endif }; @@ -2398,7 +2398,7 @@ public: class daAlinkHIO_board_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_board_c(); ~daAlinkHIO_board_c(); @@ -2406,7 +2406,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_board_c1 m; #endif }; @@ -2431,7 +2431,7 @@ public: class daAlinkHIO_bottle_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_bottle_c(); ~daAlinkHIO_bottle_c(); @@ -2439,7 +2439,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_bottle_c1 m; #endif }; @@ -2479,7 +2479,7 @@ public: class daAlinkHIO_item_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_item_c(); ~daAlinkHIO_item_c(); @@ -2487,7 +2487,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_bow_c mBow; /* 0x00 */ daAlinkHIO_boom_c mBoomerang; /* 0x00 */ daAlinkHIO_bomb_c mBomb; @@ -2538,7 +2538,7 @@ public: class daAlinkHIO_ladder_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_ladder_c(); ~daAlinkHIO_ladder_c(); @@ -2546,7 +2546,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_ladder_c1 m; #endif }; @@ -2578,7 +2578,7 @@ public: class daAlinkHIO_roofHang_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_roofHang_c(); ~daAlinkHIO_roofHang_c(); @@ -2586,7 +2586,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_roofHang_c1 m; #endif }; @@ -2616,7 +2616,7 @@ public: class daAlinkHIO_grab_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_grab_c(); ~daAlinkHIO_grab_c(); @@ -2624,7 +2624,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_grab_c1 m; #endif }; @@ -2691,7 +2691,7 @@ public: class daAlinkHIO_swim_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_swim_c(); ~daAlinkHIO_swim_c(); @@ -2699,7 +2699,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_swim_c1 m; #endif }; @@ -2767,7 +2767,7 @@ public: class daAlinkHIO_wlMove_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlMove_c(); ~daAlinkHIO_wlMove_c(); @@ -2775,7 +2775,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_wlMove_c1 m; #endif }; @@ -2810,7 +2810,7 @@ public: class daAlinkHIO_wlMoveNoP_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlMoveNoP_c(); ~daAlinkHIO_wlMoveNoP_c(); @@ -2818,7 +2818,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlMoveNoP_c1 m; #endif }; @@ -2849,7 +2849,7 @@ public: class daAlinkHIO_wlAtnMove_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlAtnMove_c(); ~daAlinkHIO_wlAtnMove_c(); @@ -2857,7 +2857,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlAtnMove_c1 m; #endif }; @@ -2881,7 +2881,7 @@ public: class daAlinkHIO_wlHowl_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlHowl_c(); ~daAlinkHIO_wlHowl_c(); @@ -2889,7 +2889,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlHowl_c1 m; #endif }; @@ -2915,7 +2915,7 @@ public: class daAlinkHIO_wlSideStep_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlSideStep_c(); ~daAlinkHIO_wlSideStep_c(); @@ -2923,7 +2923,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlSideStep_c1 m; #endif }; @@ -2945,7 +2945,7 @@ public: class daAlinkHIO_wlBackJump_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlBackJump_c(); ~daAlinkHIO_wlBackJump_c(); @@ -2953,7 +2953,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlBackJump_c1 m; #endif }; @@ -2990,7 +2990,7 @@ public: class daAlinkHIO_wlAutoJump_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlAutoJump_c(); ~daAlinkHIO_wlAutoJump_c(); @@ -2998,7 +2998,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlAutoJump_c1 m; #endif }; @@ -3019,7 +3019,7 @@ public: class daAlinkHIO_wlPush_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlPush_c(); ~daAlinkHIO_wlPush_c(); @@ -3027,7 +3027,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlPush_c1 m; #endif }; @@ -3055,7 +3055,7 @@ public: class daAlinkHIO_wlLie_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlLie_c(); ~daAlinkHIO_wlLie_c(); @@ -3063,7 +3063,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlLie_c1 m; #endif }; @@ -3094,7 +3094,7 @@ public: class daAlinkHIO_wlWallHang_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlWallHang_c(); ~daAlinkHIO_wlWallHang_c(); @@ -3102,7 +3102,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlWallHang_c1 m; #endif }; @@ -3126,7 +3126,7 @@ public: class daAlinkHIO_wlDamNormal_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlDamNormal_c(); ~daAlinkHIO_wlDamNormal_c(); @@ -3134,7 +3134,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlDamNormal_c1 m; #endif }; @@ -3166,7 +3166,7 @@ public: class daAlinkHIO_wlDamLaHu_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlDamLaHu_c(int); ~daAlinkHIO_wlDamLaHu_c(); @@ -3174,7 +3174,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlDamLaHu_c1 m; #endif }; @@ -3195,7 +3195,7 @@ public: class daAlinkHIO_wlDamCaught_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlDamCaught_c(); ~daAlinkHIO_wlDamCaught_c(); @@ -3203,7 +3203,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlDamCaught_c1 m; #endif }; @@ -3228,7 +3228,7 @@ public: class daAlinkHIO_wlDamFall_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlDamFall_c(); ~daAlinkHIO_wlDamFall_c(); @@ -3236,7 +3236,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlDamFall_c1 m; #endif }; @@ -3260,7 +3260,7 @@ public: class daAlinkHIO_wlDamage_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlDamage_c(); ~daAlinkHIO_wlDamage_c(); @@ -3268,7 +3268,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_wlDamage_c1 m; #endif /* 0x00 */ daAlinkHIO_wlDamNormal_c mNormal; @@ -3305,7 +3305,7 @@ public: class daAlinkHIO_wlSlide_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlSlide_c(); ~daAlinkHIO_wlSlide_c(); @@ -3313,7 +3313,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlSlide_c1 m; #endif }; @@ -3340,7 +3340,7 @@ public: class daAlinkHIO_wlRope_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlRope_c(); ~daAlinkHIO_wlRope_c(); @@ -3348,7 +3348,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlRope_c1 m; #endif }; @@ -3386,7 +3386,7 @@ public: class daAlinkHIO_wlAtWait_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlAtWait_c(int, float); ~daAlinkHIO_wlAtWait_c(); @@ -3413,7 +3413,7 @@ public: class daAlinkHIO_wlAtRoll_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlAtRoll_c(); ~daAlinkHIO_wlAtRoll_c(); @@ -3421,7 +3421,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_wlAtRoll_c1 m; #endif }; // Size: 0x54 @@ -3448,7 +3448,7 @@ public: class daAlinkHIO_wlAtNjump_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlAtNjump_c(); ~daAlinkHIO_wlAtNjump_c(); @@ -3456,7 +3456,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_wlAtNjump_c1 m; #endif }; // Size: 0x70 @@ -3489,7 +3489,7 @@ public: class daAlinkHIO_wlAtCjump_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlAtCjump_c(); ~daAlinkHIO_wlAtCjump_c(); @@ -3497,7 +3497,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_wlAtCjump_c1 m; #endif }; // Size: 0x98 @@ -3517,7 +3517,7 @@ public: class daAlinkHIO_wlAtLand_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlAtLand_c(); ~daAlinkHIO_wlAtLand_c(); @@ -3525,7 +3525,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_wlAtLand_c1 m; #endif }; // Size: 0x74 @@ -3553,7 +3553,7 @@ public: class daAlinkHIO_wlAtDown_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlAtDown_c(); ~daAlinkHIO_wlAtDown_c(); @@ -3561,7 +3561,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_wlAtDown_c1 m; #endif }; // Size: 0xD0 @@ -3590,7 +3590,7 @@ public: class daAlinkHIO_wlAtLock_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlAtLock_c(); ~daAlinkHIO_wlAtLock_c(); @@ -3598,7 +3598,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_wlAtLock_c1 m; #endif }; // Size: 0x88 @@ -3630,7 +3630,7 @@ public: class daAlinkHIO_wlAtBite_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlAtBite_c(); ~daAlinkHIO_wlAtBite_c(); @@ -3638,7 +3638,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_wlAtBite_c1 m; #endif }; // Size: 0x90 @@ -3675,7 +3675,7 @@ public: class daAlinkHIO_wlAttack_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlAttack_c(); ~daAlinkHIO_wlAttack_c(); @@ -3722,7 +3722,7 @@ public: class daAlinkHIO_wlPoint_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlPoint_c(); ~daAlinkHIO_wlPoint_c(); @@ -3730,7 +3730,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlPoint_c1 m; #endif }; @@ -3758,7 +3758,7 @@ public: class daAlinkHIO_wlChain_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlChain_c(); ~daAlinkHIO_wlChain_c(); @@ -3766,7 +3766,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlChain_c1 m; #endif }; @@ -3815,7 +3815,7 @@ public: class daAlinkHIO_wlSwim_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlSwim_c(); ~daAlinkHIO_wlSwim_c(); @@ -3823,7 +3823,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlSwim_c1 m; #endif }; @@ -3844,7 +3844,7 @@ public: class daAlinkHIO_wlGrab_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlGrab_c(); ~daAlinkHIO_wlGrab_c(); @@ -3852,7 +3852,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlGrab_c1 m; #endif }; @@ -3874,7 +3874,7 @@ public: class daAlinkHIO_wlBall_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlBall_c(); ~daAlinkHIO_wlBall_c(); @@ -3882,7 +3882,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlBall_c1 m; #endif }; @@ -3929,7 +3929,7 @@ public: class daAlinkHIO_wolf_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wolf_c(); ~daAlinkHIO_wolf_c(); @@ -3939,7 +3939,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_wlMove_c mWlMove; /* 0x00 */ daAlinkHIO_wlMoveNoP_c mWlMoveNoP; /* 0x00 */ daAlinkHIO_wlAtnMove_c mWlAtnMove; @@ -3965,7 +3965,7 @@ public: }; class daAlinkHIO_c -#ifdef DEBUG +#if DEBUG : public mDoHIO_entry_c #endif { @@ -3975,7 +3975,7 @@ public: void jumpStateUpdate(const cXyz*, const cXyz*, f32); void genMessage(JORMContext*); -#ifdef DEBUG +#if DEBUG void readFileData(char*); size_t makeFileOutData(char*, char*); void listenPropertyEvent(const JORPropertyEvent*); diff --git a/include/d/actor/d_a_demo00.h b/include/d/actor/d_a_demo00.h index 4bb1cf8a4a..57a574d0cf 100644 --- a/include/d/actor/d_a_demo00.h +++ b/include/d/actor/d_a_demo00.h @@ -87,7 +87,7 @@ public: /* 0x0568 */ cXyz field_0x568; /* 0x0574 */ csXyz field_0x574; - #ifdef DEBUG + #if DEBUG cXyz debug_field_0x570; csXyz debug_field_0x57c; #endif diff --git a/include/d/actor/d_a_e_yr.h b/include/d/actor/d_a_e_yr.h index 36a9e29c60..cf1c173f7a 100644 --- a/include/d/actor/d_a_e_yr.h +++ b/include/d/actor/d_a_e_yr.h @@ -77,7 +77,7 @@ public: /* 0x70C */ dBgS_AcchCir mAcchCir; /* 0x74C */ dBgS_ObjAcch mAcch; /* 0x924 */ u8 field_0x924; -#ifndef DEBUG +#if !DEBUG /* 0x928 */ f32 field_0x928; #endif /* 0x92C */ dCcD_Stts mStts; diff --git a/include/d/actor/d_a_npc_aru.h b/include/d/actor/d_a_npc_aru.h index b48a714e9e..7cdba1eff9 100644 --- a/include/d/actor/d_a_npc_aru.h +++ b/include/d/actor/d_a_npc_aru.h @@ -131,9 +131,7 @@ public: int bullRunning(void*); int skipFence(void*); int talk(void*); - #ifdef DEBUG int test(void*); - #endif daNpc_Aru_c( daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData, daNpcT_motionAnmData_c const* i_motionAnmData, diff --git a/include/d/actor/d_a_npc_cd.h b/include/d/actor/d_a_npc_cd.h index fc1e19ef1c..918a29e88a 100644 --- a/include/d/actor/d_a_npc_cd.h +++ b/include/d/actor/d_a_npc_cd.h @@ -54,7 +54,7 @@ struct daNpcCd_HIO_Jnt_c : public JORReflexible { virtual ~daNpcCd_HIO_Jnt_c() {} daNpcCd_HIO_Jnt_c() {} -#ifdef DEBUG +#if DEBUG void genMessage(JORMContext*); #endif @@ -66,7 +66,7 @@ struct daNpcCd_HIO_Child_c : public JORReflexible { virtual ~daNpcCd_HIO_Child_c() {} daNpcCd_HIO_Child_c() {} -#ifdef DEBUG +#if DEBUG void genMessage(JORMContext*); #endif @@ -91,7 +91,7 @@ public: daNpcCd_HIO_c(); virtual ~daNpcCd_HIO_c() {} -#ifdef DEBUG +#if DEBUG void genMessage(JORMContext*); #endif diff --git a/include/d/actor/d_a_npc_cdn3.h b/include/d/actor/d_a_npc_cdn3.h index 88e859acd5..c5ef9f9283 100644 --- a/include/d/actor/d_a_npc_cdn3.h +++ b/include/d/actor/d_a_npc_cdn3.h @@ -274,7 +274,7 @@ public: } void setCollision() { - #ifdef DEBUG + #if DEBUG mCyl.SetR(Cd2_HIO_cylR(m_type)); mCyl.SetH(Cd2_HIO_cylH(m_type)); #endif diff --git a/include/d/actor/d_a_npc_doc.h b/include/d/actor/d_a_npc_doc.h index 114bd9f749..286405d074 100644 --- a/include/d/actor/d_a_npc_doc.h +++ b/include/d/actor/d_a_npc_doc.h @@ -74,10 +74,8 @@ public: OS_REPORT("|%06d:%x|daNpc_Doc_c -> コンストラクト\n", g_Counter.mCounter0, this); } - #if DEBUG int test(void*); - #endif - + BOOL checkChangeJoint(int i_jointNo) { return i_jointNo == 4; } BOOL checkRemoveJoint(int i_jointNo) { return i_jointNo == 8; } s32 getBackboneJointNo() { return 1; } diff --git a/include/d/actor/d_a_npc_fairy.h b/include/d/actor/d_a_npc_fairy.h index 51b1434113..09bed565c5 100644 --- a/include/d/actor/d_a_npc_fairy.h +++ b/include/d/actor/d_a_npc_fairy.h @@ -196,9 +196,7 @@ public: BOOL setAction(actionFunc, int); int wait(int); int talk(int); - #if DEBUG int test(int); - #endif void AppearDemoCall(); void ReturnDemoCall(); void PresentDemoCall(); diff --git a/include/d/actor/d_a_npc_grmc.h b/include/d/actor/d_a_npc_grmc.h index 0bfcd52016..b0ffb6f6f7 100644 --- a/include/d/actor/d_a_npc_grmc.h +++ b/include/d/actor/d_a_npc_grmc.h @@ -13,13 +13,19 @@ * */ +#if DEBUG +#define NPC_GRMC_HIO_CLASS daNpc_grMC_HIO_c +#else +#define NPC_GRMC_HIO_CLASS daNpc_grMC_Param_c +#endif + struct daNpc_grMC_HIOParam { /* 0x0 */ daNpcT_HIOParam common; }; class daNpc_grMC_HIO_c : public mDoHIO_entry_c { public: - /* 0x8 */ daNpc_grMC_HIOParam param; + /* 0x8 */ daNpc_grMC_HIOParam m; }; class daNpc_grMC_Param_c { @@ -92,9 +98,7 @@ public: int tend(void*); int talk(void*); int shop(void*); - #ifdef DEBUG int test(void*); - #endif daNpc_grMC_c( daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData, daNpcT_motionAnmData_c const* i_motionAnmData, @@ -118,10 +122,7 @@ public: static cutFunc mCutList[1]; private: - #ifdef DEBUG - /* 0xFCC */ daNpc_grMC_HIO_c* mHIO; - #endif - /* 0x0F7C */ u8 field_0xf7c[0xf80 - 0xf7c]; + /* 0x0F7C */ NPC_GRMC_HIO_CLASS* mHIO; /* 0x0F80 */ dCcD_Cyl mCyl; /* 0x10BC */ u8 mType; /* 0x10C0 */ actionFunc mNextAction; diff --git a/include/d/actor/d_a_npc_grr.h b/include/d/actor/d_a_npc_grr.h index fd2384e358..642073e295 100644 --- a/include/d/actor/d_a_npc_grr.h +++ b/include/d/actor/d_a_npc_grr.h @@ -17,7 +17,7 @@ struct daNpc_grR_HIOParam { }; class daNpc_grR_HIO_c -#ifdef DEBUG +#if DEBUG : public mDoHIO_entry_c #endif { diff --git a/include/d/actor/d_a_npc_hoz.h b/include/d/actor/d_a_npc_hoz.h index 6122606a61..5234e1bdc2 100644 --- a/include/d/actor/d_a_npc_hoz.h +++ b/include/d/actor/d_a_npc_hoz.h @@ -91,9 +91,7 @@ public: virtual void evtOrder(); virtual int drawDbgInfo(); - #if DEBUG int test(void*); - #endif bool getGameStartFlag() { return mGameStartFlag; } void setPotBreakFlag() { mPotBreakFlag = true; } diff --git a/include/d/actor/d_a_npc_kasi_kyu.h b/include/d/actor/d_a_npc_kasi_kyu.h index 9f611831aa..45fb2d4359 100644 --- a/include/d/actor/d_a_npc_kasi_kyu.h +++ b/include/d/actor/d_a_npc_kasi_kyu.h @@ -20,7 +20,7 @@ struct daNpcKasiKyu_HIOParam { }; class daNpcKasiKyu_HIO_c -#ifdef DEBUG +#if DEBUG : public mDoHIO_entry_c #endif { diff --git a/include/d/actor/d_a_npc_kasi_mich.h b/include/d/actor/d_a_npc_kasi_mich.h index 1374717fc5..fbda43e3c6 100644 --- a/include/d/actor/d_a_npc_kasi_mich.h +++ b/include/d/actor/d_a_npc_kasi_mich.h @@ -20,7 +20,7 @@ struct daNpcKasiMich_HIOParam { }; class daNpcKasiMich_HIO_c -#ifdef DEBUG +#if DEBUG : public mDoHIO_entry_c #endif { diff --git a/include/d/actor/d_a_npc_kolin.h b/include/d/actor/d_a_npc_kolin.h index dede4e1b6c..1c6b9f2e4b 100644 --- a/include/d/actor/d_a_npc_kolin.h +++ b/include/d/actor/d_a_npc_kolin.h @@ -67,9 +67,7 @@ public: int follow(void*); int clothWait(void*); int talk(void*); -#if DEBUG int test(void*); -#endif daNpc_Kolin_c( daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData, daNpcT_motionAnmData_c const* i_motionAnmData, diff --git a/include/d/actor/d_a_npc_kolinb.h b/include/d/actor/d_a_npc_kolinb.h index dcf4d4744c..6cc9823437 100644 --- a/include/d/actor/d_a_npc_kolinb.h +++ b/include/d/actor/d_a_npc_kolinb.h @@ -115,9 +115,7 @@ public: int cutThankYou(int); int wait(void*); int talk(void*); -#if DEBUG int test(void*); -#endif daNpc_Kolinb_c( daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData, daNpcT_motionAnmData_c const* i_motionAnmData, diff --git a/include/d/actor/d_a_npc_pachi_besu.h b/include/d/actor/d_a_npc_pachi_besu.h index 0c6bfad3a7..fad0bdc9ab 100644 --- a/include/d/actor/d_a_npc_pachi_besu.h +++ b/include/d/actor/d_a_npc_pachi_besu.h @@ -61,9 +61,7 @@ public: BOOL setAction(actionFunc); BOOL wait(void*); BOOL talk(void*); - #ifdef DEBUG BOOL test(void*); - #endif BOOL _turn_to_link(s16); BOOL _turn_pos(cXyz const&); BOOL _turn_pos(cXyz const&, s16); diff --git a/include/d/actor/d_a_npc_saru.h b/include/d/actor/d_a_npc_saru.h index 21a12d85a7..f4e64d918f 100644 --- a/include/d/actor/d_a_npc_saru.h +++ b/include/d/actor/d_a_npc_saru.h @@ -22,7 +22,7 @@ class daNpc_Saru_Param_c : public JORReflexible { public: virtual ~daNpc_Saru_Param_c() {} -#ifdef DEBUG +#if DEBUG void genMessage(JORMContext*); #endif @@ -129,7 +129,7 @@ public: static char* mCutNameList[4]; static cutFunc mCutList[4]; private: - #ifdef DEBUG + #if DEBUG /* 0xE90 */ daNpc_Saru_HIO_c* field_0xe90; #endif /* 0xE40 */ u8 field_0xe40[0xe44 - 0xe40]; diff --git a/include/d/actor/d_a_npc_seic.h b/include/d/actor/d_a_npc_seic.h index e08641bf22..3c6f5f3fe8 100644 --- a/include/d/actor/d_a_npc_seic.h +++ b/include/d/actor/d_a_npc_seic.h @@ -60,14 +60,14 @@ class daNpc_seiC_Param_c { }; class daNpc_seiC_HIO_c -#ifdef DEBUG +#if DEBUG : public mDoHIO_entry_c #endif { public: void genMessage(JORMContext*); - #ifdef DEBUG + #if DEBUG /* 0x08 */ daNpc_seiC_HIOParam field_0x8; /* 0x94 */ f32 field_0x94; // "強制会話距離" "Forced conversation distance" | Slider /* 0x98 */ f32 field_0x98; // "会話距離" "Conversation distance" | Slider diff --git a/include/d/actor/d_a_npc_seid.h b/include/d/actor/d_a_npc_seid.h index f3fc27ff27..43abdd2356 100644 --- a/include/d/actor/d_a_npc_seid.h +++ b/include/d/actor/d_a_npc_seid.h @@ -60,14 +60,14 @@ class daNpc_seiD_Param_c { }; class daNpc_seiD_HIO_c -#ifdef DEBUG +#if DEBUG : public mDoHIO_entry_c #endif { public: void genMessage(JORMContext*); - #ifdef DEBUG + #if DEBUG /* 0x08 */ daNpc_seiD_HIOParam field_0x8; // /* 0x94 */ f32 field_0x94; // "強制会話距離" "Forced conversation distance" | Slider // /* 0x98 */ f32 field_0x98; // "会話距離" "Conversation distance" | Slider diff --git a/include/d/actor/d_a_npc_taro.h b/include/d/actor/d_a_npc_taro.h index d2865ca686..cbbb9d44eb 100644 --- a/include/d/actor/d_a_npc_taro.h +++ b/include/d/actor/d_a_npc_taro.h @@ -55,7 +55,7 @@ class daNpc_Taro_Param_c { }; class daNpc_Taro_HIO_c -#ifdef DEBUG +#if DEBUG : public mDoHIO_entry_c #endif { diff --git a/include/d/actor/d_a_npc_tks.h b/include/d/actor/d_a_npc_tks.h index 75d3933b1d..ed8ee3f54f 100644 --- a/include/d/actor/d_a_npc_tks.h +++ b/include/d/actor/d_a_npc_tks.h @@ -28,7 +28,7 @@ struct daNpcTks_HIOParam { }; class daNpcTks_HIO_c -#ifdef DEBUG +#if DEBUG : public mDoHIO_entry_c #endif { diff --git a/include/d/actor/d_a_npc_toby.h b/include/d/actor/d_a_npc_toby.h index 607b2fb649..835767d6c2 100644 --- a/include/d/actor/d_a_npc_toby.h +++ b/include/d/actor/d_a_npc_toby.h @@ -90,9 +90,7 @@ public: int walk(void*); int play(void*); int talk(void*); -#if DEBUG int test(void*); -#endif daNpc_Toby_c( daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData, daNpcT_motionAnmData_c const* i_motionAnmData, diff --git a/include/d/actor/d_a_npc_ykm.h b/include/d/actor/d_a_npc_ykm.h index ae91298e31..558e21402d 100644 --- a/include/d/actor/d_a_npc_ykm.h +++ b/include/d/actor/d_a_npc_ykm.h @@ -249,9 +249,7 @@ public: BOOL cook(void*); BOOL race(void*); BOOL talk(void*); - #ifdef DEBUG BOOL test(void*); - #endif daNpc_ykM_c( daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData, daNpcT_motionAnmData_c const* i_motionAnmData, diff --git a/include/d/actor/d_a_npc_ykw.h b/include/d/actor/d_a_npc_ykw.h index cc53c2a0dc..770d452af2 100644 --- a/include/d/actor/d_a_npc_ykw.h +++ b/include/d/actor/d_a_npc_ykw.h @@ -75,9 +75,7 @@ public: int walk(void*); int race(void*); int talk(void*); -#if DEBUG int test(void*); -#endif daNpc_ykW_c(const daNpcT_faceMotionAnmData_c * param_0, const daNpcT_motionAnmData_c* param_1, const daNpcT_MotionSeqMngr_c::sequenceStepData_c* param_2, diff --git a/include/d/actor/d_a_npc_zelRo.h b/include/d/actor/d_a_npc_zelRo.h index 3fa60a9ad2..ebac8e8929 100644 --- a/include/d/actor/d_a_npc_zelRo.h +++ b/include/d/actor/d_a_npc_zelRo.h @@ -115,9 +115,7 @@ public: BOOL setAction(actionFunc); int wait(void*); int talk(void*); - #ifdef DEBUG int test(void*); - #endif daNpc_ZelRo_c( daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData, daNpcT_motionAnmData_c const* i_motionAnmData, diff --git a/include/d/actor/d_a_obj_bemos.h b/include/d/actor/d_a_obj_bemos.h index 7b3be1c0e9..51d5f3029f 100644 --- a/include/d/actor/d_a_obj_bemos.h +++ b/include/d/actor/d_a_obj_bemos.h @@ -123,7 +123,7 @@ public: void initActionDead(); void actionDead(); int Draw(); -#ifdef DEBUG +#if DEBUG /* 0x000000 */ void debugDraw(); #endif int Delete(); diff --git a/include/d/actor/d_a_obj_damCps.h b/include/d/actor/d_a_obj_damCps.h index 1ec3bcfca8..1ce75cc663 100644 --- a/include/d/actor/d_a_obj_damCps.h +++ b/include/d/actor/d_a_obj_damCps.h @@ -14,7 +14,7 @@ * */ class daObjDamCps_c : public fopAc_ac_c { -#ifdef DEBUG +#if DEBUG public: daObjDamCps_c() {}; void initBaseMtx(); diff --git a/include/d/actor/d_a_obj_fallobj.h b/include/d/actor/d_a_obj_fallobj.h index 2116d2eac4..52270b2bba 100644 --- a/include/d/actor/d_a_obj_fallobj.h +++ b/include/d/actor/d_a_obj_fallobj.h @@ -68,7 +68,7 @@ private: STATIC_ASSERT(sizeof(daObjFallObj_c) == 0x614); -#ifdef DEBUG +#if DEBUG class daObjFallObj_HIO_c : public mDoHIO_entry_c { public: daObjFallObj_HIO_c(); diff --git a/include/d/actor/d_a_obj_kbacket.h b/include/d/actor/d_a_obj_kbacket.h index 7ffce33504..4c4932d21e 100644 --- a/include/d/actor/d_a_obj_kbacket.h +++ b/include/d/actor/d_a_obj_kbacket.h @@ -22,12 +22,12 @@ struct daObj_KBacket_HIOParam }; class daObj_KBacket_HIO_c -#ifdef DEBUG +#if DEBUG : public mDoHIO_entry_c #endif { public: -#ifdef DEBUG +#if DEBUG void genMessage(JORMContext*); daObj_KBacket_HIOParam param; diff --git a/include/d/actor/d_a_obj_laundry_rope.h b/include/d/actor/d_a_obj_laundry_rope.h index deede25609..4dba2250dc 100644 --- a/include/d/actor/d_a_obj_laundry_rope.h +++ b/include/d/actor/d_a_obj_laundry_rope.h @@ -45,7 +45,7 @@ public: inline float getStartRate(cXyz* param_1); - #ifdef DEBUG + #if DEBUG const daObjLndRope_Hio_c* attr() const { return &M_Hio; }; diff --git a/include/d/actor/d_a_obj_lv6swturn.h b/include/d/actor/d_a_obj_lv6swturn.h index 3b6e6abac7..cf263b53bf 100644 --- a/include/d/actor/d_a_obj_lv6swturn.h +++ b/include/d/actor/d_a_obj_lv6swturn.h @@ -51,7 +51,7 @@ public: STATIC_ASSERT(sizeof(daObjLv6SwTurn_c) == 0x5cc); -#ifdef DEBUG +#if DEBUG class daObjLv6SwTurn_HIO_c : public mDoHIO_entry_c { public: daObjLv6SwTurn_HIO_c(); diff --git a/include/d/actor/d_a_obj_mie.h b/include/d/actor/d_a_obj_mie.h index 080c68f76d..a07ff24452 100644 --- a/include/d/actor/d_a_obj_mie.h +++ b/include/d/actor/d_a_obj_mie.h @@ -26,7 +26,7 @@ struct daObj_Mie_Param_c { }; class daObj_Mie_HIO_c -#ifdef DEBUG +#if DEBUG : public mDoHIO_entry_c #endif { diff --git a/include/d/actor/d_a_obj_swchain.h b/include/d/actor/d_a_obj_swchain.h index 028b827129..270fb8f5ab 100644 --- a/include/d/actor/d_a_obj_swchain.h +++ b/include/d/actor/d_a_obj_swchain.h @@ -117,7 +117,7 @@ private: /* 0xA9C */ u8 field_0xa9c; /* 0xA9D */ u8 field_0xa9d; /* 0xA9E */ u8 field_0xa9e; -#ifdef DEBUG +#if DEBUG /* 0xAA0 */ cXyz field_0xac0; #endif }; diff --git a/include/d/actor/d_a_obj_thdoor.h b/include/d/actor/d_a_obj_thdoor.h index b20f4a3a71..508b13573f 100644 --- a/include/d/actor/d_a_obj_thdoor.h +++ b/include/d/actor/d_a_obj_thdoor.h @@ -67,7 +67,7 @@ public: STATIC_ASSERT(sizeof(daObjThDoor_c) == 0x8c0); -#ifdef DEBUG +#if DEBUG class daObjThDoor_HIO_c : public mDoHIO_entry_c { public: daObjThDoor_HIO_c(); diff --git a/include/d/actor/d_a_obj_tobyhouse.h b/include/d/actor/d_a_obj_tobyhouse.h index 7df268b925..420a8ca278 100644 --- a/include/d/actor/d_a_obj_tobyhouse.h +++ b/include/d/actor/d_a_obj_tobyhouse.h @@ -79,7 +79,7 @@ public: STATIC_ASSERT(sizeof(daObjTobyHouse_c) == 0x600); -#ifdef DEBUG +#if DEBUG class daObjTobyHouse_HIO_c : public mDoHIO_entry_c { public: diff --git a/include/d/actor/d_a_obj_togeTrap.h b/include/d/actor/d_a_obj_togeTrap.h index 159afb645e..622d8226ca 100644 --- a/include/d/actor/d_a_obj_togeTrap.h +++ b/include/d/actor/d_a_obj_togeTrap.h @@ -68,7 +68,7 @@ public: daTogeTrap_HIO_c(); ~daTogeTrap_HIO_c() {} - #ifdef DEBUG + #if DEBUG void genMessage(JORMContext* ctx) { // Speed ctx->genLabel("--- 速 出現時---", 0, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); diff --git a/include/d/actor/d_a_obj_volcbom.h b/include/d/actor/d_a_obj_volcbom.h index 1aae1c0269..17f9db911d 100644 --- a/include/d/actor/d_a_obj_volcbom.h +++ b/include/d/actor/d_a_obj_volcbom.h @@ -131,7 +131,7 @@ private: STATIC_ASSERT(sizeof(daObjVolcBom_c) == 0xa1c); -#ifdef DEBUG +#if DEBUG class daObjVolcBom_HIO_c : public mDoHIO_entry_c { public: daObjVolcBom_HIO_c(); diff --git a/include/d/d_attention.h b/include/d/d_attention.h index 7c32803f68..5766b0b4df 100644 --- a/include/d/d_attention.h +++ b/include/d/d_attention.h @@ -45,7 +45,7 @@ private: class dAttParam_c : public JORReflexible { public: -#ifdef DEBUG +#if DEBUG /* 0x04 */ s8 mHIOChildNo; #endif @@ -66,7 +66,7 @@ public: /* 0x35 */ u8 mAttnCursorDisappearFrames; /* 0x38 */ f32 field_0x38; /* 0x3C */ f32 field_0x3c; -#ifdef DEBUG +#if DEBUG /* 0x44 */ s32 mDebugDispPosX; /* 0x48 */ s32 mDebugDispPosY; #endif @@ -75,7 +75,7 @@ public: dAttParam_c() {} dAttParam_c(s32); -#ifdef DEBUG +#if DEBUG void connectHIO(char* i_name) { mHIOChildNo = mDoHIO_CREATE_CHILD(i_name, this); } diff --git a/include/d/d_bg_s.h b/include/d/d_bg_s.h index d300226e3d..082723a828 100644 --- a/include/d/d_bg_s.h +++ b/include/d/d_bg_s.h @@ -66,7 +66,7 @@ u8 dKy_pol_sound_get(cBgS_PolyInfo const* param_0); class dBgS_HIO : public JORReflexible { public: -#ifdef DEBUG +#if DEBUG dBgS_HIO() { field_0x6 = 0; field_0x8 = 0; @@ -152,7 +152,7 @@ public: void DebugDrawPoly(dBgW_Base *param_1) {} fopAc_ac_c* GetActorPointer(cBgS_PolyInfo const& param_0) const { return cBgS::GetActorPointer(param_0); } bool LineCross(cBgS_LinChk* i_linChk) { - #ifdef DEBUG + #if DEBUG if (m_hio.ChkLineOff()) { return false; } @@ -173,7 +173,7 @@ public: #endif } f32 GroundCross(cBgS_GndChk* i_gndChk) { - #ifdef DEBUG + #if DEBUG if (m_hio.ChkCheckCounter()) { g_ground_counter++; } @@ -193,7 +193,7 @@ public: void ChkDeleteActorRegist(fopAc_ac_c*); -#ifdef DEBUG +#if DEBUG /* 0x1404 */ u8 field_0x1404[0x1408 - 0x1404]; /* 0x1408 */ dBgS_HIO m_hio; #endif diff --git a/include/d/d_bg_s_acch.h b/include/d/d_bg_s_acch.h index 208d838668..f5d7579c97 100644 --- a/include/d/d_bg_s_acch.h +++ b/include/d/d_bg_s_acch.h @@ -199,7 +199,7 @@ public: /* 0x02C */ u32 m_flags; /* 0x030 */ cXyz* pm_pos; /* 0x034 */ cXyz* pm_old_pos; -#ifdef DEBUG +#if DEBUG /* 0x038 */ cXyz unk_0x38; #endif /* 0x038 */ cXyz* pm_speed; @@ -227,7 +227,7 @@ public: /* 0x0CC */ f32 field_0xcc; /* 0x0D0 */ f32 m_wtr_chk_offset; /* 0x0D4 */ cBgS_PolyInfo* pm_out_poly_info; -#ifdef DEBUG +#if DEBUG /* 0x0E4 */ cXyz unk_0xe4; #endif /* 0x0D8 */ f32 field_0xd8; diff --git a/include/d/d_cc_s.h b/include/d/d_cc_s.h index 977a8ebc8e..2f9b475f70 100644 --- a/include/d/d_cc_s.h +++ b/include/d/d_cc_s.h @@ -65,7 +65,7 @@ public: // /* 0x0000 */ cCcS mCCcS; /* 0x284C */ dCcMassS_Mng mMass_Mng; -#ifdef DEBUG +#if DEBUG /* 0x2AD0 */ u8 field_0x2ad0; #endif }; // Size = 0x2AC4 diff --git a/include/d/d_event.h b/include/d/d_event.h index 2d364fe004..adc09de53d 100644 --- a/include/d/d_event.h +++ b/include/d/d_event.h @@ -128,7 +128,7 @@ public: u8 getMode() const { return mMode; } void onHindFlag(u16 flag) { mHindFlag |= flag; } - #ifdef DEBUG + #if DEBUG void offHindFlag(u16 flag) { mHindFlag &= (u16)~flag; } #else void offHindFlag(u16 flag) { mHindFlag &= ~flag; } diff --git a/include/d/d_event_debug.h b/include/d/d_event_debug.h index 41b679b321..45aab2267c 100644 --- a/include/d/d_event_debug.h +++ b/include/d/d_event_debug.h @@ -1,7 +1,6 @@ #ifndef D_EVENT_D_EVENT_DEBUG_H #define D_EVENT_D_EVENT_DEBUG_H -#ifdef DEBUG #include "JSystem/JHostIO/JORMContext.h" #include "d/d_event.h" @@ -171,6 +170,4 @@ struct dEvM_HIO_c : public JORReflexible { }; }; -#endif /* DEBUG */ - #endif /* D_EVENT_D_EVENT_DEBUG_H */ diff --git a/include/d/d_kankyo.h b/include/d/d_kankyo.h index db066bd583..0293f52344 100644 --- a/include/d/d_kankyo.h +++ b/include/d/d_kankyo.h @@ -259,7 +259,7 @@ public: /* 0x09B8 */ DUNGEON_LIGHT dungeonlight[8]; /* 0x0C18 */ BOSS_LIGHT field_0x0c18[8]; /* 0x0D58 */ BOSS_LIGHT field_0x0d58[6]; -#ifdef DEBUG +#if DEBUG /* 0x0E48 */ NAVYCHAN navy; /* 0x0E58 */ u8 field_0xe58[0xE68 - 0xE58]; // part of NAVYCHAN? #endif diff --git a/include/d/d_meter_HIO.h b/include/d/d_meter_HIO.h index a03302b0b6..8c0802c31b 100644 --- a/include/d/d_meter_HIO.h +++ b/include/d/d_meter_HIO.h @@ -587,7 +587,7 @@ public: #endif } - #ifdef DEBUG + #if DEBUG virtual void listenPropertyEvent(const JORPropertyEvent*); virtual void genMessage(JORMContext*); @@ -601,7 +601,7 @@ public: /* 0x000 */ // vtable /* 0x004 */ s8 field_0x4; - #ifdef DEBUG + #if DEBUG int field_0x8_debug; #endif /* 0x008 */ f32 mLifeTopPosX; @@ -1185,7 +1185,7 @@ public: }; // Size: 0x28 dMeter_fmapHIO_c(); -#ifdef DEBUG +#if DEBUG void update(); void createEvtCallBackObject(); void deleteEvtCallBackObject(); diff --git a/include/d/d_msg_flow.h b/include/d/d_msg_flow.h index 2807f4b877..edfce0ea8a 100644 --- a/include/d/d_msg_flow.h +++ b/include/d/d_msg_flow.h @@ -173,7 +173,7 @@ public: void initWord(fopAc_ac_c*, const char*, u8, int, fopAc_ac_c**); -#ifdef DEBUG +#if DEBUG void dbgPrint(); #endif diff --git a/include/d/d_resorce.h b/include/d/d_resorce.h index 3d00f861e6..db8efde952 100644 --- a/include/d/d_resorce.h +++ b/include/d/d_resorce.h @@ -52,7 +52,7 @@ private: /* 0x18 */ JKRHeap* heap; /* 0x1C */ JKRSolidHeap* mDataHeap; /* 0x20 */ void** mRes; -#ifdef DEBUG +#if DEBUG /* 0x24 */ void* unk_0x24; #endif }; // Size: 0x24 diff --git a/include/d/d_s_menu.h b/include/d/d_s_menu.h index 751ab970e0..a544c65576 100644 --- a/include/d/d_s_menu.h +++ b/include/d/d_s_menu.h @@ -6,7 +6,7 @@ class mDoDvdThd_toMainRam_c; -#ifdef DEBUG +#if DEBUG class myFontClass : public JUTResFont { public: myFontClass(const ResFONT* i_font, JKRHeap* i_heap) diff --git a/include/d/d_s_play.h b/include/d/d_s_play.h index d78fa1b5b3..d0137bcb2c 100644 --- a/include/d/d_s_play.h +++ b/include/d/d_s_play.h @@ -19,7 +19,7 @@ class dScnPly_reg_HIO_c : public JORReflexible { public: virtual ~dScnPly_reg_HIO_c() {} -#ifdef DEBUG +#if DEBUG void genMessage(JORMContext*); /* 0x4 */ s8 id; @@ -83,7 +83,7 @@ public: extern dScnPly_env_HIO_c g_envHIO; extern dScnPly_reg_HIO_c g_regHIO; -#ifdef DEBUG +#if DEBUG extern dScnPly_preset_HIO_c g_presetHIO; #endif @@ -95,7 +95,7 @@ extern dScnPly_preset_HIO_c g_presetHIO; * Float Reg(25-29) ... -1.0 - +1.0 */ -#ifdef DEBUG +#if DEBUG // Morita #define TREG_F(i) g_regHIO.mChildReg[0].mFloatReg[i] #define TREG_S(i) g_regHIO.mChildReg[0].mShortReg[i] diff --git a/include/d/d_s_play_env.h b/include/d/d_s_play_env.h index 2f0a28642e..f14e1f6ef3 100644 --- a/include/d/d_s_play_env.h +++ b/include/d/d_s_play_env.h @@ -8,13 +8,13 @@ public: virtual ~dScnPly_env_otherHIO_c() {} void genMessage(JORMContext*); - #ifdef DEBUG + #if DEBUG /* 0x04 */ s8 field_0x04; #endif /* 0x08 */ f32 mShadowDensity; - #ifdef DEBUG + #if DEBUG /* 0x0C */ f32 mCullFarValue; /* 0x10 */ f32 mRailSize; /* 0x14 */ s16 mRailColorR; @@ -28,7 +28,7 @@ public: /* 0x45 */ u8 field_0x45; /* 0x46 */ u8 mDisplayTransparentCyl; - #ifdef DEBUG + #if DEBUG /* 0x47 */ u8 mDisplayShadows; /* 0x48 */ u8 mDisplayShadowImage; /* 0x49 */ u8 mDisplayShadowPoly; diff --git a/include/d/d_stage.h b/include/d/d_stage.h index a6bd3e9d9f..43e3f7e3ad 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -1011,7 +1011,7 @@ public: /* 0x54 */ stage_tgsc_class* mDrTg; /* 0x58 */ stage_tgsc_class* mDoor; /* 0x5C */ dStage_FloorInfo_c* mFloorInfo; -#ifdef DEBUG +#if DEBUG /* 0x60 */ int field_0x60; #endif /* 0x60 */ u16 mPlayerNum; @@ -1092,7 +1092,7 @@ public: static void SetTimePass(int i_TimePass) { m_time_pass = i_TimePass; } static void setZoneNo(int, int); static dBgp_c* getBgp(int i_roomNo) { -#ifdef DEBUG +#if DEBUG // NONMATCHING #else return NULL; diff --git a/include/d/d_vibration.h b/include/d/d_vibration.h index 8443abf1d7..204f6e759c 100644 --- a/include/d/d_vibration.h +++ b/include/d/d_vibration.h @@ -88,7 +88,7 @@ public: static const vib_pattern CQ_patt[VIBMODE_Q_MAX]; private: -#ifdef DEBUG +#if DEBUG /* 0x00 */ dVibTest_c mVibTest; #endif diff --git a/include/dolphin/mtx.h b/include/dolphin/mtx.h index c818376fa3..da308658ab 100644 --- a/include/dolphin/mtx.h +++ b/include/dolphin/mtx.h @@ -85,7 +85,7 @@ void PSMTXScaleApply(const Mtx src, Mtx dst, f32 xS, f32 yS, f32 zS); void PSMTXQuat(Mtx m, const Quaternion* q); void PSMTXReflect(Mtx m, const Vec* p, const Vec* n); -#ifdef DEBUG +#if DEBUG #define MTXIdentity C_MTXIdentity #define MTXCopy C_MTXCopy #define MTXConcat C_MTXConcat @@ -145,7 +145,7 @@ void PSMTXMultVecArray(const Mtx m, const Vec* srcBase, Vec* dstBase, u32 count) void PSMTXMultVecSR(const Mtx m, const Vec* src, Vec* dst); void PSMTXMultVecArraySR(const Mtx m, const Vec* srcBase, Vec* dstBase, u32 count); -#ifdef DEBUG +#if DEBUG #define MTXMultVec C_MTXMultVec #define MTXMultVecArray C_MTXMultVecArray #define MTXMultVecSR C_MTXMultVecSR @@ -184,7 +184,7 @@ void PSMTX44RotRad(Mtx44 m, char axis, f32 rad); void PSMTX44RotTrig(Mtx44 m, char axis, f32 sinA, f32 cosA); void PSMTX44RotAxisRad(Mtx44 m, const Vec* axis, f32 rad); -#ifdef DEBUG +#if DEBUG #define MTX44Identity C_MTX44Identity #define MTX44Copy C_MTX44Copy #define MTX44Concat C_MTX44Concat @@ -234,7 +234,7 @@ void PSMTX44MultVecArray(const Mtx44 m, const Vec* srcBase, Vec* dstBase, u32 co void PSMTX44MultVecSR(const Mtx44 m, const Vec* src, Vec* dst); void PSMTX44MultVecArraySR(const Mtx44 m, const Vec* srcBase, Vec* dstBase, u32 count); -#ifdef DEBUG +#if DEBUG #define MTX44MultVec C_MTX44MultVec #define MTX44MultVecArray C_MTX44MultVecArray #define MTX44MultVecSR C_MTX44MultVecSR @@ -287,7 +287,7 @@ void PSVECCrossProduct(const Vec* a, const Vec* b, Vec* axb); f32 PSVECSquareDistance(const Vec* a, const Vec* b); f32 PSVECDistance(const Vec* a, const Vec* b); -#ifdef DEBUG +#if DEBUG #define VECAdd C_VECAdd #define VECSubtract C_VECSubtract #define VECScale C_VECScale @@ -338,7 +338,7 @@ void PSQUATNormalize(const Quaternion* src, Quaternion* unit); void PSQUATInverse(const Quaternion* src, Quaternion* inv); void PSQUATDivide(const Quaternion* p, const Quaternion* q, Quaternion* r); -#ifdef DEBUG +#if DEBUG #define QUATAdd C_QUATAdd #define QUATSubtract C_QUATSubtract #define QUATMultiply C_QUATMultiply diff --git a/include/dolphin/os.h b/include/dolphin/os.h index ac0df7b59e..fdac723bf2 100644 --- a/include/dolphin/os.h +++ b/include/dolphin/os.h @@ -208,7 +208,7 @@ DECL_WEAK void OSReportForceEnableOff(void); DECL_WEAK void OSReportForceEnableOn(void); DECL_WEAK void OSVReport(const char* format, va_list list); -#ifdef DEBUG +#if DEBUG #define OS_REPORT(...) OSReport(__VA_ARGS__) #define OS_WARNING(...) OSReport_Warning(__VA_ARGS__) #define OS_REPORT_ERROR(...) OSReport_Error(__VA_ARGS__) @@ -261,7 +261,7 @@ extern int __OSInIPL; #define LINE(l0, l1, l2) (l2) #endif -#ifdef DEBUG +#if DEBUG #define ASSERTLINE(line, cond) \ ((cond) || (OSPanic(__FILE__, line, "Failed assertion " #cond), 0)) diff --git a/include/f_ap/f_ap_game.h b/include/f_ap/f_ap_game.h index 0d3c80ed88..618caed84f 100644 --- a/include/f_ap/f_ap_game.h +++ b/include/f_ap/f_ap_game.h @@ -139,7 +139,11 @@ inline void fapGmHIO_set2Ddraw(u8 param_0) { } inline u8 fapGmHIO_get2Ddraw() { + #if DEBUG return g_HIO.mDisplay2D; + #else + return TRUE; + #endif } inline void fapGmHIO_offPrint() { @@ -151,7 +155,11 @@ inline void fapGmHIO_onPrint() { } inline u8 fapGmHIO_getParticle() { + #if DEBUG return g_HIO.mDisplayParticle; + #else + return TRUE; + #endif } #if PLATFORM_WII || PLATFORM_SHIELD diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index 8122b42fb7..648196b870 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -64,7 +64,7 @@ enum fopAc_Cull_e { fopAc_CULLBOX_11_e, fopAc_CULLBOX_12_e, fopAc_CULLBOX_13_e, -#ifdef DEBUG +#if DEBUG fopAc_CULLBOX_14_e, #endif fopAc_CULLBOX_CUSTOM_e, @@ -76,7 +76,7 @@ enum fopAc_Cull_e { fopAc_CULLSPHERE_5_e, fopAc_CULLSPHERE_6_e, fopAc_CULLSPHERE_7_e, -#ifdef DEBUG +#if DEBUG fopAc_CULLSPHERE_8_e, #endif fopAc_CULLSPHERE_CUSTOM_e, diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index b71590829e..955da52ad1 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -83,7 +83,7 @@ struct fopAcM_search_prm { struct fOpAcm_HIO_entry_c : public mDoHIO_entry_c { virtual ~fOpAcm_HIO_entry_c() {} - #ifdef DEBUG + #if DEBUG void removeHIO(const fopAc_ac_c* i_this) { removeHIO(*i_this); } void removeHIO(const fopAc_ac_c& i_this) { removeHIO(i_this.base); } void removeHIO(const leafdraw_class& i_this) { removeHIO(i_this.base); } @@ -816,7 +816,7 @@ inline void fopAcM_effSmokeSet2(u32* param_0, u32* param_1, cXyz const* param_2, inline void fopAcM_setWarningMessage_f(const fopAc_ac_c* i_actor, const char* i_filename, int i_line, const char* i_msg, ...) { -#ifdef DEBUG +#if DEBUG /* va_list args; va_start(args, i_msg); @@ -834,7 +834,7 @@ void fopAcM_showAssert_f(const fopAc_ac_c*, const char*, int, const char*, ...); #define fopAcM_assert(line, actor, COND, msg) \ (COND) ? (void)0 : (fopAcM_showAssert_f(actor, __FILE__, line, msg)); -#ifdef DEBUG +#if DEBUG #define fopAcM_setWarningMessage(i_actor, i_filename, i_line, i_msg) \ fopAcM_setWarningMessage_f(i_actor, i_filename, i_line, i_msg) #else diff --git a/include/f_pc/f_pc_debug_sv.h b/include/f_pc/f_pc_debug_sv.h index d7c942faa5..78a1d98b3e 100644 --- a/include/f_pc/f_pc_debug_sv.h +++ b/include/f_pc/f_pc_debug_sv.h @@ -4,7 +4,7 @@ #include <dolphin.h> -#ifdef DEBUG +#if DEBUG char* fpcDbSv_getNameString(s16 i_name); diff --git a/include/f_pc/f_pc_node_req.h b/include/f_pc/f_pc_node_req.h index c2058fbe8d..bc446b4c6e 100644 --- a/include/f_pc/f_pc_node_req.h +++ b/include/f_pc/f_pc_node_req.h @@ -36,7 +36,7 @@ typedef struct node_create_request { /* 0x58 */ s16 name; /* 0x5C */ void* data; /* 0x60 */ s16 unk_0x60; -#ifdef DEBUG +#if DEBUG /* 0x64 */ int unk_0x64; /* 0x68 */ int unk_0x68; #endif diff --git a/include/f_pc/f_pc_stdcreate_req.h b/include/f_pc/f_pc_stdcreate_req.h index d393afafcb..94d30ba83d 100644 --- a/include/f_pc/f_pc_stdcreate_req.h +++ b/include/f_pc/f_pc_stdcreate_req.h @@ -14,7 +14,7 @@ typedef struct standard_create_request_class { /* 0x54 */ void* process_append; /* 0x58 */ stdCreateFunc create_post_method; /* 0x5C */ void* unk_0x5C; -#ifdef DEBUG +#if DEBUG /* 0x60 */ int unk_0x60; #endif } standard_create_request_class; diff --git a/include/global.h b/include/global.h index dbd2d613bf..42990950e1 100644 --- a/include/global.h +++ b/include/global.h @@ -27,6 +27,11 @@ #define REGION_KOR (VERSION == VERSION_WII_KOR) #define REGION_CHN (VERSION == VERSION_SHIELD || VERSION == VERSION_SHIELD_PROD || VERSION == VERSION_SHIELD_DEBUG) +// define DEBUG if it isn't already so it can be used in conditions +#ifndef DEBUG +#define DEBUG 0 +#endif + #define ARRAY_SIZE(o) (s32)(sizeof(o) / sizeof(o[0])) #define ARRAY_SIZEU(o) (sizeof(o) / sizeof(o[0])) diff --git a/include/m_Do/m_Do_hostIO.h b/include/m_Do/m_Do_hostIO.h index f8b9519db4..7eecfbb87e 100644 --- a/include/m_Do/m_Do_hostIO.h +++ b/include/m_Do/m_Do_hostIO.h @@ -26,7 +26,7 @@ public: class mDoHIO_entry_c : public JORReflexible { public: -#ifdef DEBUG +#if DEBUG mDoHIO_entry_c(); void entryHIO(const char* i_name); void removeHIO(); @@ -73,7 +73,7 @@ void mDoHIO_updateChild(s8 i_no); void mDoHIO_deleteChild(s8 i_no); s8 mDoHIO_createChild(const char*, JORReflexible*); -#ifdef DEBUG +#if DEBUG #define mDoHIO_CREATE_CHILD(i_name, i_node) mDoHIO_createChild(i_name, i_node) #define mDoHIO_DELETE_CHILD(i_no) mDoHIO_deleteChild(i_no) #else diff --git a/include/m_Do/m_Do_main.h b/include/m_Do/m_Do_main.h index f005c5c9d7..1229687094 100644 --- a/include/m_Do/m_Do_main.h +++ b/include/m_Do/m_Do_main.h @@ -62,7 +62,7 @@ private: }; struct mDoMain { -#ifdef DEBUG +#if DEBUG static int argument; static int e3menu_no; static u32 archiveHeapSize; diff --git a/include/revolution/mtx.h b/include/revolution/mtx.h index bb1051f696..b6687e0c52 100644 --- a/include/revolution/mtx.h +++ b/include/revolution/mtx.h @@ -82,7 +82,7 @@ void PSMTXScaleApply(const Mtx src, Mtx dst, f32 xS, f32 yS, f32 zS); void PSMTXQuat(Mtx m, const Quaternion* q); void PSMTXReflect(Mtx m, const Vec* p, const Vec* n); -#ifdef DEBUG +#if DEBUG #define MTXIdentity C_MTXIdentity #define MTXCopy C_MTXCopy #define MTXConcat C_MTXConcat @@ -142,7 +142,7 @@ void PSMTXMultVecArray(const Mtx m, const Vec* srcBase, Vec* dstBase, u32 count) void PSMTXMultVecSR(const Mtx m, const Vec* src, Vec* dst); void PSMTXMultVecArraySR(const Mtx m, const Vec* srcBase, Vec* dstBase, u32 count); -#ifdef DEBUG +#if DEBUG #define MTXMultVec C_MTXMultVec #define MTXMultVecArray C_MTXMultVecArray #define MTXMultVecSR C_MTXMultVecSR @@ -181,7 +181,7 @@ void PSMTX44RotRad(Mtx44 m, char axis, f32 rad); void PSMTX44RotTrig(Mtx44 m, char axis, f32 sinA, f32 cosA); void PSMTX44RotAxisRad(Mtx44 m, const Vec* axis, f32 rad); -#ifdef DEBUG +#if DEBUG #define MTX44Identity C_MTX44Identity #define MTX44Copy C_MTX44Copy #define MTX44Concat C_MTX44Concat @@ -231,7 +231,7 @@ void PSMTX44MultVecArray(const Mtx44 m, const Vec* srcBase, Vec* dstBase, u32 co void PSMTX44MultVecSR(const Mtx44 m, const Vec* src, Vec* dst); void PSMTX44MultVecArraySR(const Mtx44 m, const Vec* srcBase, Vec* dstBase, u32 count); -#ifdef DEBUG +#if DEBUG #define MTX44MultVec C_MTX44MultVec #define MTX44MultVecArray C_MTX44MultVecArray #define MTX44MultVecSR C_MTX44MultVecSR @@ -284,7 +284,7 @@ void PSVECCrossProduct(const Vec* a, const Vec* b, Vec* axb); f32 PSVECSquareDistance(const Vec* a, const Vec* b); f32 PSVECDistance(const Vec* a, const Vec* b); -#ifdef DEBUG +#if DEBUG #define VECAdd C_VECAdd #define VECSubtract C_VECSubtract #define VECScale C_VECScale @@ -335,7 +335,7 @@ void PSQUATNormalize(const Quaternion* src, Quaternion* unit); void PSQUATInverse(const Quaternion* src, Quaternion* inv); void PSQUATDivide(const Quaternion* p, const Quaternion* q, Quaternion* r); -#ifdef DEBUG +#if DEBUG #define QUATAdd C_QUATAdd #define QUATSubtract C_QUATSubtract #define QUATMultiply C_QUATMultiply diff --git a/include/revolution/os.h b/include/revolution/os.h index 626c85d2f9..fd8d94e106 100644 --- a/include/revolution/os.h +++ b/include/revolution/os.h @@ -231,7 +231,7 @@ DECL_WEAK void OSVReport(const char* format, va_list list); DECL_WEAK void OSSwitchFiberEx(u32, u32, u32, u32, u32, u32); -#ifdef DEBUG +#if DEBUG #define OS_REPORT(...) OSReport(__VA_ARGS__) #define OS_WARNING(...) OSReport_Warning(__VA_ARGS__) #define OS_REPORT_ERROR(...) OSReport_Error(__VA_ARGS__) @@ -279,7 +279,7 @@ extern OSTime __OSStartTime; extern int __OSInIPL; extern BOOL __OSInReboot; -#ifdef DEBUG +#if DEBUG #define ASSERTLINE(line, cond) \ ((cond) || (OSPanic(__FILE__, line, "Failed assertion " #cond), 0)) |