mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-29 23:27:25 -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/JSystem/J2DGraph/J2DPictureEx.cpp
+1
View File
@@ -1006,6 +1006,7 @@ bool J2DPictureEx::getBlackWhite(JUtility::TColor* black, JUtility::TColor* whit
*white = 0xffffffff;
if (bVar1) {
// possible fakematch?
#if DEBUG || VERSION == VERSION_WII_USA_R0 || VERSION == VERSION_WII_USA_R2
J2DGXColorS10 tevColor0 = *mMaterial->getTevBlock()->getTevColor(0);
J2DGXColorS10 tevColor1 = *mMaterial->getTevBlock()->getTevColor(1);
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++)
src/d/actor/d_a_alink_cut.inc
-5
View File
@@ -155,17 +155,12 @@ bool daAlink_c::checkCutTurnInput() const {
return 0xF800 < abs(field_0x3180);
}
// Debug version is correct, but breaks other versions due no longer inlining
int daAlink_c::getCutTurnDirection() const {
#if VERSION == VERSION_SHIELD_DEBUG
if (field_0x3180 < 0) {
return 1;
} else {
return 0;
}
#else
return field_0x3180 < 0;
#endif
}
void daAlink_c::resetCombo(int param_0) {
src/d/actor/d_a_e_fb.cpp
+2 -2
View File
@@ -120,7 +120,7 @@ int daE_FB_c::JointCallBack(J3DJoint* i_joint, int param_1) {
return 1;
}
#if VERSION == VERSION_SHIELD_DEBUG
#if DEBUG
static f32 dummy_117095() {
// For rodata ordering in the debug version, this must be put here:
return 100.0f;
@@ -818,7 +818,7 @@ void daE_FB_c::dead_eff_set() {
}
}
#if VERSION == VERSION_SHIELD_DEBUG
#if DEBUG
static char* dummy_117771() {
return "Delete -> E_FB(id=%d)\n";
}
src/d/actor/d_a_e_kr.cpp
+5 -4
View File
@@ -2106,16 +2106,17 @@ static int daE_Kr_Execute(e_kr_class* i_this) {
unkFloat1 = 5.0f + TREG_F(14);
}
#if VERSION == VERSION_SHIELD_DEBUG
#if PLATFORM_GCN
cLib_addCalc2(&i_this->field_0x920, unkFloat1, 1.0f, 2.0f);
#endif
#if VERSION >= VERSION_WII_USA_R0
actor->current.pos.y = actor->current.pos.y - unkFloat1;
actor->old.pos.y = actor->old.pos.y - unkFloat1;
i_this->mAcch.CrrPos(dComIfG_Bgsp());
actor->current.pos.y = actor->current.pos.y + unkFloat1;
actor->old.pos.y = actor->old.pos.y + unkFloat1;
#else
cLib_addCalc2(&i_this->field_0x920, unkFloat1, 1.0f, 2.0f);
actor->current.pos.y = actor->current.pos.y - i_this->field_0x920;
actor->old.pos.y = actor->old.pos.y - i_this->field_0x920;
i_this->mAcch.CrrPos(dComIfG_Bgsp());
src/d/actor/d_a_e_sm2.cpp
+2 -2
View File
@@ -812,8 +812,8 @@ static u8 new_col_d[] = {
TYPE_GREEN, TYPE_BLUE, TYPE_PURPLE, TYPE_PURPLE, TYPE_PURPLE, TYPE_PURPLE, TYPE_RARE,
TYPE_BLUE, TYPE_RED, TYPE_PURPLE, TYPE_PURPLE, TYPE_PURPLE, TYPE_PURPLE, TYPE_RARE,
TYPE_PURPLE, TYPE_PURPLE, TYPE_BLUE,
// For some reason, the data differs here between retail and ShieldD?
#if VERSION == VERSION_SHIELD_DEBUG
// For some reason, the data differs here between GCN and Wii/Shield versions
#if VERSION >= VERSION_WII_USA_R0
TYPE_GREEN,
#else
TYPE_PURPLE,
src/d/actor/d_a_mg_rod.cpp
+5 -2
View File
@@ -5678,6 +5678,9 @@ static void play_camera_u(dmg_rod_class* i_this) {
static int dmg_rod_Execute(dmg_rod_class* i_this) {
fopAc_ac_c* actor = &i_this->actor;
//TODO: It seems possible that dComIfGs_getPalLanguage returns a constant value for non-PAL
// versions (causing the first block to be elided), and it's also possible that the value
// being compared against is an enum value with per-version definitions.
#if VERSION == VERSION_SHIELD_DEBUG
if (dComIfGs_getPalLanguage() == 1) {
data_804BBBD4 = 2;
@@ -5686,7 +5689,7 @@ static int dmg_rod_Execute(dmg_rod_class* i_this) {
}
#elif VERSION == VERSION_SHIELD
data_804BBBD4 = 0;
#elif REGION_PAL
#elif REGION_PAL || VERSION >= VERSION_WII_USA_R2
if (dComIfGs_getPalLanguage() == 0) {
data_804BBBD4 = 2;
} else {
@@ -6244,7 +6247,7 @@ static int dmg_rod_Create(fopAc_ac_c* i_this) {
}
#elif VERSION == VERSION_SHIELD
data_804BBBD4 = 0;
#elif REGION_PAL
#elif REGION_PAL || VERSION >= VERSION_WII_USA_R2
if (dComIfGs_getPalLanguage() == 0) {
data_804BBBD4 = 2;
} else {
src/d/actor/d_a_npc_kn_teach01.inc
+1 -1
View File
@@ -433,7 +433,7 @@ int daNpc_Kn_c::ECut_firstEncount(int i_idx) {
break;
case 10:
daPy_getPlayerActorClass()->changeDemoMoveAngle(fopAcM_searchPlayerAngleY(this) + 0x8000);
#if VERSION == VERSION_SHIELD_DEBUG
#if VERSION >= VERSION_WII_USA_R0
field_0xdec = 50;
#else
field_0xdec = 52;
src/d/actor/d_a_npc_prayer.cpp
+2 -2
View File
@@ -246,7 +246,7 @@ void daNpcPray_c::setParam() {
attention_info.distances[fopAc_attn_SPEAK_e] = getDistTableIdx(daNpcPray_Param_c::m.common.talk_distance, daNpcPray_Param_c::m.common.talk_angle);
attention_info.flags = (fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e);
#if VERSION == VERSION_SHIELD_DEBUG
#if DEBUG
scale.set(daNpcPray_Param_c::m.common.scale, daNpcPray_Param_c::m.common.scale, daNpcPray_Param_c::m.common.scale);
mAcchCir.SetWallR(daNpcPray_Param_c::m.common.width);
mAcchCir.SetWallH(daNpcPray_Param_c::m.common.knee_length);
@@ -291,7 +291,7 @@ void daNpcPray_c::setAttnPos() {
cyl_center.y = current.pos.y;
mCcCyl.SetC(cyl_center);
#if VERSION == VERSION_SHIELD_DEBUG
#if DEBUG
mCcCyl.SetH(daNpcPray_Param_c::m.common.height);
mCcCyl.SetR(daNpcPray_Param_c::m.common.width);
#endif
src/d/actor/d_a_npc_toby.cpp
+1 -1
View File
@@ -644,7 +644,7 @@ int daNpc_Toby_c::checkChangeEvt() {
break;
}
#if VERSION == VERSION_SHIELD_DEBUG
#if VERSION >= VERSION_WII_USA_R0
if (chkAttnZra() && !dComIfGs_isSaveSwitch(0x51))
#else
// 0x31E - F_0798 - Heard about Zora from Fyer
src/d/actor/d_a_obj_kago.cpp
+1 -1
View File
@@ -472,7 +472,7 @@ int daObj_Kago_c::Execute() {
int daObj_Kago_c::Draw() {
if(field_0xb9f == 0 && health != 3) {
#if VERSION == VERSION_SHIELD_DEBUG
#if DEBUG
mObjAcch.DrawWall(dComIfG_Bgsp());
#endif
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
src/d/actor/d_a_obj_tks.cpp
+2 -2
View File
@@ -789,7 +789,7 @@ void daObjTks_c::setParam() {
calcSpringF(&field_0xdcc, 0.7f, &field_0xdd0);
scale.setall(field_0xdcc);
#if VERSION == VERSION_SHIELD_DEBUG
#if DEBUG
mAcchCir.SetWallR(daObjTks_Param_c::m.common.width);
mAcchCir.SetWallH(daObjTks_Param_c::m.common.height);
#endif
@@ -858,7 +858,7 @@ void daObjTks_c::setAttnPos() {
if (!fopAcM_checkCarryNow(this)) {
mCcCyl.SetC(current.pos);
#if VERSION == VERSION_SHIELD_DEBUG
#if DEBUG
mCcCyl.SetH(daObjTks_Param_c::m.common.height);
mCcCyl.SetR(daObjTks_Param_c::m.common.width);
#endif
src/d/actor/d_a_obj_warp_kbrg.cpp
+2 -2
View File
@@ -202,7 +202,7 @@ int daObjWarpKBrg_c::CreateHeap() {
return 0;
}
#if VERSION == VERSION_SHIELD_DEBUG
#if DEBUG
pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName[getNameArg()], 15);
JUT_ASSERT(463, pbrk != NULL);
#endif
@@ -256,7 +256,7 @@ int daObjWarpKBrg_c::create1st() {
}
int daObjWarpKBrg_c::Execute(Mtx** param_0) {
#if VERSION == VERSION_SHIELD_DEBUG
#if DEBUG
calcMidnaWaitPos();
#endif
src/d/actor/d_a_obj_warp_obrg.cpp
+1 -1
View File
@@ -177,7 +177,7 @@ int daObjWarpOBrg_c::create1st() {
}
int daObjWarpOBrg_c::Execute(Mtx** param_0) {
#if VERSION == VERSION_SHIELD_DEBUG
#if DEBUG
calcMidnaWaitPos();
#endif
src/d/actor/d_a_spinner.cpp
+1 -1
View File
@@ -669,7 +669,7 @@ int daSpinner_c::execute() {
move_angle = (mDoCPd_c::getStickAngle3D(PAD_1) + 0x10000 + dCam_getControledAngleY(dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)))) - 0x8000;
#if VERSION == VERSION_SHIELD_DEBUG
#if PLATFORM_WII || VERSION == VERSION_SHIELD_DEBUG
if (dComIfG_getTrigB(PAD_1) && dComIfGp_getSelectItem(3) == fpcNm_ITEM_SPINNER) {
#else
if (dComIfG_getTrigA(PAD_1)) {
src/d/d_menu_letter.cpp
+2 -1
View File
@@ -164,7 +164,8 @@ dMenu_Letter_c::~dMenu_Letter_c() {
void dMenu_Letter_c::_create() {
mpDrawCursor = new dSelect_cursor_c(2, 1.0f, NULL);
JUT_ASSERT(231, mpDrawCursor != NULL);
#if VERSION == VERSION_SHIELD_DEBUG
// shield prod uses same values as GCN?
#if PLATFORM_WII || VERSION == VERSION_SHIELD_DEBUG
mpDrawCursor->setParam(1.01f, 0.85f, 0.02f, 0.5f, 0.5f);
#else
mpDrawCursor->setParam(1.06f, 0.9f, 0.02f, 0.4f, 0.4f);
src/d/d_msg_class.cpp
+1 -1
View File
@@ -4997,7 +4997,7 @@ void jmessage_string_tRenderingProcessor::do_widthcenter() {
scale = 1.0f;
scale = mDoGph_gInf_c::getScale();
#if VERSION == VERSION_SHIELD_DEBUG
#if VERSION >= VERSION_WII_USA_R0
for (; pane != NULL; pane = pane->getParentPane()) {
if (pane->getUserInfo() == 'n_43') {
scale = 1.0f;
src/d/d_save.cpp
+7 -7
View File
@@ -709,7 +709,7 @@ void dSv_player_item_record_c::init() {
}
void dSv_player_item_record_c::setBombNum(u8 i_bagIdx, u8 i_bombNum) {
#if VERSION == VERSION_SHIELD_DEBUG
#if DEBUG
if (i_bagIdx == 8) {
return;
}
@@ -989,10 +989,10 @@ void dSv_player_config_c::init() {
mAttentionType = 0;
mVibration = 1;
#if VERSION == VERSION_GCN_PAL
mLanguage = OSGetLanguage();
#elif VERSION == VERSION_SHIELD_DEBUG
#if DEBUG
mLanguage = SCGetLanguage();
#elif REGION_PAL || VERSION >= VERSION_WII_USA_R2
mLanguage = OSGetLanguage();
#else
mLanguage = 0;
#endif
@@ -1043,7 +1043,7 @@ u8 dSv_player_config_c::getPalLanguage() const {
case 4:
return LANGAUGE_ITALIAN;
}
#elif VERSION == VERSION_SHIELD_DEBUG
#elif VERSION >= VERSION_WII_USA_R0
switch (SCGetLanguage()) {
case 1:
return 0;
@@ -1298,7 +1298,7 @@ BOOL dSv_danBit_c::isItem(int i_no) const {
return mItem[i_no >> 5] & 1 << (i_no & 0x1F) ? TRUE : FALSE;
}
#if VERSION == VERSION_SHIELD_DEBUG
#if DEBUG
static void dummyString() {
DEAD_STRING("i_no < 6");
}
@@ -1449,7 +1449,7 @@ void dSv_info_c::init() {
initZone();
mTmp.init();
#if VERSION == VERSION_SHIELD_DEBUG
#if DEBUG
unk_0x0 = 0;
unk_0x1 = 0;
#endif
src/d/d_simple_model.cpp
+4 -4
View File
@@ -144,7 +144,7 @@ BOOL diff_model_c::create(J3DModelData* i_modelData, int roomNo, u8 drawBG) {
int result = mDoExt_adjustSolidHeapToSystem(mpHeap);
mRoomNo = roomNo;
mDrawBG = drawBG;
#if VERSION == VERSION_SHIELD_DEBUG
#if DEBUG
field_0x12 = 0;
#endif
return 1;
@@ -170,7 +170,7 @@ void diff_model_c::remove(int param_0) {
if (mCreateNum == 0 || param_0 != 0) {
if (mpHeap != NULL) {
#if VERSION == VERSION_SHIELD_DEBUG
#if DEBUG
if (field_0x12 != 0) {
JUT_WARN(510, "%s", "Simple Model Denger Remove !!\n");
}
@@ -196,11 +196,11 @@ void diff_model_c::draw() {
}
mDoExt_modelUpdateDL(mpModel);
dComIfGd_setList();
#if VERSION == VERSION_SHIELD_DEBUG
#if DEBUG
field_0x12 = 1;
#endif
} else {
#if VERSION == VERSION_SHIELD_DEBUG
#if DEBUG
field_0x12 = 0;
#endif
}
src/f_pc/f_pc_base.cpp
+15 -18
View File
@@ -13,10 +13,7 @@
#include "f_pc/f_pc_pause.h"
#include "f_pc/f_pc_profile.h"
#include "f_pc/f_pc_debug_sv.h"
#if VERSION == VERSION_SHIELD_DEBUG
#include "Z2AudioLib/Z2AudioMgr.h"
#endif
BOOL fpcBs_Is_JustOfType(int i_typeA, int i_typeB) {
if (i_typeB == i_typeA) {
@@ -94,21 +91,21 @@ int fpcBs_Delete(base_process_class* i_proc) {
i_proc->type = 0;
cMl::free(i_proc);
#if VERSION == VERSION_SHIELD_DEBUG
// JSUList<Z2SoundObjBase>* allList = Z2GetAudioMgr()->getAllList();
// for (JSUListIterator<Z2SoundObjBase> it(allList->getFirst()); it != allList->getEnd(); it++) {
// static JSULink<Z2SoundObjBase>* DUMMY_FILL_IT = NULL;
// static Z2SoundObjBase* DUMMY_FILL_P = NULL;
// if (it == DUMMY_FILL_IT || it.getObject() == DUMMY_FILL_P) {
// const char* stageName = dStage_getName2(profname, 0);
// if (stageName == NULL) {
// JUT_PANIC_F(341, "Sound Object Not Delete !! <%d>\n", profname);
// } else {
// JUT_PANIC_F(345, "Sound Object Not Delete !! <%s>\n", stageName);
// }
// }
// }
#if DEBUG
JSUList<Z2SoundObjBase>* allList = Z2GetAudioMgr()->getAllList();
for (JSUListIterator<Z2SoundObjBase> it(allList->getFirst()); it != allList->getEnd(); it++) {
static JSULink<Z2SoundObjBase>* DUMMY_FILL_IT = NULL;
static Z2SoundObjBase* DUMMY_FILL_P = NULL;
if (it == DUMMY_FILL_IT || it.getObject() == DUMMY_FILL_P) {
const char* stageName = dStage_getName2(profname, 0);
if (stageName == NULL) {
JUT_PANIC_F(341, "Sound Object Not Delete !! <%d>\n", profname);
} else {
JUT_PANIC_F(345, "Sound Object Not Delete !! <%s>\n", stageName);
}
}
}
#endif
}
}
src/m_Do/m_Do_ext.cpp
+1 -1
View File
@@ -665,7 +665,7 @@ JKRExpHeap* mDoExt_getZeldaHeap() {
return zeldaHeap;
}
#if VERSION == VERSION_SHIELD_DEBUG
#if DEBUG
s32 safeZeldaHeapSize = -1;
s32 mDoExt_getSafeZeldaHeapSize() {