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

Various debug conditional compilation cleanup (#2915)

Browse Source 
* Global: Define DEBUG as 0 if not already defined

* Clean up DEBUG-guarded code
This commit is contained in:
Max Roncace
2025-12-06 16:34:47 -05:00
committed by GitHub
parent 00e599304a
commit cf492884ea
316 changed files with 1133 additions and 1267 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/JAudio2/JASAiCtrl.cpp
+4 -4
View File
@@ -145,7 +145,7 @@ void JASDriver::updateDSP() {
JASProbe::start(3, "SFR-UPDATE");
JASDsp::invalChannelAll();
#ifdef DEBUG
#if DEBUG
JASDsp::dspMutex = 1;
#endif
@@ -160,7 +160,7 @@ void JASDriver::updateDSP() {
JUT_ASSERT(254, subFrame <= 10);
history[subFrame - r26] = r27;
if (subFrame != r26 && f32(history[0]) / r27 < 1.1f) {
#ifdef DEBUG
#if DEBUG
static int killCounter;
JASReport("kill DSP channel", killCounter);
JASDSPChannel::killActiveChannel();
@@ -173,7 +173,7 @@ void JASDriver::updateDSP() {
JASChannel::receiveBankDisposeMsg();
JASDSPChannel::updateAll();
#ifdef DEBUG
#if DEBUG
JASDsp::dspMutex = 0;
#endif
@@ -198,7 +198,7 @@ void JASDriver::readDspBuffer(s16* param_0, u32 param_1) {
for (int i = param_1; i < param_1 * 2; i++) {
sDspDacBuffer[sDspDacReadBuffer][i] = (s16)r24;
}
#ifdef DEBUG
#if DEBUG
JASReport("readDspBuffer nbuf:%d sWBuf:%d BCount:%d stat:%d", nbuf, sDspDacWriteBuffer,
data_804507A8, sDspStatus);
#endif
src/JSystem/JAudio2/JASDSPInterface.cpp
+1 -1
View File
@@ -659,6 +659,6 @@ u16 DSP_CreateMap2(u32 param_0) {
u32 JASWaveInfo::one = 1;
#ifdef DEBUG
#if DEBUG
s32 dspMutex = 1;
#endif
src/JSystem/JAudio2/JASHeapCtrl.cpp
+2 -6
View File
@@ -27,9 +27,7 @@ bool JASHeap::alloc(JASHeap* mother, u32 param_1) {
JUT_ASSERT(120, mother != NULL);
JASMutexLock lock(&mMutex);
if (isAllocated()) {
#ifdef DEBUG
OSReport("[JASHeap::alloc] すでにヒープは確保されています。初期化してからにしてください。\n");
#endif
OS_REPORT("[JASHeap::alloc] すでにヒープは確保されています。初期化してからにしてください。\n");
return 0;
}
if (!mother->isAllocated()) {
@@ -71,9 +69,7 @@ bool JASHeap::alloc(JASHeap* mother, u32 param_1) {
}
}
if (!local_43) {
#ifdef DEBUG
OSReport("[JASHeap::alloc] マザーメモリが足りないので確保できません。\n");
#endif
OS_REPORT("[JASHeap::alloc] マザーメモリが足りないので確保できません。\n");
return 0;
}
mother->insertChild(this, local_30, local_34, param_1, false);
src/JSystem/JKernel/JKRAramArchive.cpp
+1 -3
View File
@@ -143,9 +143,7 @@ cleanup:
JKRFreeToSysHeap(mem);
}
if (mMountMode == 0) {
#ifdef DEBUG
OSReport(":::[%s: %d] Cannot alloc memory\n", __FILE__, 415);
#endif
OS_REPORT(":::[%s: %d] Cannot alloc memory\n", __FILE__, 415);
if (mDvdFile != NULL) {
delete mDvdFile;
}
src/JSystem/JKernel/JKRCompArchive.cpp
+2 -4
View File
@@ -206,10 +206,8 @@ bool JKRCompArchive::open(s32 entryNum) {
{
JKRFreeToSysHeap(arcHeader);
}
if(mMountMode == 0) {
#ifdef DEBUG
OSReport(":::[%s: %d] Cannot alloc memory in mounting CompArchive\n", __FILE__, 567);
#endif
if (mMountMode == 0) {
OS_REPORT(":::[%s: %d] Cannot alloc memory in mounting CompArchive\n", __FILE__, 567);
if(mDvdFile != NULL) {
delete mDvdFile;
}
src/JSystem/JKernel/JKRDvdArchive.cpp
+1 -3
View File
@@ -127,9 +127,7 @@ cleanup:
}
if (mMountMode == UNKNOWN_MOUNT_MODE) {
#ifdef DEBUG
OSReport(":::Cannot alloc memory [%s][%d]\n", __FILE__, 397);
#endif
OS_REPORT(":::Cannot alloc memory [%s][%d]\n", __FILE__, 397);
if (mDvdFile) {
delete mDvdFile;
}
src/JSystem/JKernel/JKRHeap.cpp
+2 -4
View File
@@ -12,7 +12,7 @@
bool data_804508B0 = 1;
#ifdef DEBUG
#if DEBUG
u8 data_804508B1;
u8 data_804508B2;
u8 data_804508B3;
@@ -355,10 +355,8 @@ void JKRHeap::copyMemory(void* dst, void* src, u32 size) {
}
void JKRDefaultMemoryErrorRoutine(void* heap, u32 size, int alignment) {
#ifdef DEBUG
OSReport("Error: Cannot allocate memory %d(0x%x)byte in %d byte alignment from %08x\n", size,
OS_REPORT("Error: Cannot allocate memory %d(0x%x)byte in %d byte alignment from %08x\n", size,
size, alignment, heap);
#endif
JUTException::panic(__FILE__, 831, "abort\n");
}
src/JSystem/JKernel/JKRMemArchive.cpp
+1 -1
View File
@@ -94,7 +94,7 @@ bool JKRMemArchive::open(s32 entryNum, JKRArchive::EMountDirection mountDirectio
mIsOpen = true;
}
#ifdef DEBUG
#if DEBUG
if (mMountMode == 0) {
OSReport(":::Cannot alloc memory [%s][%d]\n", __FILE__, 460);
}
src/JSystem/JKernel/JKRSolidHeap.cpp
+2 -2
View File
@@ -73,7 +73,7 @@ s32 JKRSolidHeap::adjustSize(void) {
}
void* JKRSolidHeap::do_alloc(u32 size, int alignment) {
#ifdef DEBUG
#if DEBUG
// TODO(Julgodis): JUTAssertion::setConfirmMessage
/* if (alignment != 0) {
int u = abs(alignment);
@@ -179,7 +179,7 @@ void JKRSolidHeap::do_freeTail(void) {
}
void JKRSolidHeap::do_fillFreeArea() {
#ifdef DEBUG
#if DEBUG
// fillMemory(mSolidHead, mEnd - mSolidHead, (uint)DAT_8074a8ba);
#endif
}
src/JSystem/JKernel/JKRThread.cpp
+5 -9
View File
@@ -185,10 +185,10 @@ void JKRThreadSwitch::callback(OSThread* current, OSThread* next) {
next_heap = JKRHeap::getCurrentHeap();
} else if (JKRHeap::getRootHeap()->isSubHeap(next_heap)) {
continue;
#ifdef DEBUG
#if PLATFORM_WII || PLATFORM_SHIELD
} else if (!JKRHeap::getRootHeap2()->isSubHeap(next_heap)) {
continue;
#endif
#endif
} else {
switch (thread->getCurrentHeapError()) {
case 0:
@@ -224,10 +224,8 @@ void JKRThreadSwitch::draw(JKRThreadName_* thread_name_list, JUTConsole* console
const char* print_1 = " -------------------------------------\n";
if (!console) {
#ifdef DEBUG
OSReport(print_0, getTotalCount(), (int)this->field_0x18, this->field_0x10);
OSReport(print_1);
#endif
OS_REPORT(print_0, getTotalCount(), (int)this->field_0x18, this->field_0x10);
OS_REPORT(print_1);
} else {
console->clear();
console->print_f(print_0, getTotalCount(), (int)this->field_0x18, this->field_0x10);
@@ -264,10 +262,8 @@ void JKRThreadSwitch::draw(JKRThreadName_* thread_name_list, JUTConsole* console
u32 cost_int = (u32)(cost_per_0x18 * 100.0f);
u32 cost_float = (u32)(cost_per_0x18 * 1000.0f) % 10;
if (!console) {
#ifdef DEBUG
OSReport(" [%10s] switch:%5d cost:%2d.%d%%\n", thread_print_name, switch_count,
OS_REPORT(" [%10s] switch:%5d cost:%2d.%d%%\n", thread_print_name, switch_count,
cost_int, cost_float);
#endif
} else {
console->print_f(" [%10s] switch:%5d cost:%2d.%d%%\n", thread_print_name,
switch_count, cost_int, cost_float);
src/JSystem/JMessage/resource.cpp
+1 -1
View File
@@ -243,7 +243,7 @@ bool JMessage::TParse::parseBlock_next(const void** ppData_inout, u32* puData_ou
}
}
} else {
#ifdef DEBUG
#if DEBUG
JMessage::TResource* pResource = rcResource.Get_groupID(u16GroupID);
if (pResource != pResource_) {
JGADGET_WARNMSG1(444, "group-ID already exist : ", u16GroupID);
src/JSystem/JStudio/JStudio/functionvalue.cpp
+1 -1
View File
@@ -678,7 +678,7 @@ void TFunctionValue_list_parameter::data_set(const f32* pf, u32 u) {
dat1.set(pfData_);
dat2.set(&pfData_[uData_ * 2]);
dat3 = dat1;
#ifdef DEBUG
#if DEBUG
pfnUpdate_ = NULL;
#endif
}
src/JSystem/JStudio/JStudio_JStage/object-actor.cpp
+1 -1
View File
@@ -36,7 +36,7 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_prepare() {
void JStudio_JStage::TAdaptor_actor::adaptor_do_begin() {
adaptor_object_begin_();
const JStage::TActor* pActor = get_pJSG_();
#ifdef DEBUG
#if DEBUG
{ // This block is needed to match the stack in debug
const JStudio::TObject* pObject = adaptor_getObject();
JUT_ASSERT(72, pObject!=NULL);
src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm.h
+1 -1
View File
@@ -156,7 +156,7 @@ struct __copy_backward<T, true>
{
static T* copy_backward(T* first, T* last, T* result)
{
#ifdef DEBUG
#if DEBUG
size_t n = static_cast<size_t>(last - first);
result -= n;
memmove(result, first, n*sizeof(T));
src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h
+1 -1
View File
@@ -89,7 +89,7 @@ int __fpclassifyl(long double __value);
#define FLT_MAX_EXP 128
#define FLT_MAX_10_EXP 38
#ifdef DEBUG
#if DEBUG
#define FLT_MAX 3.4028235e38f
#define FLT_EPSILON 1.1920929e-7f
#else
src/Z2AudioLib/Z2EnvSeMgr.cpp
+3 -3
View File
@@ -4,7 +4,7 @@
#include "d/d_save.h"
#include "d/d_com_inf_game.h"
#ifdef DEBUG
#if DEBUG
static const char* sSpotName[] = {
"F_SP00",
"F_SP103",
@@ -1039,7 +1039,7 @@ void Z2EnvSeMgr::setHyrulSewerOpen(bool isSewerOpen) {
}
bool Z2EnvSeMgr::startRiverSe(s8 param_1) {
#ifdef DEBUG
#if DEBUG
const char** spotName = sSpotName;
#endif
@@ -1271,7 +1271,7 @@ void Z2EnvSeMgr::registEtcSePos(Vec* posPtr) {
}
bool Z2EnvSeMgr::startEtcSe(s8 reverb) {
#ifdef DEBUG
#if DEBUG
const char** spotName = sSpotName;
#endif
src/Z2AudioLib/Z2SeqMgr.cpp
+1 -1
View File
@@ -106,7 +106,7 @@ Z2SeqMgr::Z2SeqMgr() : JASGlobalInstance<Z2SeqMgr>(true) {
mAllBgmMaster.forceIn();
field_0xa4.forceIn();
#ifdef DEBUG
#if DEBUG
field_0x00_debug = 1.0f;
field_0x04_debug = 0;
#endif
src/d/actor/d_a_alink.cpp
+4 -4
View File
@@ -1690,7 +1690,7 @@ daAlinkHIO_c::daAlinkHIO_c() {}
daAlinkHIO_wolf_c::~daAlinkHIO_wolf_c() {}
#ifdef DEBUG
#if DEBUG
daAlinkHIO_swim_c::~daAlinkHIO_swim_c() {}
daAlinkHIO_grab_c::~daAlinkHIO_grab_c() {}
@@ -6573,10 +6573,10 @@ void daAlink_c::commonDoubleAnime(J3DAnmTransform* param_0, J3DAnmTransform* par
int daAlink_c::setDoubleAnime(f32 i_blendRate, f32 i_anmSpeedA, f32 i_anmSpeedB,
daAlink_c::daAlink_ANM i_anmA, daAlink_c::daAlink_ANM i_anmB,
int param_5, f32 i_morf) {
#ifdef DEBUG
#if DEBUG
if (checkWolf()) {
// "Player is Wolf, but setting Link animation\n"
OSReport("狼なのにリンクアニメ設定\n");
OS_REPORT("狼なのにリンクアニメ設定\n");
JUT_ASSERT(8591, FALSE);
}
#endif
@@ -10883,7 +10883,7 @@ int daAlink_c::orderZTalk() {
dMeter2Info_onUseButton(0x800);
if (midnaTalkTrigger()
#ifdef DEBUG
#if DEBUG
&& (!mDoCPd_c::getHoldL(PAD_1) || !mDoCPd_c::getHoldR(PAD_1))
#endif
)
src/d/actor/d_a_alink_HIO.inc
+1 -1
View File
@@ -7,7 +7,7 @@
#include "d/actor/d_a_alink.h"
#include "d/d_com_inf_game.h"
#ifdef DEBUG
#if DEBUG
static void daAlinkHIO_setAnmGenMessage(daAlinkHIO_anm_c* i_anmP, JORMContext* ctx, char* param_3,
f32 param_4, int param_5) {
src/d/actor/d_a_alink_demo.inc
+2 -2
View File
@@ -2145,7 +2145,7 @@ int daAlink_c::procCoGetItem() {
}
daItemBase_c* item_partner_p = (daItemBase_c*)fopAcM_getItemEventPartner(this);
#ifdef DEBUG
#if DEBUG
if (item_partner_p != NULL && fopAcM_GetName(item_partner_p) != PROC_ITEM &&
fopAcM_GetName(item_partner_p) != PROC_Demo_Item)
{
@@ -3603,7 +3603,7 @@ int daAlink_c::procNotUseItem() {
if (mProcVar3.field_0x300e != 0) {
daItemBase_c* item_partner_p = (daItemBase_c*)fopAcM_getItemEventPartner(this);
#ifdef DEBUG
#if DEBUG
if (item_partner_p != NULL && fopAcM_GetName(item_partner_p) != PROC_ITEM &&
fopAcM_GetName(item_partner_p) != PROC_Demo_Item)
{
src/d/actor/d_a_andsw.cpp
+11 -10
View File
@@ -8,7 +8,7 @@
#include "d/actor/d_a_andsw.h"
#include "d/d_procname.h"
#ifdef DEBUG
#if DEBUG
daAndsw_HIO_c l_HIO;
daAndsw_HIO_c::daAndsw_HIO_c() {
@@ -42,7 +42,7 @@ int daAndsw_c::create() {
return cPhs_ERROR_e;
}
#ifdef DEBUG
#if DEBUG
l_HIO.entryHIO("ＳＷ監視");
#endif
@@ -58,7 +58,7 @@ int daAndsw_c::execute() {
if (mTimer == 0) {
fopAcM_offSwitch(this,mSwNo);
#ifdef DEBUG
#if DEBUG
if (l_HIO.field_0x6 != 0) {
OS_REPORT("-- ＳＷ監視状態出力 --\n");
OS_REPORT("sw<%d>ＯＦＦしました\n", mSwNo);
@@ -70,19 +70,20 @@ int daAndsw_c::execute() {
OS_REPORT("ＳＷ監視：ＳＷＯＦＦしたので処理終わりますSW<%d>\n", mSwNo);
}
}
}
#ifdef DEBUG
else if (l_HIO.field_0x6 != 0) {
OS_REPORT("sw2<%d>を待っています\n", mSwNo2);
l_HIO.field_0x6 = 0;
}
} else {
#if DEBUG
if (l_HIO.field_0x6 != 0) {
OS_REPORT("sw2<%d>を待っています\n", mSwNo2);
l_HIO.field_0x6 = 0;
}
#endif
}
return 1;
}
int daAndsw_c::_delete() {
#ifdef DEBUG
#if DEBUG
l_HIO.removeHIO();
#endif
return 1;
src/d/actor/d_a_b_bh.cpp
+3 -8
View File
@@ -53,7 +53,7 @@ daB_BH_HIO_c::daB_BH_HIO_c() {
down_revive_time = 250;
}
#ifdef DEBUG
#if DEBUG
void daB_BH_HIO_c::genMessage(JORMContext* ctx) {
ctx->genLabel(" ボスデグババ手", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 512, 24);
ctx->genSlider("本体サイズ", &model_size, 0.0f, 5.0f, 0, NULL, 0xFFFF, 0xFFFF, 512, 24);
@@ -962,17 +962,12 @@ static void damage_check(b_bh_class* i_this) {
if (i_this->field_0xa24 != 0) {
i_this->mCcSph.OffCoSetBit();
if (fpcM_Search(s_b_sub, i_this)
#ifdef DEBUG
|| mDoCPd_c::getTrigA(PAD_3)
#endif
)
{
if (fpcM_Search(s_b_sub, i_this) || (DEBUG && mDoCPd_c::getTrigA(PAD_3))) {
if (i_this->field_0xa25 != 0) {
i_this->mAction = ACTION_B_BOMB_EAT;
dComIfGs_onOneZoneSwitch(14, -1);
} else {
#ifdef DEBUG
#if DEBUG
if (mDoCPd_c::getTrigA(PAD_3)) {
b_bq_class* var_r25 = (b_bq_class*)fopAcM_SearchByID(a_this->parentActorID);
var_r25->field_0x6fd = 1;
src/d/actor/d_a_b_bq.cpp
+1 -1
View File
@@ -564,7 +564,7 @@ static void b_bq_wait(b_bq_class* i_this) {
i_this->mSound.startCreatureVoice(Z2SE_EN_BQ_V_WAIT, -1);
}
#ifdef DEBUG
#if DEBUG
if (mDoCPd_c::getTrigRight(PAD_1)) {
i_this->mAction = ACTION_END;
i_this->mMode = 0;
src/d/actor/d_a_b_dr.cpp
+8 -8
View File
@@ -360,7 +360,7 @@ int daB_DR_c::draw() {
return 1;
}
#ifdef DEBUG
#if DEBUG
if (WREG_S(0) != 0 || l_HIO.display_range) {
cXyz sp24;
cXyz sp18;
@@ -1247,7 +1247,7 @@ void daB_DR_c::executeWait() {
cXyz sp20;
cXyz sp14;
#ifdef DEBUG
#if DEBUG
dDbVw_Report(30, 100, "wait tyuu No Attack Timer:%d ", mTimer[2]);
#endif
@@ -1311,7 +1311,7 @@ void daB_DR_c::executeFlyWait() {
fopAc_ac_c* player = dComIfGp_getPlayer(0);
cXyz sp8;
#ifdef DEBUG
#if DEBUG
if (mMoveMode > 1) {
if (mTimer[2] != 0) {
dDbVw_Report(30, 100, "wait tyuu No Attack Timer:%d ", mTimer[2]);
@@ -1383,7 +1383,7 @@ void daB_DR_c::executeTailHit() {
cXyz mae;
cXyz ato;
#ifdef DEBUG
#if DEBUG
if (mTimer[0] != 0) {
if (mMoveMode < 13) {
dDbVw_Report(30, 100, "Tail Hit chance Timer:%d ", mTimer[0]);
@@ -1734,7 +1734,7 @@ void daB_DR_c::executeWeekHit() {
daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
cXyz sp50;
#ifdef DEBUG
#if DEBUG
if (mTimer[2] != 0) {
dDbVw_Report(30, 100, "week HIT chance Timer:%d ", mTimer[2]);
}
@@ -2133,7 +2133,7 @@ void daB_DR_c::executeBreathAttack() {
s16 spA = 0;
bool sp8 = false;
#ifdef DEBUG
#if DEBUG
if (mTimer[3] != 0) {
if (mMoveMode < 100) {
dDbVw_Report(30, 100, "Breath tyuu No Attack Timer:%d ", mTimer[3]);
@@ -2366,7 +2366,7 @@ void daB_DR_c::executeWindAttack() {
bool sp8 = 0;
#ifdef DEBUG
#if DEBUG
dDbVw_Report(30, 100, "normal Timer:%d center Timer:%d ", mTimer[1], mTimer[2]);
#endif
@@ -2900,7 +2900,7 @@ void daB_DR_c::executePillarSearch() {
}
void daB_DR_c::executePillarWait() {
#ifdef DEBUG
#if DEBUG
dDbVw_Report(30, 100, "Pole wait tyuu Timer:%d ", mTimer[0]);
if (mTimer[1] != 0) {
dDbVw_Report(30, 100, "sukosi zensin :%d ", mTimer[1]);
src/d/actor/d_a_b_gm.cpp
+3 -4
View File
@@ -171,8 +171,7 @@ static daB_GM_HIO_c l_HIO;
static int daB_GM_Draw(b_gm_class* i_this) {
fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
#ifdef DEBUG
# else
#if !DEBUG
g_env_light.settingTevStruct(0, &a_this->current.pos, &a_this->tevStr);
#endif
@@ -187,7 +186,7 @@ static int daB_GM_Draw(b_gm_class* i_this) {
}
J3DModel* model = i_this->mpModelMorf->getModel();
#ifdef DEBUG
#if DEBUG
g_env_light.settingTevStruct(0, &a_this->current.pos, &a_this->tevStr);
#endif
g_env_light.setLightTevColorType_MAJI(model, &a_this->tevStr);
@@ -1618,7 +1617,7 @@ static int daB_GM_Execute(b_gm_class* i_this) {
fopAc_ac_c* player = dComIfGp_getPlayer(0);
cXyz spD4, spC8;
#ifdef DEBUG
#if DEBUG
if (mDoCPd_c::getTrigA(2) && i_this->mDemoMode == 0 && !i_this->mIsDisappear) {
i_this->mAction = 0xB;
i_this->mMode = 0x14;
src/d/actor/d_a_b_gnd.cpp
+1 -1
View File
@@ -2525,7 +2525,7 @@ static void action(b_gnd_class* i_this) {
i_this->field_0xc7d = 0;
}
#ifdef DEBUG
#if DEBUG
if (mDoCPd_c::getTrigR(PAD_2)) {
dScnKy_env_light_c* kankyo = dKy_getEnvlight();
kankyo->wether = 1;
src/d/actor/d_a_b_ob.cpp
+1 -1
View File
@@ -416,7 +416,7 @@ static void core_start(b_ob_class* i_this) {
}
break;
case 1:
#ifdef DEBUG
#if DEBUG
if (mDoCPd_c::getTrigY(PAD_2)) {
i_this->mMode = 2;
i_this->mDemoAction = 30;
src/d/actor/d_a_bd.cpp
+1 -1
View File
@@ -68,7 +68,7 @@ daBd_HIO_c::daBd_HIO_c() {
field_0x1E = 0;
}
#ifdef DEBUG
#if DEBUG
/* daBd_HIO_c::genMessage (JORMContext *) */
void daBd_HIO_c::genMessage(JORMContext* mctx) {
mctx->genLabel("小鳥", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 24);
src/d/actor/d_a_bg.cpp
+1 -1
View File
@@ -399,7 +399,7 @@ int daBg_c::draw() {
break;
}
#ifdef DEBUG
#if DEBUG
sp50.a = 0xFF;
if (g_kankyoHIO.navy.fish_pond_colreg_adjust_ON) {
sp50 = g_kankyoHIO.navy.fish_pond_colreg_c0;
src/d/actor/d_a_canoe.cpp
+2 -2
View File
@@ -15,7 +15,7 @@
#include "JSystem/JAudio2/JAUSectionHeap.h"
#include "Z2AudioLib/Z2Instances.h"
#ifdef DEBUG
#if DEBUG
static BOOL l_debugMode;
#endif
@@ -616,7 +616,7 @@ int daCanoe_c::execute() {
mOldFrontPos = mFrontPos;
mOldBackPos = mBackPos;
#ifdef DEBUG
#if DEBUG
if (player->checkCanoeRideOwn(this) && daAlink_c::checkDebugMoveInput()) {
if (l_debugMode) {
l_debugMode = FALSE;
src/d/actor/d_a_coach_2D.cpp
+3 -3
View File
@@ -156,7 +156,7 @@ int daCoach2D_c::create() {
return cPhs_ERROR_e;
}
#ifdef DEBUG
#if DEBUG
l_HOSTIO.entryHIO("馬車アイコン");
#endif
}
@@ -166,7 +166,7 @@ int daCoach2D_c::create() {
int daCoach2D_c::destroy() {
dComIfG_resDelete(this, l_arcName);
#ifdef DEBUG
#if DEBUG
l_HOSTIO.removeHIO();
#endif
@@ -186,7 +186,7 @@ int daCoach2D_c::draw() {
}
int daCoach2D_c::execute() {
#ifdef DEBUG
#if DEBUG
s32 freeSize = mDoExt_getCurrentHeap()->getTotalFreeSize();
#endif
src/d/actor/d_a_demo00.cpp
+7 -7
View File
@@ -18,7 +18,7 @@
#include "Z2AudioLib/Z2Instances.h"
#include "m_Do/m_Do_lib.h"
#include "d/actor/d_a_movie_player.h"
#ifdef DEBUG
#if DEBUG
#include "d/d_debug_viewer.h"
#endif
@@ -40,7 +40,7 @@ static UnknownLightData l_lightData = {
0x00000000,
};
#ifndef DEBUG
#if !DEBUG
// TODO: what is this?
static const u8 lit_3727[0xC] = {};
#endif
@@ -113,7 +113,7 @@ void daDemo00_c::setBaseMtx() {
if (tevStr.mInitTimer == 1) {
field_0x574 = shape_angle;
#ifdef DEBUG
#if DEBUG
debug_field_0x570 = current.pos;
debug_field_0x57c = shape_angle;
#endif
@@ -388,7 +388,7 @@ int daDemo00_c::createHeap() {
return 0;
}
#ifdef DEBUG
#if DEBUG
mModel.field_0x5d4->getBaseTRMtx()[0][0] = 1.0f;
#endif
mModel.field_0x5d4->calc();
@@ -1725,7 +1725,7 @@ int daDemo00_c::draw() {
}
}
#ifdef DEBUG
#if DEBUG
if (field_0x6aa > -1) {
dDbVw_Report(0x32, 0x91, "DEMOTOOL ERR : Model ga arunoni hisyakai sindo meirei!!!!");
OSReport_Error("\nDEMOTOOL ERR : Model ga arunoni hisyakai sindo meirei!!!!");
@@ -1754,7 +1754,7 @@ int daDemo00_c::draw() {
g_env_light.mDemoAttentionPoint = -1.0f;
}
#ifdef DEBUG
#if DEBUG
dDbVw_Report(300, 0x19, "DEMO Depth %f", g_env_light.mDemoAttentionPoint);
#endif
} else {
@@ -1769,7 +1769,7 @@ int daDemo00_c::draw() {
g_env_light.field_0x1278 = 1.0f;
}
#ifdef DEBUG
#if DEBUG
dDbVw_Report(10, 0x17C, "\nbloom pat[%d] ratio[%f]", g_env_light.field_0x1278, field_0x6ab);
#endif
}
src/d/actor/d_a_demo_item.cpp
+1 -1
View File
@@ -20,7 +20,7 @@ static cXyz l_wolf_offset = cXyz(13.0f, 135.0f, 57.0f);
static cXyz l_horse_offset = cXyz(0.0f, 20.0f, 54.0f);
#ifdef DEBUG
#if DEBUG
class DitemHIO_c
: public mDoHIO_entry_c
src/d/actor/d_a_e_df.cpp
+1 -1
View File
@@ -23,7 +23,7 @@ public:
STATIC_ASSERT(sizeof(daE_DF_HIO_c) == 0xC);
#ifdef DEBUG
#if DEBUG
inline void daE_DF_HIO_c::genMessage(JORMContext* i_ctx) {
i_ctx->genLabel("デクレシア", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
i_ctx->genSlider("速度", &field_0x8, 0.0f, 100.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
src/d/actor/d_a_e_fm.cpp
+1 -1
View File
@@ -2581,7 +2581,7 @@ static void action(e_fm_class* i_this) {
i_this->mAngleToPlayer = fopAcM_searchPlayerAngleY(actor);
#ifdef DEBUG
#if DEBUG
if (mDoCPd_c::getTrigStart(PAD_2) && i_this->mAction != ACTION_DOWN) {
i_this->mAction = ACTION_DOWN;
i_this->mMode = 0;
src/d/actor/d_a_e_mb.cpp
+1 -1
View File
@@ -47,7 +47,7 @@ daE_MB_HIO_c::daE_MB_HIO_c() {
reappear_time = 70;
}
#ifdef DEBUG
#if DEBUG
void daE_MB_HIO_c::genMessage(JORMContext* ctx) {
ctx->genLabel(" ボス戦ブーメラン猿", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 512, 24);
ctx->genSlider("基本サイズ", &base_size, 0.0f, 5.0f, 0, NULL, 0xFFFF, 0xFFFF, 512, 24);
src/d/actor/d_a_e_nz.cpp
+1 -1
View File
@@ -68,7 +68,7 @@ daE_NZ_HIO_c::daE_NZ_HIO_c() {
mVanishingAlphaSpeed = 30.0f;
}
#ifdef DEBUG
#if DEBUG
void daE_NZ_HIO_c::genMessage(JORMContext* ctx) {
// Ghost Rat
ctx->genLabel(" 幽霊ネズミ", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
src/d/actor/d_a_e_pz.cpp
-2
View File
@@ -89,7 +89,6 @@ int daE_PZ_c::draw() {
}
if (arg0 == 10) {
#ifdef DEBUG
if (WREG_S(0) != 0) {
GXColor color;
color.r = 0xFF;
@@ -98,7 +97,6 @@ int daE_PZ_c::draw() {
color.a = 0xFA;
dDbVw_drawCircleXlu(home.pos, 100.0f, color, TRUE, 12);
}
#endif
return 1;
}
src/d/actor/d_a_e_wb.cpp
+1 -1
View File
@@ -82,7 +82,7 @@ daE_WB_HIO_c::daE_WB_HIO_c() {
mNoReins = 0;
}
#ifdef DEBUG
#if DEBUG
void daE_WB_HIO_c::genMessage(JORMContext* ctx) {
ctx->genLabel(" イノシシ", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 512, 24);
ctx->genSlider("基本サイズ", &base_size, 0.0f, 5.0f, 0, NULL, 0xFFFF, 0xFFFF, 512, 24);
src/d/actor/d_a_e_ww.cpp
+2 -2
View File
@@ -163,7 +163,7 @@ daE_WW_HIO_c::daE_WW_HIO_c() {
move_range_debug_display = 0;
}
#ifdef DEBUG
#if DEBUG
void daE_WW_HIO_c::genMessage(JORMContext* mctx) {
mctx->genLabel("ホワイトウルフォス", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 24);
mctx->genSlider("モデルサイズ", &model_size, 0.0f, 10.0f, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 24);
@@ -245,7 +245,7 @@ void daE_WW_c::setHeadAngle() {
int daE_WW_c::draw() {
if (mAction == ACTION_MASTER) {
#ifdef DEBUG
#if DEBUG
if (l_HIO.move_range_debug_display != 0) {
cXyz curr_pos = current.pos;
curr_pos.y += 100.0f;
src/d/actor/d_a_e_yd.cpp
+1 -1
View File
@@ -942,7 +942,7 @@ static void kuki_ha_set(e_yd_class* i_this) {
mDoMtx_stack_c::YrotM(rot->y);
mDoMtx_stack_c::XrotM(rot->x);
mDoMtx_stack_c::ZrotM(i << 13);
#ifdef DEBUG
#if DEBUG
if (i_this->actor.current.pos.x == 1.0f &&
i_this->actor.current.pos.y == 1.0f &&
i_this->actor.current.pos.z == 1.0f) {
src/d/actor/d_a_e_yh.cpp
+1 -1
View File
@@ -36,7 +36,7 @@ daE_YH_HIO_c::daE_YH_HIO_c() {
mAttackFreq = 30;
}
#ifdef DEBUG
#if DEBUG
void daE_YH_HIO_c::genMessage(JORMContext* ctx) {
ctx->genLabel(" デグババ", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
ctx->genSlider("基本サイズ", &mBasicSize, 0.0f, 5.0f, 0, NULL, 0xffff, 0xffff, 0x200,
src/d/actor/d_a_e_yk.cpp
+1 -1
View File
@@ -57,7 +57,7 @@ static u8 data_80807EF8;
static daE_YK_HIO_c l_HIO;
#ifdef DEBUG
#if DEBUG
void daE_YK_HIO_c::genMessage(JORMContext* ctx) {
ctx->genLabel("闇キース", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 512, 24);
ctx->genSlider("基本サイズ", &mModelScale, 0.0f, 3.0f, 0, NULL, 0xFFFF, 0xFFFF, 0x512, 24);
src/d/actor/d_a_e_ym.cpp
+2 -6
View File
@@ -929,9 +929,7 @@ void daE_YM_c::executeDown() {
} else {
gravity = 0.0f;
}
#if DEBUG
OSReport("YM executeDown %d %f %f \n", gnd_cross, current.pos.z, mMode);
#endif
OS_REPORT("YM executeDown %d %f %f \n", gnd_cross, current.pos.z, mMode);
field_0x6cf = 0;
switch (mMode) {
case 0:
@@ -3355,10 +3353,8 @@ int daE_YM_c::create() {
field_0x6a3 = (current.angle.x & 0xff00) >> 8;
if (mSwitchBit != 0xFF && dComIfGs_isSwitch(mSwitchBit, fopAcM_GetRoomNo(this))) {
#ifdef DEBUG
// E_YM won't reset because it's already been defeated.
OSReport("E_YM やられ後なので再セットしません\n");
#endif
OS_REPORT("E_YM やられ後なので再セットしません\n");
return cPhs_ERROR_e;
}
src/d/actor/d_a_e_zh.cpp
+2 -2
View File
@@ -224,7 +224,7 @@ int daE_ZH_c::draw() {
return 1;
}
#ifdef DEBUG
#if DEBUG
mBgc.DrawWall(dComIfG_Bgsp());
#endif
@@ -1069,7 +1069,7 @@ void daE_ZH_c::executeOpenStart() {
break;
}
#ifdef DEBUG
#if DEBUG
if (ZREG_S(0) == 0) {
break;
}
src/d/actor/d_a_e_zm.cpp
-2
View File
@@ -949,12 +949,10 @@ cPhs__Step daE_ZM_c::create() {
attention_info.distances[fopAc_attn_BATTLE_e] = 0;
fopAcM_SetGroup(this, 0);
#ifdef DEBUG
if (NREG_S(0) != 0) {
fopAcM_SetMin(this, -20000.0f, -10000.0f, -10000.0f);
fopAcM_SetMax(this, 20000.0f, 10000.0f, 10000.0f);
}
#endif
bitSw = 0xFF;
bitSw2 = 0xFF;
src/d/actor/d_a_horse.cpp
+124 -127
View File
@@ -560,6 +560,8 @@ BOOL daHorse_c::checkEnding() {
#if DEBUG
int l_debugMode;
#else
#define l_debugMode 0
#endif
extern int g_horsePosInit;
@@ -610,9 +612,7 @@ int daHorse_c::create() {
m_offRideFlg = &daHorse_c::offRideFlgSubstance;
if (daAlink_getAlinkActorClass()->checkHorseStart() || checkStateFlg0(FLG0_UNK_8000) ||
#if DEBUG
g_horsePosInit ||
#endif
(DEBUG && g_horsePosInit) ||
strcmp(dComIfGs_getHorseRestartStageName(), "") == 0
/* dSv_event_flag_c::M_002 - Cutscene - [cutscene: 2] Met with Ilia (brings horse to
spring) */
@@ -4301,6 +4301,7 @@ int daHorse_c::execute() {
l_debugMode = 1;
}
}
#endif
if (l_debugMode) {
f32 f31 = 50.0f;
@@ -4318,140 +4319,136 @@ int daHorse_c::execute() {
setMatrix();
m_model->calc();
setBodyPart();
} else { // unsure of the best way to handle this jump
#endif
animePlay();
checkDemoAction();
(this->*m_proc)();
cXyz old_pos(current.pos);
f32 old_speedF = speedF;
speedF *= cM_scos(shape_angle.x);
if (m_procID == PROC_JUMP_e) {
fopAcM_posMoveF(this, NULL);
} else {
fopAcM_posMoveF(this, m_cc_stts.GetCCMoveP());
if (m_cc_stts.GetCCMoveP()->abs() > 0.0001f) {
s16 old_shape_y = shape_angle.y;
s16 old_angle_y = current.angle.y;
animePlay();
checkDemoAction();
for (int i = 0; i < 8; i++) {
if (checkHorseNoMove(1) == 2) {
current.pos -= *m_cc_stts.GetCCMoveP();
break;
(this->*m_proc)();
cXyz old_pos(current.pos);
f32 old_speedF = speedF;
speedF *= cM_scos(shape_angle.x);
if (m_procID == PROC_JUMP_e) {
fopAcM_posMoveF(this, NULL);
} else {
fopAcM_posMoveF(this, m_cc_stts.GetCCMoveP());
if (m_cc_stts.GetCCMoveP()->abs() > 0.0001f) {
s16 old_shape_y = shape_angle.y;
s16 old_angle_y = current.angle.y;
for (int i = 0; i < 8; i++) {
if (checkHorseNoMove(1) == 2) {
current.pos -= *m_cc_stts.GetCCMoveP();
break;
}
shape_angle.y += (s16)0x2000;
current.angle.y = shape_angle.y;
}
shape_angle.y += (s16)0x2000;
current.angle.y = shape_angle.y;
}
shape_angle.y = old_shape_y;
current.angle.y = old_angle_y;
}
}
speedF = old_speedF;
m_cc_stts.ClrCcMove();
f32 old_speed_y = speed.y;
bgCheck();
m_acch.CrrPos(dComIfG_Bgsp());
if (checkStateFlg0(FLG0_UNK_4000)) {
autoGroundHit();
} else {
current.pos.y = old_pos.y;
speed.y = 0.0f;
}
if (m_procID == PROC_TOOL_DEMO_e) {
J3DTransformInfo sp70;
m_mtxcalc->getAnm(0)->getTransform(0, &sp70);
mDoMtx_stack_c::transS(old_pos);
mDoMtx_stack_c::YrotM(shape_angle.y);
Vec sp54 = {0.0f, 0.0f, 0.0f};
sp54.x = sp70.mTranslate.x;
f32 f28 = sp70.mTranslate.z;
sp54.z = f28;
mDoMtx_stack_c::multVec(&sp54, &current.pos);
if (field_0x1730 != 0 && -G_CM3D_F_INF != m_acch.GetGroundH()) {
current.pos.y = m_acch.GetGroundH();
}
} else if (m_procID == PROC_JUMP_e) {
speed.y = old_speed_y;
}
if (checkStateFlg0(FLG0_UNK_1) && m_acch.ChkGroundHit() && checkStateFlg0(FLG0_UNK_2)) {
if (!checkStateFlg0(FLG0_UNK_1000)) {
dComIfGp_getVibration().StartQuake(VIBMODE_S_DOKUTT, 1, cXyz(0.0f, 1.0f, 0.0f));
onStateFlg0(FLG0_UNK_1000);
}
} else if (checkStateFlg0(FLG0_UNK_1000)) {
dComIfGp_getVibration().StopQuake(0x1F);
offStateFlg0(FLG0_UNK_1000);
}
setRoomInfo(0);
setMatrix();
footBgCheck();
setTailAngle();
m_model->calc();
setBodyPart();
if (m_procID == PROC_TOOL_DEMO_e) {
cXyz sp48;
mDoMtx_multVec(m_model->getAnmMtx(0), &cXyz::BaseX, &sp48);
field_0x170e = cM_atan2s(-sp48.x, -sp48.z);
} else {
field_0x170e = shape_angle.y;
}
cXyz sp3C;
cXyz sp30;
mDoMtx_multVecZero(m_model->getAnmMtx(0xB), &sp3C);
mDoMtx_multVecZero(m_model->getAnmMtx(0x14), &sp30);
sp30 -= sp3C;
field_0x1712 = sp30.atan2sX_Z() - field_0x170e;
if (field_0x1712 > 0x2000) {
field_0x1712 = 0x2000;
} else if (field_0x1712 < -0x2000) {
field_0x1712 = -0x2000;
}
if (checkResetStateFlg0(RFLG0_UNK_1)) {
mDoMtx_stack_c::transS(m_bodyEyePos.x, m_bodyEyePos.y, m_bodyEyePos.z);
mDoMtx_stack_c::YrotM(field_0x170e - field_0x1710);
mDoMtx_stack_c::transM(-field_0x17b8.x, -field_0x17b8.y, -field_0x17b8.z);
daHorseRein_c* rein_p = m_rein;
cXyz* var_r26;
for (int i = 0; i < 3; i++, rein_p++) {
var_r26 = rein_p->field_0x0[0];
for (int j = 0; j < rein_p->field_0x8[1]; j++, var_r26++) {
mDoMtx_stack_c::multVec(var_r26, var_r26);
shape_angle.y = old_shape_y;
current.angle.y = old_angle_y;
}
}
}
field_0x17b8 = m_bodyEyePos;
speedF = old_speedF;
m_sound.framework(m_poly_sound, m_reverb);
m_cc_stts.ClrCcMove();
f32 old_speed_y = speed.y;
if (field_0x1144 != NULL) {
m_sound.updateAnime(field_0x1144->getFrame(), field_0x1144->getRate());
bgCheck();
m_acch.CrrPos(dComIfG_Bgsp());
if (checkStateFlg0(FLG0_UNK_4000)) {
autoGroundHit();
} else {
current.pos.y = old_pos.y;
speed.y = 0.0f;
}
if (m_procID == PROC_TOOL_DEMO_e) {
J3DTransformInfo sp70;
m_mtxcalc->getAnm(0)->getTransform(0, &sp70);
mDoMtx_stack_c::transS(old_pos);
mDoMtx_stack_c::YrotM(shape_angle.y);
Vec sp54 = {0.0f, 0.0f, 0.0f};
sp54.x = sp70.mTranslate.x;
f32 f28 = sp70.mTranslate.z;
sp54.z = f28;
mDoMtx_stack_c::multVec(&sp54, &current.pos);
if (field_0x1730 != 0 && -G_CM3D_F_INF != m_acch.GetGroundH()) {
current.pos.y = m_acch.GetGroundH();
}
} else if (m_procID == PROC_JUMP_e) {
speed.y = old_speed_y;
}
if (checkStateFlg0(FLG0_UNK_1) && m_acch.ChkGroundHit() && checkStateFlg0(FLG0_UNK_2)) {
if (!checkStateFlg0(FLG0_UNK_1000)) {
dComIfGp_getVibration().StartQuake(VIBMODE_S_DOKUTT, 1, cXyz(0.0f, 1.0f, 0.0f));
onStateFlg0(FLG0_UNK_1000);
}
} else if (checkStateFlg0(FLG0_UNK_1000)) {
dComIfGp_getVibration().StopQuake(0x1F);
offStateFlg0(FLG0_UNK_1000);
}
setRoomInfo(0);
setMatrix();
footBgCheck();
setTailAngle();
m_model->calc();
setBodyPart();
if (m_procID == PROC_TOOL_DEMO_e) {
cXyz sp48;
mDoMtx_multVec(m_model->getAnmMtx(0), &cXyz::BaseX, &sp48);
field_0x170e = cM_atan2s(-sp48.x, -sp48.z);
} else {
field_0x170e = shape_angle.y;
}
cXyz sp3C;
cXyz sp30;
mDoMtx_multVecZero(m_model->getAnmMtx(0xB), &sp3C);
mDoMtx_multVecZero(m_model->getAnmMtx(0x14), &sp30);
sp30 -= sp3C;
field_0x1712 = sp30.atan2sX_Z() - field_0x170e;
if (field_0x1712 > 0x2000) {
field_0x1712 = 0x2000;
} else if (field_0x1712 < -0x2000) {
field_0x1712 = -0x2000;
}
if (checkResetStateFlg0(RFLG0_UNK_1)) {
mDoMtx_stack_c::transS(m_bodyEyePos.x, m_bodyEyePos.y, m_bodyEyePos.z);
mDoMtx_stack_c::YrotM(field_0x170e - field_0x1710);
mDoMtx_stack_c::transM(-field_0x17b8.x, -field_0x17b8.y, -field_0x17b8.z);
daHorseRein_c* rein_p = m_rein;
cXyz* var_r26;
for (int i = 0; i < 3; i++, rein_p++) {
var_r26 = rein_p->field_0x0[0];
for (int j = 0; j < rein_p->field_0x8[1]; j++, var_r26++) {
mDoMtx_stack_c::multVec(var_r26, var_r26);
}
}
}
field_0x17b8 = m_bodyEyePos;
m_sound.framework(m_poly_sound, m_reverb);
if (field_0x1144 != NULL) {
m_sound.updateAnime(field_0x1144->getFrame(), field_0x1144->getRate());
}
}
#if DEBUG
}
#endif
setEffect();
setCollision();
src/d/actor/d_a_kytag14.cpp
+1 -1
View File
@@ -60,7 +60,7 @@ static int daKytag14_Execute(kytag14_class* i_this) {
if (event1_set == true && event2_unset == true && switch1_set == true && switch2_unset == true)
{
#ifdef DEBUG
#if DEBUG
if (!g_kankyoHIO.navy.display_save_location) {
dDbVw_Report(20, 16, "TAG SavMem STAGE[%s] Room[%d] Lp[%d]", dComIfGp_getStartStageName(), i_this->mSaveRoomNo, i_this->mSavePoint);
if (i_this->mSaveRoomNo == -1) {
src/d/actor/d_a_npc.cpp
+1 -1
View File
@@ -13,7 +13,7 @@
#include "f_op/f_op_kankyo_mng.h"
#include "m_Do/m_Do_lib.h"
#ifdef DEBUG
#if DEBUG
void daNpcT_cmnListenPropertyEvent(char* param_0, int* param_1, daNpcT_HIOParam* param_2) {
sprintf(&param_0[*param_1], "%.3ff,\t// 注目オフセット\n", param_2->attention_offset);
*param_1 = strlen(param_0);
src/d/actor/d_a_npc2.cpp
+1 -1
View File
@@ -754,7 +754,7 @@ int daBaseNpc_moveBgActor_c::MoveBGCreate(char const* i_arcName, int i_dzbId, Mo
return cPhs_ERROR_e;
}
#ifdef DEBUG
#if DEBUG
if (mpBgw != NULL && mpBgw->ChkUsed()) {
BOOL isConnect = mDoCPd_c::isConnect(PAD_3);
if (isConnect) {
src/d/actor/d_a_npc4.cpp
+3 -3
View File
@@ -447,7 +447,7 @@ void daNpcF_Lookat_c::initCalc(fopAc_ac_c* i_actor, Mtx i_baseTransformMtx, cXyz
param_3[i].setall(0);
param_3[i].x = -cM_atan2s(local_90.y, local_90.absXZ());
#ifdef DEBUG
#if DEBUG
if (i_debug) {
f32 var_f31 = fabsf(cM_ssin(param_3[i].x));
OS_REPORT(">>>>>>>%d: sin(%d):%f\n", i, abs(param_3[i].x), var_f31);
@@ -1905,9 +1905,9 @@ BOOL daNpcF_chkDoBtnEqSpeak(fopAc_ac_c* i_actor_p) {
if (dComIfGp_getAttention()->LockonTarget(i) == i_actor_p &&
dComIfGp_getAttention()->getActionBtnB() &&
(dComIfGp_getAttention()->getActionBtnB()->mType == fopAc_attn_TALK_e
#if DEBUG
#if !PLATFORM_GCN
|| dComIfGp_getAttention()->getActionBtnB()->mType == fopAc_attn_UNK_4
#endif
#endif
))
{
ret = TRUE;
src/d/actor/d_a_npc_aru.cpp
+1 -4
View File
@@ -423,7 +423,7 @@ int daNpc_Aru_c::Draw() {
}
draw(
#ifdef DEBUG
#if DEBUG
chkAction(&daNpc_Aru_c::test),
#else
FALSE,
@@ -2018,11 +2018,8 @@ int daNpc_Aru_c::talk(void* param_1) {
return 0;
}
#ifdef DEBUG
int daNpc_Aru_c::test(void* param_1) {
}
#endif
static int daNpc_Aru_Create(void* a_this) {
return static_cast<daNpc_Aru_c*>(a_this)->create();
src/d/actor/d_a_npc_bans.cpp
-2
View File
@@ -1824,7 +1824,6 @@ int daNpc_Bans_c::shop(void* param_1) {
return 0;
}
#if DEBUG
int daNpc_Bans_c::test(void* param_1) {
int rv = 0;
@@ -1848,7 +1847,6 @@ int daNpc_Bans_c::test(void* param_1) {
return rv;
}
#endif
static int daNpc_Bans_Create(void* i_this) {
return static_cast<daNpc_Bans_c*>(i_this)->create();
src/d/actor/d_a_npc_besu.cpp
+6 -6
View File
@@ -279,7 +279,7 @@ enum Event {
/* 0xC */ EVENT_CONVERSATION_ABOUT_ZORA,
};
#ifndef DEBUG
#if !DEBUG
#endif
@@ -538,7 +538,7 @@ daNpc_Besu_c::~daNpc_Besu_c() {
mpCupModelMorf->stopZelAnime();
}
// #ifdef DEBUG
// #if DEBUG
// if (field_0xe40 != NULL) {
// field_0xe40->removeHIO();
// }
@@ -631,7 +631,7 @@ int daNpc_Besu_c::create() {
fopAcM_setCullSizeBox(this, -200.0f, -100.0f, -200.0f, 200.0f, 300.0f, 200.0f);
mSound.init(&current.pos, &eyePos, 3, 1);
// #ifdef DEBUG
// #if DEBUG
// field_0xe40 = &l_HIO;
// // "Beth":
// field_0xe40->entryHIO("ベス");
@@ -1248,14 +1248,14 @@ void daNpc_Besu_c::action() {
}
if (actor_p != NULL && mType != 5
#ifndef DEBUG
#if !DEBUG
&& !chkNurse()
#endif
) {
mStagger.setParam(this, actor_p, mCurAngle.y);
setDamage(0, 0xC, 0x12);
// FIXME: Fakematch
#ifdef DEBUG
#if DEBUG
mStagger.setPower(0.0f);
#else
for (int i = 0; i < 2; i++) {
@@ -1268,7 +1268,7 @@ void daNpc_Besu_c::action() {
if (mStagger.checkRebirth()) {
// FIXME: Fakematch
#ifdef DEBUG
#if DEBUG
mStagger.initialize();
#else
for (int i = 0; i < 2; i++) {
src/d/actor/d_a_npc_chat.cpp
+2 -2
View File
@@ -2700,7 +2700,7 @@ cPhs__Step daNpcChat_c::Create() {
mSound.init(&current.pos, &eyePos, 3, 1);
mSound.setMdlType(mType, false, mTwilight & 0xFF);
#ifdef DEBUG
#if DEBUG
// mHIO = l_HIO;
mHIO->entryHIO("多人数会話NPC");
#endif
@@ -3065,7 +3065,7 @@ void daNpcChat_c::setParam() {
}
}
#ifdef DEBUG
#if DEBUG
scale.set(daNpcChat_Param_c::m.common.scale, daNpcChat_Param_c::m.common.scale, daNpcChat_Param_c::m.common.scale);
mAcchCir.SetWallR(daNpcChat_Param_c::m.common.width);
mAcchCir.SetWallH(daNpcChat_Param_c::m.common.knee_length);
src/d/actor/d_a_npc_chin.cpp
+1 -1
View File
@@ -284,7 +284,7 @@ int daNpcChin_c::Create() {
mpHIO = &l_HIO;
// "W Hook Shot Shop"
mpHIO->entryHIO("Wフックショット屋");
#endif
#endif
mAcchCir.SetWall(mpHIO->m.common.width, mpHIO->m.common.knee_length);
src/d/actor/d_a_npc_df.cpp
+7 -7
View File
@@ -11,6 +11,12 @@
#include "d/actor/d_a_npc_henna.h"
#include "Z2AudioLib/Z2Instances.h"
#if DEBUG
#define NPC_DF_HEAP_SIZE 0x4B000
#else
#define NPC_DF_HEAP_SIZE 0x3B90
#endif
static int daNpc_Df_Draw(npc_df_class* i_this) {
fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
df_s* df_p = i_this->mDfs;
@@ -369,13 +375,7 @@ static cPhs__Step daNpc_Df_Create(fopAc_ac_c* i_this) {
OS_REPORT("NPC_DF//////////////NPC_DF SET 1 !!\n");
if (
#if DEBUG
!fopAcM_entrySolidHeap(i_this, useHeapInit, 0x4B000)
#else
!fopAcM_entrySolidHeap(i_this, useHeapInit, 0x3B90)
#endif
) {
if (!fopAcM_entrySolidHeap(i_this, useHeapInit, NPC_DF_HEAP_SIZE)) {
OS_REPORT("//////////////NPC_DF SET NON !!\n");
return cPhs_ERROR_e;
}
src/d/actor/d_a_npc_doc.cpp
+12 -5
View File
@@ -274,11 +274,14 @@ int daNpc_Doc_c::Draw() {
mdlData_p->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]);
}
#if DEBUG
return draw(chkAction(&daNpc_Doc_c::test), FALSE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE);
#else
return draw(FALSE, FALSE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE);
#endif
return draw(
#if DEBUG
chkAction(&daNpc_Doc_c::test),
#else
FALSE,
#endif
FALSE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE
);
}
int daNpc_Doc_c::createHeapCallBack(fopAc_ac_c* i_this) {
@@ -827,6 +830,10 @@ int daNpc_Doc_c::talk(void* param_0) {
return 0;
}
int daNpc_Doc_c::test(void* i_this) {
// DEBUG NONMATCHING
}
static int daNpc_Doc_Create(void* i_this) {
return ((daNpc_Doc_c*)i_this)->create();
}
src/d/actor/d_a_npc_doorboy.cpp
+1 -1
View File
@@ -834,7 +834,7 @@ void daNpcDoorBoy_c::setAttnPos() {
sp28.y = current.pos.y;
field_0xc98.SetC(sp28);
#ifdef DEBUG
#if DEBUG
field_0xc98.SetH(daNpcDoorBoy_Param_c::m.common.height);
field_0xc98.SetR(daNpcDoorBoy_Param_c::m.common.width);
#endif
src/d/actor/d_a_npc_fairy.cpp
-2
View File
@@ -1239,7 +1239,6 @@ int daNpc_Fairy_c::talk(int param_1) {
return 1;
}
#if DEBUG
int daNpc_Fairy_c::test(int param_1) {
int rv = 0;
@@ -1263,7 +1262,6 @@ int daNpc_Fairy_c::test(int param_1) {
return rv;
}
#endif
void daNpc_Fairy_c::AppearDemoCall() {
if (mType == TYPE_50F) {
src/d/actor/d_a_npc_fguard.cpp
+1 -1
View File
@@ -147,7 +147,7 @@ void daNpcFgd_c::checkGroundHeight() {
}
void daNpcFgd_c::setCollision() {
#ifdef DEBUG
#if DEBUG
mCyl.SetR(Cd2_HIO_cylR(m_type));
mCyl.SetH(Cd2_HIO_cylH(m_type));
#endif
src/d/actor/d_a_npc_grmc.cpp
+3 -5
View File
@@ -320,7 +320,7 @@ int daNpc_grMC_c::Execute() {
int daNpc_grMC_c::Draw() {
return draw(
#ifdef DEBUG
#if DEBUG
chkAction(&daNpc_grMC_c::test),
#else
FALSE,
@@ -737,7 +737,6 @@ int daNpc_grMC_c::shop(void* param_1) {
return 0;
}
#ifdef DEBUG
int daNpc_grMC_c::test(void* param_1) {
int rv = 0;
@@ -749,8 +748,8 @@ int daNpc_grMC_c::test(void* param_1) {
mMode = 2;
// fallthrough
case 2:
mFaceMotionSeqMngr.setNo(mHIO->param.common.face_expression, -1.0f, FALSE, 0);
mMotionSeqMngr.setNo(mHIO->param.common.motion, -1.0f, FALSE, 0);
mFaceMotionSeqMngr.setNo(mHIO->m.common.face_expression, -1.0f, FALSE, 0);
mMotionSeqMngr.setNo(mHIO->m.common.motion, -1.0f, FALSE, 0);
mJntAnm.lookNone(0);
attention_info.flags = 0;
break;
@@ -761,7 +760,6 @@ int daNpc_grMC_c::test(void* param_1) {
return rv;
}
#endif
static int daNpc_grMC_Create(void* a_this) {
return static_cast<daNpc_grMC_c*>(a_this)->create();
src/d/actor/d_a_npc_grr.cpp
+1 -1
View File
@@ -215,7 +215,7 @@ daNpc_grR_c::~daNpc_grR_c() {
mAnm_p->stopZelAnime();
}
#ifdef DEBUG
#if DEBUG
if (mHIO != NULL) {
mHIO->removeHIO();
}
src/d/actor/d_a_npc_grs.cpp
+1 -5
View File
@@ -335,11 +335,7 @@ int daNpc_grS_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
void daNpc_grS_c::setParam() {
actionFunc oldAction = mpNextActionFn;
#if DEBUG
u32 flags = 0x42;
#else
u32 flags = 0xa;
#endif
u32 flags = fopAc_AttnFlag_TALK_e | fopAc_AttnFlag_SPEAK_e;
selectAction();
src/d/actor/d_a_npc_guard.cpp
+1 -1
View File
@@ -528,7 +528,7 @@ static int daNpcGuard_Execute(void* i_this) {
}
void daNpcGuard_c::setCollision() {
#ifdef DEBUG
#if DEBUG
mCyl.SetR(Cd2_HIO_cylR(m_type));
mCyl.SetH(Cd2_HIO_cylH(m_type));
#endif
src/d/actor/d_a_npc_hoz.cpp
+12 -5
View File
@@ -396,11 +396,14 @@ int daNpc_Hoz_c::Draw() {
modelData->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]);
}
#if DEBUG
return draw(chkAction(&daNpc_Hoz_c::test), FALSE, daNpc_Hoz_Param_c::m.common.real_shadow_size, NULL, 100.0f, FALSE, FALSE, FALSE);
#else
return draw(FALSE, FALSE, daNpc_Hoz_Param_c::m.common.real_shadow_size, NULL, 100.0f, FALSE, FALSE, FALSE);
#endif
return draw(
#if DEBUG
chkAction(&daNpc_Hoz_c::test),
#else
FALSE,
#endif
FALSE, daNpc_Hoz_Param_c::m.common.real_shadow_size, NULL, 100.0f, FALSE, FALSE, FALSE
);
}
int daNpc_Hoz_c::createHeapCallBack(fopAc_ac_c* actor) {
@@ -824,6 +827,10 @@ BOOL daNpc_Hoz_c::drawDbgInfo() {
return false;
}
int daNpc_Hoz_c::test(void* i_this) {
// DEBUG NONMATCHING
}
int daNpc_Hoz_c::selectAction() {
field_0xfac = NULL;
src/d/actor/d_a_npc_kasi_hana.cpp
+1 -1
View File
@@ -890,7 +890,7 @@ void daNpcKasiHana_c::setAttnPos() {
mDoMtx_stack_c::multVecZero(&sp28);
sp28.y = current.pos.y;
mCyl.SetC(sp28);
#ifdef DEBUG
#if DEBUG
mCyl.SetH(mHIO->m.common.height);
mCyl.SetR(mHIO->m.common.width);
#endif
src/d/actor/d_a_npc_kasi_kyu.cpp
+1 -1
View File
@@ -417,7 +417,7 @@ void daNpcKasiKyu_c::setAttnPos() {
mDoMtx_stack_c::multVecZero(&sp28);
sp28.y = current.pos.y;
mCyl.SetC(sp28);
#ifdef DEBUG
#if DEBUG
mCyl.SetH(daNpcKasiKyu_Param_c::m.common.height);
mCyl.SetR(daNpcKasiKyu_Param_c::m.common.width);
#endif
src/d/actor/d_a_npc_kasi_mich.cpp
+1 -1
View File
@@ -417,7 +417,7 @@ void daNpcKasiMich_c::setAttnPos() {
mDoMtx_stack_c::multVecZero(&sp28);
sp28.y = current.pos.y;
mCyl.SetC(sp28);
#ifdef DEBUG
#if DEBUG
mCyl.SetH(daNpcKasiMich_Param_c::m.common.height);
mCyl.SetR(daNpcKasiMich_Param_c::m.common.width);
#endif
src/d/actor/d_a_npc_kn.cpp
+2 -2
View File
@@ -4980,7 +4980,7 @@ int daNpc_Kn_c::setSlipPrtcl() {
mDoMtx_stack_c::multVecZero(&mParticleMngr[0].mPos);
mParticleMngr[0].mPos.y -= 20.0f;
mParticleMngr[0].mAngle = current.angle;
#ifdef DEBUG
#if DEBUG
mParticleMngr[0].mAngle.y -= (s16) 0x8000;
#else
mParticleMngr[0].mAngle.y -= 0x8000;
@@ -4991,7 +4991,7 @@ int daNpc_Kn_c::setSlipPrtcl() {
mDoMtx_stack_c::multVecZero(&mParticleMngr[1].mPos);
mParticleMngr[1].mPos.y -= 20.0f;
mParticleMngr[1].mAngle = current.angle;
#ifdef DEBUG
#if DEBUG
mParticleMngr[1].mAngle.y -= (s16) 0x8000;
#else
mParticleMngr[1].mAngle.y -= 0x8000;
src/d/actor/d_a_npc_kolin.cpp
+1 -1
View File
@@ -1090,7 +1090,7 @@ void daNpc_Kolin_c::changeBck(int* param_1, int* param_2) {
int daNpc_Kolin_c::selectAction() {
mNextAction = NULL;
#ifdef DEBUG
#if DEBUG
if (daNpc_Kolin_Param_c::m.common.debug_mode_ON) {
mNextAction = &daNpc_Kolin_c::test;
return 1;
src/d/actor/d_a_npc_kolinb.cpp
+1 -1
View File
@@ -590,7 +590,7 @@ int daNpc_Kolinb_c::drawDbgInfo() {
int daNpc_Kolinb_c::selectAction() {
mNextAction = NULL;
#ifdef DEBUG
#if DEBUG
if (daNpc_Kolinb_Param_c::m.common.debug_mode_ON) {
mNextAction = &daNpc_Kolinb_c::test;
return 1;
src/d/actor/d_a_npc_len.cpp
+1 -1
View File
@@ -608,7 +608,7 @@ void daNpc_Len_c::action() {
if (mStagger.checkRebirth()) {
// FIXME: Fakematch - same issue in npc_besu
#ifdef DEBUG
#if DEBUG
mStagger.initialize();
#else
for (int i = 0; i < 2; i++) {
src/d/actor/d_a_npc_moir.cpp
+1 -1
View File
@@ -1847,7 +1847,7 @@ void daNpcMoiR_c::setParam() {
}
}
#ifdef DEBUG
#if DEBUG
scale.set(mpHIO->m.common.scale, mpHIO->m.common.scale, mpHIO->m.common.scale);
mAcchCir.SetWallR(mpHIO->m.common.width);
mAcchCir.SetWallH(mpHIO->m.common.knee_length);
src/d/actor/d_a_npc_pachi_besu.cpp
+1 -3
View File
@@ -629,7 +629,7 @@ int daNpc_Pachi_Besu_c::Draw() {
}
return draw(
#ifdef DEBUG
#if DEBUG
chkAction(&daNpc_Pachi_Besu_c::test),
#else
FALSE,
@@ -1088,11 +1088,9 @@ BOOL daNpc_Pachi_Besu_c::talk(void* param_1) {
return FALSE;
}
#ifdef DEBUG
BOOL daNpc_Pachi_Besu_c::test(void* param_1) {
// DEBUG NONMATCHING
}
#endif
BOOL daNpc_Pachi_Besu_c::_turn_to_link(s16 param_1) {
cXyz pos(*fopAcM_GetPosition_p(daPy_getPlayerActorClass()));
src/d/actor/d_a_npc_pachi_maro.cpp
+1 -1
View File
@@ -667,7 +667,7 @@ int daNpc_Pachi_Maro_c::Draw() {
}
return draw(
#ifdef DEBUG
#if DEBUG
chkAction(&daNpc_Pachi_Maro_c::test),
#else
FALSE,
src/d/actor/d_a_npc_pachi_taro.cpp
+1 -1
View File
@@ -917,7 +917,7 @@ int daNpc_Pachi_Taro_c::Draw() {
}
return draw(
#ifdef DEBUG
#if DEBUG
chkAction(&daNpc_Pachi_Taro_c::test),
#else
FALSE,
src/d/actor/d_a_npc_raca.cpp
+2 -2
View File
@@ -311,10 +311,10 @@ int daNpc_Raca_c::Draw() {
}
draw(
#ifdef DEBUG
#if DEBUG
chkAction(mAction),
#else
0,
FALSE,
#endif
FALSE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE
);
src/d/actor/d_a_npc_saru.cpp
+2 -2
View File
@@ -312,7 +312,7 @@ int daNpc_Saru_c::create() {
fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx());
fopAcM_setCullSizeBox(this, -200.0f, -100.0f, -200.0f, 200.0f, 300.0f, 200.0f);
mSound.init(&current.pos, &eyePos, 3, 1);
#ifdef DEBUG
#if DEBUG
field_0xe90->entryHIO("サル"); // Monkey
#endif
reset();
@@ -552,7 +552,7 @@ void daNpc_Saru_c::setParam() {
}
void daNpc_Saru_c::setAfterTalkMotion() {
#ifdef DEBUG
#if DEBUG
mFaceMotionSeqMngr.getNo();
#endif
mFaceMotionSeqMngr.setNo(FACE_NONE, -1.0f, 0, 0);
src/d/actor/d_a_npc_seic.cpp
+2 -2
View File
@@ -61,7 +61,7 @@ daNpc_seiC_c::~daNpc_seiC_c() {
mpMorf[0]->stopZelAnime();
}
#ifdef DEBUG
#if DEBUG
if (field_0xe40 != NULL) {
field_0xe40->removeHIO();
}
@@ -137,7 +137,7 @@ int daNpc_seiC_c::create() {
fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx());
mSound.init(&current.pos, &eyePos, 3, 1);
#ifdef DEBUG
#if DEBUG
//field_0xe40->field_0x8 = &l_HIO;
field_0xe40->entryHIO("光の精霊ｃ"); // Spirit of Light c
#endif
src/d/actor/d_a_npc_seid.cpp
+2 -2
View File
@@ -61,7 +61,7 @@ daNpc_seiD_c::~daNpc_seiD_c() {
mpMorf[0]->stopZelAnime();
}
#ifdef DEBUG
#if DEBUG
if (field_0xe40 != NULL) {
field_0xe40->removeHIO();
}
@@ -137,7 +137,7 @@ int daNpc_seiD_c::create() {
fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx());
mSound.init(&current.pos, &eyePos, 3, 1);
#ifdef DEBUG
#if DEBUG
//field_0xe40->field_0x8 = &l_HIO;
field_0xe40->entryHIO("光の精霊ｄ"); // Spirit of Light d
#endif
src/d/actor/d_a_npc_taro.cpp
+4 -4
View File
@@ -245,7 +245,7 @@ daNpc_Taro_c::~daNpc_Taro_c() {
mpMorf[0]->stopZelAnime();
}
#ifdef DEBUG
#if DEBUG
if (field_0xe40 != NULL) {
field_0xe40->removeHIO();
}
@@ -300,7 +300,7 @@ int daNpc_Taro_c::create() {
mSound.init(&current.pos, &eyePos, 3, 1);
field_0x9c0.init(&mAcch, 0.0f, 0.0f);
#ifdef DEBUG
#if DEBUG
// I'm unsure exactly how we're supposed to set + use the param ptr in the debug build...
// field_0xe40 = &l_HIO;
// field_0xe40->entryHIO("タロ");
@@ -894,7 +894,7 @@ void daNpc_Taro_c::action() {
hitActor, mCurAngle.y);
setDamage(0, 17, 33);
#ifdef DEBUG
#if DEBUG
mStagger.setPower(0.0f);
#else
for (int i = 0; i < 2; i++) {
@@ -906,7 +906,7 @@ void daNpc_Taro_c::action() {
mJntAnm.lookNone(1);
}
if (mStagger.checkRebirth()) {
#ifdef DEBUG
#if DEBUG
mStagger.initialize();
#else
for (int i = 0; i < 2; i++) {
src/d/actor/d_a_npc_tkj2.cpp
+1 -1
View File
@@ -1099,7 +1099,7 @@ static cPhs__Step daNpc_Tkj2_Create(fopAc_ac_c* a_this) {
l_HIO.field_0x4 = -1;
}
#ifdef DEBUG
#if DEBUG
fopAcM_OnStatus(a_this, 0);
#endif
src/d/actor/d_a_npc_tks.cpp
+1 -1
View File
@@ -2950,7 +2950,7 @@ void daNpcTks_c::setAttnPos() {
if (!fopAcM_checkCarryNow(this)) {
if (!field_0x138a) {
mCyl.SetC(current.pos);
#ifdef DEBUG
#if DEBUG
mCyl.SetH(daNpcTks_Param_c::m.common.height);
mCyl.SetR(daNpcTks_Param_c::m.common.width);
#endif
src/d/actor/d_a_npc_toby.cpp
+3 -4
View File
@@ -418,9 +418,10 @@ int daNpc_Toby_c::Draw() {
#if DEBUG
chkAction(&daNpc_Toby_c::test),
#else
0,
FALSE,
#endif
0, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
FALSE, mRealShadowSize, NULL, 100.0f, 0, 0, 0
);
}
int daNpc_Toby_c::createHeapCallBack(fopAc_ac_c* i_this) {
@@ -2182,11 +2183,9 @@ int daNpc_Toby_c::talk(void*) {
return 0;
}
#if DEBUG
int daNpc_Toby_c::test(void* param_0) {
// TODO
}
#endif
static int daNpc_Toby_Create(void* i_this) {
return static_cast<daNpc_Toby_c*>(i_this)->create();
src/d/actor/d_a_npc_worm.cpp
+1 -1
View File
@@ -116,7 +116,7 @@ static void npc_worm_normal(npc_worm_class* i_this) {
a_this->eventInfo.onCondition(dEvtCnd_40_e);
}
#ifndef DEBUG
#if !DEBUG
if (i_this->field_0x5e8[1] == 0) {
i_this->field_0x5a6 = 2;
i_this->field_0x5a8 = 0;
src/d/actor/d_a_npc_wrestler.cpp
+8 -8
View File
@@ -930,7 +930,7 @@ void daNpcWrestler_c::setAttnPos() {
if (chkAction(&daNpcWrestler_c::wait)
|| chkAction(&daNpcWrestler_c::talk)) {
field_0xc90.SetC(sp68);
#ifdef DEBUG
#if DEBUG
field_0xc90.SetH(field_0xbdc->field_0x0);
field_0xc90.SetR(field_0xbdc->mWallR);
#endif
@@ -1909,7 +1909,7 @@ bool daNpcWrestler_c::talk(void* param_1) {
setAction(&daNpcWrestler_c::gotoArena);
} else {
int choiceNo = mFlow.getChoiceNo();
#ifdef DEBUG
#if DEBUG
// "Choice %s\n", (choiceNo == 0) ? "Yes" : "No"
OS_REPORT("二択分岐 %s\n", (choiceNo == 0) ? "はい" : "いいえ");
#endif
@@ -3765,7 +3765,7 @@ bool daNpcWrestler_c::demoSumouReady(void* param_1) {
fopAcM_effSmokeSet1(&field_0xde8, &field_0xdec, &sp3c, NULL, 0.8f, &tevStr, 1);
}
#ifdef DEBUG
#if DEBUG
mDemoCam.field_0x18.set(0.0f, 0.0f, -100.0f);
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::YrotM(mCurAngle.y);
@@ -3791,7 +3791,7 @@ bool daNpcWrestler_c::demoSumouReady(void* param_1) {
break;
case 5:
#ifdef DEBUG
#if DEBUG
mDemoCam.field_0x18.set(0.0f, 0.0f, -100.0f);
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::YrotM(mCurAngle.y);
@@ -3852,7 +3852,7 @@ bool daNpcWrestler_c::demoSumouReady(void* param_1) {
dComIfGp_getVibration().StartShock(3, 15, cXyz(0.0f, 1.0f, 0.0f));
}
#ifdef DEBUG
#if DEBUG
mDoMtx_stack_c::transS(fopAcM_GetPosition(daPy_getPlayerActorClass()));
mDoMtx_stack_c::YrotM(fopAcM_GetShapeAngle_p(daPy_getPlayerActorClass())->y);
mDoMtx_stack_c::transM(field_0xbd8->field_0xd0);
@@ -3878,7 +3878,7 @@ bool daNpcWrestler_c::demoSumouReady(void* param_1) {
break;
case 9:
#ifdef DEBUG
#if DEBUG
mDoMtx_stack_c::transS(fopAcM_GetPosition(daPy_getPlayerActorClass()));
mDoMtx_stack_c::YrotM(fopAcM_GetShapeAngle_p(daPy_getPlayerActorClass())->y);
mDoMtx_stack_c::transM(field_0xbd8->field_0xdc);
@@ -4700,7 +4700,7 @@ BOOL daNpcWrestler_c::EvCut_grDSEntry(int i_cutIndex) {
case '0009':
if (setTalkAngle() && talkProc(NULL, TRUE, NULL)) {
int choice_no = mFlow.getChoiceNo();
#ifdef DEBUG
#if DEBUG
// "Two-way split %s\n", (mFlow.getChoiceNo() == 0) ? "Yes" : "No"
OS_REPORT("二択分岐 %s\n", (choice_no == 0) ? "はい" : "いいえ");
#endif
@@ -4829,7 +4829,7 @@ BOOL daNpcWrestler_c::EvCut_grDSEntry3_4(int i_cutIndex) {
case '0001':
if (setTalkAngle() && talkProc(NULL, TRUE, NULL)) {
s16 choice_no = mFlow.getChoiceNo();
#ifdef DEBUG
#if DEBUG
char* choice;
if (choice_no == 0) {
choice = "はい";
src/d/actor/d_a_npc_ykm.cpp
+2 -6
View File
@@ -776,7 +776,7 @@ int daNpc_ykM_c::Draw() {
}
rv = draw(
#ifdef DEBUG
#if DEBUG
chkAction(&daNpc_ykM_c::test),
#else
FALSE,
@@ -3470,9 +3470,7 @@ BOOL daNpc_ykM_c::race(void* param_1) {
angleY = cLib_targetAngleY(&field_0x14fc, &daPy_getPlayerActorClass()->current.pos);
if (field_0x1560 < 0 ||
#if DEBUG
field_0x1558.field_0x0 >= 0 &&
#endif
(!DEBUG || field_0x1558.field_0x0 >= 0) &&
(field_0x14fc.abs2(daPy_getPlayerActorClass()->current.pos) < 640000.0f && (angleY < -0x4000 || angleY > 0x4000))) {
field_0x1560 = -1;
mGndChk.SetPos(&daPy_getPlayerActorClass()->current.pos);
@@ -3695,7 +3693,6 @@ BOOL daNpc_ykM_c::talk(void* param_1) {
return FALSE;
}
#ifdef DEBUG
BOOL daNpc_ykM_c::test(void* param_1) {
int rv = FALSE;
switch (mMode) {
@@ -3718,7 +3715,6 @@ BOOL daNpc_ykM_c::test(void* param_1) {
return rv;
}
#endif
static int daNpc_ykM_Create(void* i_this) {
return ((daNpc_ykM_c*)i_this)->create();
src/d/actor/d_a_npc_ykw.cpp
+5 -4
View File
@@ -452,11 +452,14 @@ int daNpc_ykW_c::Draw() {
modelData->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]);
}
result = draw(
#if DEBUG
result = draw(chkAction(NULL), 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
chkAction(NULL),
#else
result = draw(FALSE, 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
FALSE,
#endif
0, mRealShadowSize, NULL, 100.0f, 0, 0, 0
);
if (field_0x1069 != 0) {
fopAc_ac_c* actor = mActorMngrs[3].getActorP();
@@ -2982,7 +2985,6 @@ int daNpc_ykW_c::talk(void* param_0) {
return 0;
}
#if DEBUG
int daNpc_ykW_c::test(void* param_0) {
int retval = 0;
@@ -3008,7 +3010,6 @@ int daNpc_ykW_c::test(void* param_0) {
return retval;
}
#endif
static int daNpc_ykW_Create(void* i_this) {
src/d/actor/d_a_npc_zanb.cpp
+8 -5
View File
@@ -254,11 +254,14 @@ int daNpc_zanB_c::Draw() {
mdlData_p->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]);
}
#if DEBUG
return draw(chkAction(&daNpc_zanB_c::test), FALSE, mRealShadowSize, NULL, 0.0f, TRUE, FALSE, FALSE);
#else
return draw(FALSE, FALSE, mRealShadowSize, NULL, 0.0f, TRUE, FALSE, FALSE);
#endif
return draw(
#if DEBUG
chkAction(&daNpc_zanB_c::test),
#else
FALSE,
#endif
FALSE, mRealShadowSize, NULL, 0.0f, TRUE, FALSE, FALSE
);
}
int daNpc_zanB_c::createHeapCallBack(fopAc_ac_c* i_this) {
src/d/actor/d_a_npc_zelRo.cpp
+1 -3
View File
@@ -251,7 +251,7 @@ int daNpc_ZelRo_c::Draw() {
}
return draw(
#ifdef DEBUG
#if DEBUG
chkAction(&daNpc_ZelRo_c::test),
#else
FALSE,
@@ -626,12 +626,10 @@ int daNpc_ZelRo_c::talk(void* param_1) {
return 0;
}
#ifdef DEBUG
int daNpc_ZelRo_c::test(void* param_1) {
int rt = 0;
return rt;
}
#endif
static int daNpc_ZelRo_Create(void* a_this) {
return static_cast<daNpc_ZelRo_c*>(a_this)->create();
src/d/actor/d_a_npc_zelda.cpp
+5 -2
View File
@@ -313,11 +313,14 @@ int daNpc_Zelda_c::Draw() {
modelData->getMaterialNodePointer(getEyeballRMaterialNo())->setMaterialAnm(mpMatAnm[1]);
}
return draw(
#if DEBUG
return draw(chkAction(NULL), TRUE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE);
chkAction(NULL),
#else
return draw(NULL, TRUE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE);
FALSE,
#endif
TRUE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE
);
}
int daNpc_Zelda_c::createHeapCallBack(fopAc_ac_c* i_this) {
src/d/actor/d_a_obj_Turara.cpp
+1 -1
View File
@@ -163,7 +163,7 @@ int daTurara_c::create() {
fopAcM_setCullSizeBox2(this, mpModel[field_0x984]->getModelData());
setBaseMtx();
field_0x994 = 1;
#ifdef DEBUG
#if DEBUG
l_HIO.entryHIO("つらら");
#endif
}
src/d/actor/d_a_obj_amiShutter.cpp
+3 -3
View File
@@ -31,7 +31,7 @@ daAmiShutter_HIO_c::daAmiShutter_HIO_c() {
mWaitTime = 0;
}
#ifdef DEBUG
#if DEBUG
void daAmiShutter_HIO_c::genMessage(JORMContext* i_ctx) {
i_ctx->genSlider("open速度", &mMaxOpenSpeed, 0.1f, 1000.0f,
0, NULL, 0xffff, 0xffff, 512, 24);
@@ -102,7 +102,7 @@ cPhs__Step daAmiShutter_c::create() {
init_modeWait();
}
setBaseMtx();
#ifdef DEBUG
#if DEBUG
l_HIO.entryHIO("アミシャッター");
#endif
}
@@ -263,7 +263,7 @@ int daAmiShutter_c::Draw() {
int daAmiShutter_c::Delete() {
dComIfG_resDelete(&mPhaseReq, "S_Zami");
#ifdef DEBUG
#if DEBUG
l_HIO.removeHIO();
#endif
src/d/actor/d_a_obj_batta.cpp
+1 -1
View File
@@ -51,7 +51,7 @@ static bool l_HIOInit;
static daObj_BattaHIO_c l_HIO;
#ifdef DEBUG
#if DEBUG
void daObj_BattaHIO_c::genMessage(JORMContext* ctx) {
// Golden bugs
src/d/actor/d_a_obj_bemos.cpp
+5 -5
View File
@@ -38,7 +38,7 @@ s16 const daObjBm_c::M_dir_base[4] = {
0xC000,
};
#ifdef DEBUG
#if DEBUG
class daObjBm_HIO_c : public mDoHIO_entry_c {
public:
daObjBm_HIO_c();
@@ -391,7 +391,7 @@ int daObjBm_c::CreateHeap() {
}
mpBtkAnm->setFrame(mpBtkAnm->getEndFrame());
#ifdef DEBUG
#if DEBUG
pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 0x18);
JUT_ASSERT(840, pbtk != NULL);
#endif
@@ -447,8 +447,8 @@ int daObjBm_c::create1st() {
return phase_state;
}
#ifdef DEBUG
OS_REPORT("新ビーモス：0x%x\n", fopAcM_GetParam(this));
#if DEBUG
l_HIO.entryHIO("ビーモス");
#endif
}
@@ -457,7 +457,7 @@ int daObjBm_c::create1st() {
}
int daObjBm_c::Execute(Mtx** param_0) {
#ifdef DEBUG
#if DEBUG
scale.setall(l_HIO.mBodyScale);
mpModel->setBaseScale(scale);
daPy_py_c* player = daPy_getPlayerActorClass();
@@ -1727,7 +1727,7 @@ int daObjBm_c::Draw() {
return 1;
}
#ifdef DEBUG
#if DEBUG
void daObjBm_c::debugDraw() {
if (l_HIO.mDebugDraw) {
GXColor local_4c = {
src/d/actor/d_a_obj_carry.cpp
+19 -23
View File
@@ -1286,32 +1286,28 @@ int daObjCarry_c::CreateHeap() {
int daObjCarry_c::create() {
preInit();
#ifdef DEBUG
if (prm_chk_type_lightball() && strcmp(dComIfGp_getStartStageName(), "T_ENE02") == 0) {
goto next;
}
#endif
if (!(DEBUG && prm_chk_type_lightball() &&
strcmp(dComIfGp_getStartStageName(), "T_ENE02") == 0)) {
int create_phase;
create_phase = cPhs_NEXT_e;
int create_phase;
create_phase = cPhs_NEXT_e;
switch (mType) {
case TYPE_BALL_S:
create_phase = (cPhs__Step)checkCreate_LightBallA();
break;
case TYPE_BALL_S_2:
create_phase = (cPhs__Step)checkCreate_LightBallB();
break;
case TYPE_LV8_BALL:
create_phase = (cPhs__Step)checkCreate_Lv8Ball();
break;
}
switch (mType) {
case TYPE_BALL_S:
create_phase = (cPhs__Step)checkCreate_LightBallA();
break;
case TYPE_BALL_S_2:
create_phase = (cPhs__Step)checkCreate_LightBallB();
break;
case TYPE_LV8_BALL:
create_phase = (cPhs__Step)checkCreate_Lv8Ball();
break;
if (create_phase != cPhs_NEXT_e) {
return create_phase;
}
}
if (create_phase != cPhs_NEXT_e) {
return create_phase;
}
next:
int phase_state = dComIfG_resLoad(&mPhaseReq, getArcName());
if (phase_state == cPhs_COMPLEATE_e) {
if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, data().m_heapSize)) {
@@ -1970,7 +1966,7 @@ int daObjCarry_c::draw() {
}
void daObjCarry_c::debugDraw() {
#ifdef DEBUG
#if DEBUG
if (KREG_S(8) == 10000 && !mRotAxis.isZero()) {
cXyz start(current.pos);
start.y += 35.0f;
src/d/actor/d_a_obj_crvfence.cpp
+1 -1
View File
@@ -228,7 +228,7 @@ bool daObjCRVFENCE_c::checkViewArea(cXyz* param_1) {
bool rv = false;
bool bVar1 = false;
#ifdef DEBUG
#if DEBUG
if (sp24.x >= 0.0f) {
if (sp24.y <= FB_WIDTH) {
bVar1 = true;
src/d/actor/d_a_obj_damCps.cpp
+2 -2
View File
@@ -7,7 +7,7 @@
#include "d/actor/d_a_obj_damCps.h"
#ifdef DEBUG
#if DEBUG
#include "d/d_debug_viewer.h"
static daObjDamCps_HIO_c l_HIO;
@@ -210,7 +210,7 @@ extern actor_process_profile_definition g_profile_Obj_DamCps = {
0, // mParameters
&g_fopAc_Method.base, // sub_method
629, // mPriority
#ifdef DEBUG
#if DEBUG
&l_daObjDamCps_Method, // sub_method
#else
NULL, // sub_method
src/d/actor/d_a_obj_digsnow.cpp
+1 -1
View File
@@ -110,7 +110,7 @@ void daObjDigSnow_c::mode_init_dig() {
if (gnd_height != -G_CM3D_F_INF) {
mGroundHeight = gnd_height;
} else {
#ifdef DEBUG
#if DEBUG
// "No BG under digsnow!"
OS_REPORT_ERROR("掘る雪の下にＢＧがありません！");
fopAcM_delete(this);

Some files were not shown because too many files have changed in this diff Show More