From 934e14f12b5d8eac4acd19a99c48496b267821f9 Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Thu, 27 Mar 2025 00:45:52 -0700 Subject: [PATCH] fix debug build (#2345) --- include/JSystem/JAudio2/JASTrack.h | 3 +++ include/d/actor/d_a_b_gnd.h | 9 ++++++++- src/d/actor/d_a_b_gnd.cpp | 2 +- src/d/actor/d_a_obj_amiShutter.cpp | 4 ++-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/include/JSystem/JAudio2/JASTrack.h b/include/JSystem/JAudio2/JASTrack.h index 8afadf3e2e..d6b8df2660 100644 --- a/include/JSystem/JAudio2/JASTrack.h +++ b/include/JSystem/JAudio2/JASTrack.h @@ -52,7 +52,10 @@ struct JASTrack : public JASPoolAllocObject_MultiThreaded { }; struct MoveParam_ { + // TODO: fix this on debug +#if VERSION != VERSION_SHIELD_DEBUG /* 802932C8 */ MoveParam_() : mValue(0.0f), mTarget(0.0f), mCount(0) {} +#endif /* 0x00 */ f32 mValue; /* 0x04 */ f32 mTarget; diff --git a/include/d/actor/d_a_b_gnd.h b/include/d/actor/d_a_b_gnd.h index 603f9d44bc..b497f8557d 100644 --- a/include/d/actor/d_a_b_gnd.h +++ b/include/d/actor/d_a_b_gnd.h @@ -189,9 +189,16 @@ public: STATIC_ASSERT(sizeof(b_gnd_class) == 0x2790); -class daB_GND_HIO_c { +class daB_GND_HIO_c +#ifdef DEBUG +: public JORReflexible +#endif +{ public: /* 805F4A4C */ daB_GND_HIO_c(); +#if DEBUG + virtual void genMessage(JORMContext*); +#endif /* 80602230 */ virtual ~daB_GND_HIO_c() {} /* 0x04 */ s8 no; diff --git a/src/d/actor/d_a_b_gnd.cpp b/src/d/actor/d_a_b_gnd.cpp index 535b8cd73b..8274f54978 100644 --- a/src/d/actor/d_a_b_gnd.cpp +++ b/src/d/actor/d_a_b_gnd.cpp @@ -2560,7 +2560,7 @@ static void action(b_gnd_class* i_this) { i_this->speedF = 0.0f; mant_class* mant_p = (mant_class*)fopAcM_SearchByID(i_this->mMantChildID); - mant_p->unk3971 = 1; + mant_p->field_0x3969 = 1; h_anm_init(i_this, B_HG_BCK_HG_DOWN, 3.0f, 0, 1.0f); if (daPy_getPlayerActorClass()->checkHorseRide()) { diff --git a/src/d/actor/d_a_obj_amiShutter.cpp b/src/d/actor/d_a_obj_amiShutter.cpp index d83a753c75..d830b1ae2d 100644 --- a/src/d/actor/d_a_obj_amiShutter.cpp +++ b/src/d/actor/d_a_obj_amiShutter.cpp @@ -39,7 +39,7 @@ void daAmiShutter_HIO_c::genMessage(JORMContext* i_ctx) { #endif /* 80BA256C-80BA2580 000014 0014+00 6/6 0/0 0/0 .bss l_HIO */ -static const daAmiShutter_HIO_c l_HIO; +static daAmiShutter_HIO_c l_HIO; /* 80BA155C-80BA15E4 00017C 0088+00 2/2 0/0 0/0 .text setBaseMtx__14daAmiShutter_cFv */ void daAmiShutter_c::setBaseMtx() { @@ -103,7 +103,7 @@ cPhs__Step daAmiShutter_c::create() { } setBaseMtx(); #ifdef DEBUG - l_HIO.entryHIO("アミシャッター") + l_HIO.entryHIO("アミシャッター"); #endif } return phaseStep;