From a0536371e6156634670ff9e66d940e268046bd9d Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sat, 29 Mar 2025 20:09:32 -0400 Subject: [PATCH] player_swim 100%, bunch of inline cleanup --- include/d/actor/d_a_fganon.h | 2 +- include/d/actor/d_a_ikari.h | 2 +- include/d/actor/d_a_obj_hha.h | 10 +++---- include/d/actor/d_a_obj_toripost.h | 2 +- include/d/actor/d_a_shand.h | 2 +- include/d/actor/d_a_ship.h | 2 +- include/d/actor/d_a_tag_so.h | 2 +- include/d/actor/d_a_tori_flag.h | 10 +++---- include/d/d_com_inf_game.h | 40 +++++++++++++++++++------ include/d/d_particle.h | 9 ++++-- include/d/d_point_wind.h | 2 +- src/d/actor/d_a_agb.cpp | 4 +-- src/d/actor/d_a_am.cpp | 20 ++++++------- src/d/actor/d_a_am2.cpp | 22 +++++++------- src/d/actor/d_a_arrow.cpp | 8 ++--- src/d/actor/d_a_arrow_lighteff.cpp | 4 +-- src/d/actor/d_a_bk.cpp | 8 ++--- src/d/actor/d_a_ib.cpp | 4 +-- src/d/actor/d_a_item.cpp | 12 ++++---- src/d/actor/d_a_lamp.cpp | 18 +++++------- src/d/actor/d_a_npc_ji1.cpp | 8 ++--- src/d/actor/d_a_obj_hha.cpp | 2 +- src/d/actor/d_a_obj_toripost.cpp | 2 +- src/d/actor/d_a_obj_vgnfd.cpp | 6 ++-- src/d/actor/d_a_player_main.cpp | 4 +-- src/d/actor/d_a_player_particle.inc | 8 ++--- src/d/actor/d_a_player_swim.inc | 24 +++++++-------- src/d/actor/d_a_player_sword.inc | 2 +- src/d/actor/d_a_pw.cpp | 4 +-- src/d/actor/d_a_ship.cpp | 45 +++++++++++++++-------------- src/d/actor/d_a_tbox.cpp | 2 +- src/d/actor/d_a_tori_flag.cpp | 4 +-- src/d/actor/d_a_tornado.cpp | 4 +-- src/d/actor/d_a_wall.cpp | 2 +- src/d/d_a_ship_static.cpp | 10 +++---- src/d/d_com_inf_game.cpp | 4 +-- src/d/d_kankyo.cpp | 1 - src/d/d_particle.cpp | 6 ++-- src/d/d_s_play.cpp | 8 +++-- 39 files changed, 177 insertions(+), 152 deletions(-) diff --git a/include/d/actor/d_a_fganon.h b/include/d/actor/d_a_fganon.h index d9c86d53c..347770926 100644 --- a/include/d/actor/d_a_fganon.h +++ b/include/d/actor/d_a_fganon.h @@ -120,7 +120,7 @@ public: class daFganon_HIO_c { public: daFganon_HIO_c(); - virtual ~daFganon_HIO_c(){} + virtual ~daFganon_HIO_c() {} public: /* 0x00 */ // vtable diff --git a/include/d/actor/d_a_ikari.h b/include/d/actor/d_a_ikari.h index e9e4d642a..7ba5506cd 100644 --- a/include/d/actor/d_a_ikari.h +++ b/include/d/actor/d_a_ikari.h @@ -12,7 +12,7 @@ public: unk[1] = 0; mWindPowerScale = 0.1f; } - virtual ~daObjIkariHIO_c(){}; + virtual ~daObjIkariHIO_c() {}; void genMessage(JORMContext* ctx); diff --git a/include/d/actor/d_a_obj_hha.h b/include/d/actor/d_a_obj_hha.h index 8c64c54e9..e85a5308d 100644 --- a/include/d/actor/d_a_obj_hha.h +++ b/include/d/actor/d_a_obj_hha.h @@ -51,14 +51,14 @@ public: bool chk_stop() { return bIsActive == false; } void delete_s() { - if(mEcallBack.getEmitter() != NULL){ - mEcallBack.end(); + if(mSplashCb.getEmitter() != NULL){ + mSplashCb.remove(); bIsActive = false; } } void play_particle() { - JPABaseEmitter* pSplashEmitter = mEcallBack.getEmitter(); + JPABaseEmitter* pSplashEmitter = mSplashCb.getEmitter(); if(pSplashEmitter != NULL){ pSplashEmitter->clearStatus(1); bIsActive = true; @@ -66,7 +66,7 @@ public: } void stop_particle() { - JPABaseEmitter* pSplashEmitter = mEcallBack.getEmitter(); + JPABaseEmitter* pSplashEmitter = mSplashCb.getEmitter(); if(pSplashEmitter != NULL){ pSplashEmitter->setStatus(1); bIsActive = false; @@ -76,7 +76,7 @@ public: void create_s(u16, cXyz*, float, float, csXyz*); public: - /* 0x00 */ dPa_followEcallBack mEcallBack; + /* 0x00 */ dPa_followEcallBack mSplashCb; /* 0x14 */ cXyz mBasePos; /* 0x20 */ cXyz mPos; /* 0x2C */ csXyz mAngle; diff --git a/include/d/actor/d_a_obj_toripost.h b/include/d/actor/d_a_obj_toripost.h index 996e751eb..cc8470631 100644 --- a/include/d/actor/d_a_obj_toripost.h +++ b/include/d/actor/d_a_obj_toripost.h @@ -42,7 +42,7 @@ public: }; void eventSet(s8 eventIdx) { mEventIdx = eventIdx; } - s32 getSendPrice() { return m_send_price[mPayType]; } + int getSendPrice() { return m_send_price[mPayType]; } bool isAnm(s8 idx) { return mAnmPrmIdx == idx; } void modeProcInit(int newMode) { modeProc(PROC_INIT, newMode); } diff --git a/include/d/actor/d_a_shand.h b/include/d/actor/d_a_shand.h index 2b082c68e..d1b9d0b0c 100644 --- a/include/d/actor/d_a_shand.h +++ b/include/d/actor/d_a_shand.h @@ -49,7 +49,7 @@ public: class daShand_HIO_c : public JORReflexible { public: daShand_HIO_c(); - virtual ~daShand_HIO_c(){}; + virtual ~daShand_HIO_c() {}; void genMessage(JORMContext* ctx){}; diff --git a/include/d/actor/d_a_ship.h b/include/d/actor/d_a_ship.h index e2eaa34f9..ac5f77453 100644 --- a/include/d/actor/d_a_ship.h +++ b/include/d/actor/d_a_ship.h @@ -359,7 +359,7 @@ public: class daShip_HIO_c0 { public: - ~daShip_HIO_c0(){} + ~daShip_HIO_c0() {} /* 0x00 */ static const s16 tiller_speed; /* 0x02 */ static const s16 cannon_no_gravity_timer; diff --git a/include/d/actor/d_a_tag_so.h b/include/d/actor/d_a_tag_so.h index a83a4d6ae..f994c8bca 100644 --- a/include/d/actor/d_a_tag_so.h +++ b/include/d/actor/d_a_tag_so.h @@ -29,7 +29,7 @@ public: class daTag_So_HIO_c { public: daTag_So_HIO_c(); - virtual ~daTag_So_HIO_c(){} + virtual ~daTag_So_HIO_c() {} public: /* 0x00 */ //vtable diff --git a/include/d/actor/d_a_tori_flag.h b/include/d/actor/d_a_tori_flag.h index 5f45e77b0..952ac722f 100644 --- a/include/d/actor/d_a_tori_flag.h +++ b/include/d/actor/d_a_tori_flag.h @@ -8,17 +8,15 @@ class daTori_Flag_HIO_c { public: - // Constructor daTori_Flag_HIO_c(); - // Virtual Destructor - virtual ~daTori_Flag_HIO_c(){} + virtual ~daTori_Flag_HIO_c() {} public: /* 0x00 */ //vtable - /* 0x04 */ signed char mNo; - /* 0x08 */ float someFloat; - /* 0x0c */ signed short someShort; + /* 0x04 */ s8 mNo; + /* 0x08 */ f32 m08; + /* 0x0C */ s16 m0C; }; class daTori_Flag_c : public fopAc_ac_c { diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index a31319223..6245a0f34 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -381,12 +381,22 @@ public: void setItemBeastNumCount(int i_idx, s16 num) { mItemBeastNumCounts[i_idx] += num; } s32 getItemTimeCount() { return mAirMeter; } - void setItemTimeCount(s32 time) { mAirMeter = time; } - void clearItemTimeCount() { mAirMeter = 0; } - + void setItemTimeCount(s32 time) { + mAirMeter = time; + mItemSwimTimerStatus = true; + } + void clearItemTimeCount() { + mAirMeter = 0; + mItemSwimTimerStatus = false; + } + s32 getItemTimeMax() { return mItemTimeMax; } void setItemTimeMax(s32 time) { mItemTimeMax = time; } + bool getItemSwimTimerStatus() { return mItemSwimTimerStatus; } + void startItemSwimTimer() { mItemSwimTimerStatus = true; } + void stopItemSwimTimer() { mItemSwimTimerStatus = false; } + u8 getScopeType() { return mScopeType; } void setScopeType(u8 type) { mScopeType = type; } @@ -636,9 +646,9 @@ public: /* 0x48AC */ fopAc_ac_c* mpPlayerPtr[3]; // 0: Link, 1: Partner, 2: Ship /* 0x48B8 */ f32 field_0x48b8; /* 0x48BC */ f32 mItemLifeCount; - /* 0x48C0 */ int mItemRupeeCount; - /* 0x48C4 */ int mAirMeter; - /* 0x48C8 */ int field_0x48c8; + /* 0x48C0 */ s32 mItemRupeeCount; + /* 0x48C4 */ s32 mAirMeter; + /* 0x48C8 */ s32 mItemTimeMax; /* 0x48CC */ u32 mNpcNameMessageID; /* 0x48D0 */ u32 mItemNameMessageID; /* 0x48D4 */ s16 mItemKeyNumCount; @@ -661,7 +671,7 @@ public: /* 0x4922 */ s16 mItemTimer; /* 0x4924 */ s16 mItemNowLife; /* 0x4926 */ s16 mItemNowRupee; - /* 0x4928 */ u8 mItemTimeMax; + /* 0x4928 */ bool mItemSwimTimerStatus; /* 0x4929 */ u8 field_0x4929; /* 0x492A */ u8 mMesgStatus; /* 0x492B */ u8 mbCamOverrideFarPlane; @@ -2244,12 +2254,24 @@ inline void dComIfGp_clearItemTimeCount() { g_dComIfG_gameInfo.play.clearItemTimeCount(); } +inline u32 dComIfGp_getItemTimeMax() { + return g_dComIfG_gameInfo.play.getItemTimeMax(); +} + inline void dComIfGp_setItemTimeMax(s32 time) { g_dComIfG_gameInfo.play.setItemTimeMax(time); } -inline u32 dComIfGp_getItemTimeMax() { - return g_dComIfG_gameInfo.play.getItemTimeMax(); +inline bool dComIfGp_getItemSwimTimerStatus() { + return g_dComIfG_gameInfo.play.getItemSwimTimerStatus(); +} + +inline void dComIfGp_startItemSwimTimer() { + g_dComIfG_gameInfo.play.startItemSwimTimer(); +} + +inline void dComIfGp_stopItemSwimTimer() { + g_dComIfG_gameInfo.play.stopItemSwimTimer(); } inline void dComIfGp_setMessageCountNumber(s16 num) { diff --git a/include/d/d_particle.h b/include/d/d_particle.h index 2a377494f..385e71994 100644 --- a/include/d/d_particle.h +++ b/include/d/d_particle.h @@ -52,7 +52,11 @@ public: JPABaseEmitter* getEmitter() { return mpEmitter; } void setRateOff(u8 param_0) { mRateOff = param_0; } bool isEnd() { return mFlag & 1; } + void onEnd() { mFlag |= 1; } + void remove() { end(); } + void setFollowOff() { field_0x12 = 1; } +protected: /* 0x04 */ JPABaseEmitter* mpEmitter; /* 0x08 */ const cXyz* mPos; /* 0x0C */ const csXyz* mAngle; @@ -79,11 +83,12 @@ public: void remove() { end(); } void offWindOff() {} - void onWindOff() {} + void onWindOff() { mWindOff = 1; } void setColor(const GXColor& color) { mColor = color; } +private: /* 0x14 */ s8 field_0x14; - /* 0x15 */ u8 field_0x15; + /* 0x15 */ u8 mWindOff; /* 0x16 */ GXColor mColor; /* 0x1A */ u8 field_0x1A[0x1C - 0x1A]; /* 0x1C */ dKy_tevstr_c* mTevstr; diff --git a/include/d/d_point_wind.h b/include/d/d_point_wind.h index dcf95338c..5c7cc7281 100644 --- a/include/d/d_point_wind.h +++ b/include/d/d_point_wind.h @@ -11,7 +11,7 @@ public: void set_pwind_init(cM3dGCpsS * pCps); void set_pwind_power(float windStrength){ mWind.mStrength = windStrength; } - float get_pwind_power_p(){ return mWind.mStrength; } + float get_pwind_power_p() { return mWind.mStrength; } void set_pwind_move(); void set_pwind_delete(); }; diff --git a/src/d/actor/d_a_agb.cpp b/src/d/actor/d_a_agb.cpp index 2e54b4613..2e7cbf31c 100644 --- a/src/d/actor/d_a_agb.cpp +++ b/src/d/actor/d_a_agb.cpp @@ -1575,7 +1575,7 @@ static BOOL daAgb_Execute(daAgb_c* i_this) { i_this->field_0x66b = 0; i_this->field_0x630 = 0; i_this->field_0x632 = 0; - i_this->field_0x684.end(); + i_this->field_0x684.remove(); } i_this->modeProcCall(); @@ -1704,7 +1704,7 @@ static BOOL daAgb_IsDelete(daAgb_c* i_this) { /* 800D38F8-800D394C .text daAgb_Delete__FP7daAgb_c */ static BOOL daAgb_Delete(daAgb_c* i_this) { dComIfG_resDelete(&i_this->mPhase, "Agb"); - i_this->field_0x684.end(); + i_this->field_0x684.remove(); return TRUE; } diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp index 9f7fedda9..e20dff582 100644 --- a/src/d/actor/d_a_am.cpp +++ b/src/d/actor/d_a_am.cpp @@ -585,7 +585,7 @@ static void action_dousa(am_class* i_this) { break; } fopAcM_seStart(i_this, JA_SE_CM_AM_JUMP, 0); - i_this->mSmokeCbs[0].end(); + i_this->mSmokeCbs[0].remove(); dComIfGp_particle_setToon( dPa_name::ID_SCENE_A125, &i_this->mWaistPos, &i_this->shape_angle, NULL, 0xB9, &i_this->mSmokeCbs[0], fopAcM_GetRoomNo(i_this) @@ -634,7 +634,7 @@ static void action_dousa(am_class* i_this) { i_this->mTargetAngleY = fopAcM_searchPlayerAngleY(i_this); } if (i_this->mCountDownTimers[0] == 0) { - i_this->mSmokeCbs[2].end(); + i_this->mSmokeCbs[2].remove(); i_this->mState = 3; } break; @@ -656,9 +656,9 @@ static void action_dousa(am_class* i_this) { medama_move(i_this); if (i_this->mState != 2 && medama_atari_check(i_this)) { - i_this->mSmokeCbs[2].end(); + i_this->mSmokeCbs[2].remove(); } else if (bomb_nomi_check(i_this)) { - i_this->mSmokeCbs[2].end(); + i_this->mSmokeCbs[2].remove(); } } @@ -684,7 +684,7 @@ static void action_modoru_move(am_class* i_this) { f32 xDistToSpawn = i_this->mSpawnPos.x - i_this->current.pos.x; f32 zDistToSpawn = i_this->mSpawnPos.z - i_this->current.pos.z; if (i_this->mAcch.ChkGroundHit()) { - i_this->mSmokeCbs[0].end(); + i_this->mSmokeCbs[0].remove(); dComIfGp_particle_setToon( dPa_name::ID_SCENE_A125, &i_this->mWaistPos, &i_this->shape_angle, NULL, 0xB9, &i_this->mSmokeCbs[0], fopAcM_GetRoomNo(i_this) @@ -806,7 +806,7 @@ static void action_itai_move(am_class* i_this) { i_this->mState = 3; break; case 44: - i_this->mSmokeCbs[3].end(); + i_this->mSmokeCbs[3].remove(); i_this->mStts.SetWeight(0xFF); dComIfGp_particle_setToon( dPa_name::ID_SCENE_A155, &i_this->mJawPos, &i_this->shape_angle, NULL, @@ -830,7 +830,7 @@ static void action_itai_move(am_class* i_this) { fopAcM_monsSeStart(i_this, JA_SE_CV_AM_EAT_BOMB, 0); } if (i_this->mpMorf->checkFrame(6.0f)) { - i_this->mSmokeCbs[1].end(); + i_this->mSmokeCbs[1].remove(); i_this->mNeedleCyl.OnAtSetBit(); i_this->mNeedleCyl.OnAtHitBit(); dComIfGp_particle_setToon( @@ -852,7 +852,7 @@ static void action_itai_move(am_class* i_this) { bomb_move_set(i_this, 1); i_this->shape_angle.y += 0x1000; if (i_this->mAcch.ChkGroundHit()) { - i_this->mSmokeCbs[0].end(); + i_this->mSmokeCbs[0].remove(); // The fopAcM_seStart inline makes the codegen not match. // fopAcM_seStart(i_this, JA_SE_CM_AM_JUMP, 0); mDoAud_seStart(JA_SE_CM_AM_JUMP, &i_this->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this))); @@ -1059,9 +1059,9 @@ static BOOL daAM_Delete(am_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "AM"); for (int i = 0; i < 4; i++) { - i_this->mSmokeCbs[i].end(); + i_this->mSmokeCbs[i].remove(); } - i_this->mSmokeCbs[2].end(); + i_this->mSmokeCbs[2].remove(); if (i_this->m033C) { i_this->m033C->becomeInvalidEmitter(); diff --git a/src/d/actor/d_a_am2.cpp b/src/d/actor/d_a_am2.cpp index 8e3e76e18..ea9ab2802 100644 --- a/src/d/actor/d_a_am2.cpp +++ b/src/d/actor/d_a_am2.cpp @@ -421,7 +421,7 @@ static BOOL naraku_check(am2_class* i_this) { i_this->mbMadeWaterSplash = true; cXyz particleScale(1.0f, 1.0f, 1.0f); - i_this->mRippleCb.end(); + i_this->mRippleCb.remove(); dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0033, &i_this->current.pos, NULL, &particleScale, 0xFF, &i_this->mRippleCb); i_this->mRippleCb.setRate(0.0f); } @@ -436,7 +436,7 @@ static BOOL naraku_check(am2_class* i_this) { } } else if (i_this->mbMadeWaterSplash) { i_this->mbMadeWaterSplash = false; - i_this->mRippleCb.end(); + i_this->mRippleCb.remove(); } return FALSE; @@ -538,7 +538,7 @@ static void action_dousa(am2_class* i_this) { } if (i_this->mAcch.ChkGroundHit()) { fopAcM_seStart(i_this, JA_SE_CM_AM2_LANDING, 0); - i_this->mSmokeCb.end(); + i_this->mSmokeCb.remove(); // Using the fopAcM_seStart inline multiple times in a single case makes the codegen not match. // fopAcM_seStart(i_this, JA_SE_CM_AM_JUMP_S, 0); mDoAud_seStart(JA_SE_CM_AM_JUMP_S, &i_this->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this))); @@ -663,7 +663,7 @@ static void action_mahi(am2_class* i_this) { if (fopAcM_CheckStatus(actor, fopAcStts_CARRY_e)) { i_this->mAcchRadius = 40.0f + REG8_F(10); i_this->mbMadeWaterSplash = false; - i_this->mRippleCb.end(); + i_this->mRippleCb.remove(); i_this->mPickedUpYPos = actor->current.pos.y; fopAcM_OffStatus(actor, fopAcStts_SHOWMAP_e); actor->current.angle.y = player->shape_angle.y; @@ -719,10 +719,10 @@ static void action_mahi(am2_class* i_this) { i_this->mAcch.OffLineCheck(); i_this->mbMadeWaterSplash = false; - i_this->mRippleCb.end(); + i_this->mRippleCb.remove(); if (i_this->mCountUpTimers[0] == 0) { - i_this->mSmokeCb.end(); + i_this->mSmokeCb.remove(); fopAcM_seStart(actor, JA_SE_CM_AM2_LANDING, 0); dComIfGp_particle_setToon(dPa_name::ID_SCENE_A125, &actor->current.pos, &actor->shape_angle, NULL, 0xB9, &i_this->mSmokeCb, fopAcM_GetRoomNo(actor)); @@ -896,7 +896,7 @@ static void action_itai(am2_class* i_this) { i_this->shape_angle.y += 0x1000; if (i_this->mAcch.ChkGroundHit()) { - i_this->mSmokeCb.end(); + i_this->mSmokeCb.remove(); dComIfGp_particle_setToon(dPa_name::ID_SCENE_A125, &i_this->current.pos, &i_this->shape_angle, NULL, 0xB9, &i_this->mSmokeCb, fopAcM_GetRoomNo(i_this)); if (i_this->mSmokeCb.getEmitter()) { i_this->mSmokeCb.getEmitter()->setRate(12.0f); @@ -1010,7 +1010,7 @@ static void action_modoru_move(am2_class* i_this) { dCam_getBody()->ForceLockOff(fopAcM_GetID(i_this)); i_this->mInAbyssTimer = 0; i_this->mbMadeWaterSplash = false; - i_this->mRippleCb.end(); + i_this->mRippleCb.remove(); anm_init(i_this, AM2_BCK_WAIT, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); fopAcM_seStart(i_this, JA_SE_CM_AM2_WTR_RECOVER, 0); i_this->mState++; @@ -1024,7 +1024,7 @@ static void action_modoru_move(am2_class* i_this) { i_this->speed.setall(0.0f); i_this->gravity = -3.0f; i_this->mbMadeWaterSplash = false; - i_this->mRippleCb.end(); + i_this->mRippleCb.remove(); i_this->current.angle.y = i_this->shape_angle.y; i_this->current.pos = i_this->mSpawnPos; @@ -1173,8 +1173,8 @@ static BOOL daAM2_IsDelete(am2_class* i_this) { static BOOL daAM2_Delete(am2_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "AM2"); - i_this->mSmokeCb.end(); - i_this->mRippleCb.end(); + i_this->mSmokeCb.remove(); + i_this->mRippleCb.remove(); return TRUE; } diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp index 3865ae668..9347431cf 100644 --- a/src/d/actor/d_a_arrow.cpp +++ b/src/d/actor/d_a_arrow.cpp @@ -179,7 +179,7 @@ void daArrow_c::setBlur() { } s32 alpha = blurEmitter->getGlobalAlpha(); if (alpha - 50 <= 0) { - mBlurFollowCb.end(); + mBlurFollowCb.remove(); } else { blurEmitter->setGlobalAlpha(alpha - 50); } @@ -722,8 +722,8 @@ BOOL daArrow_c::procMove() { field_0x604 = 0x28; fopAcM_OnStatus(this, fopAcStts_UNK4000_e); - if (mBlurFollowCb.mpEmitter) { - mBlurFollowCb.end(); + if (mBlurFollowCb.getEmitter()) { + mBlurFollowCb.remove(); } if (hitType == 1) { // Blocked hit @@ -1251,7 +1251,7 @@ cPhs_State daArrow_c::_create() { /* 800D81D0-800D8200 .text _delete__9daArrow_cFv */ BOOL daArrow_c::_delete() { - mBlurFollowCb.end(); + mBlurFollowCb.remove(); return TRUE; } diff --git a/src/d/actor/d_a_arrow_lighteff.cpp b/src/d/actor/d_a_arrow_lighteff.cpp index 5ca4df33b..f9bf8fea0 100644 --- a/src/d/actor/d_a_arrow_lighteff.cpp +++ b/src/d/actor/d_a_arrow_lighteff.cpp @@ -58,14 +58,14 @@ void daArrow_Lighteff_c::delete_particle() { field_0x2F4.getEmitter()->setGlobalAlpha(0); } - field_0x2F4.end(); + field_0x2F4.remove(); } if(field_0x308.getEmitter()) { if(field_0x2E8 == 3) { field_0x308.getEmitter()->setGlobalAlpha(0); } - field_0x308.end(); + field_0x308.remove(); } } diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp index 768e95540..b33b4e222 100644 --- a/src/d/actor/d_a_bk.cpp +++ b/src/d/actor/d_a_bk.cpp @@ -164,7 +164,7 @@ static void smoke_set_s(bk_class* i_this, f32 rate) { case dBgS_Attr_WOOD_e: case dBgS_Attr_STONE_e: case dBgS_Attr_SAND_e: { - i_this->m0350.end(); + i_this->m0350.remove(); JPABaseEmitter* emitter1 = dComIfGp_particle_setToon( dPa_name::ID_COMMON_2022, &i_this->m0338, &i_this->m0344, NULL, 0xB9, &i_this->m0350, fopAcM_GetRoomNo(i_this) @@ -255,7 +255,7 @@ static void ground_smoke_set(bk_class* i_this) { } if (i_this->m034C == 0) { - i_this->m0350.end(); + i_this->m0350.remove(); i_this->m034F = 0; } } @@ -4507,8 +4507,8 @@ static BOOL daBk_Delete(bk_class* i_this) { hio_set = 0; mDoHIO_deleteChild(l_bkHIO.mNo); } - i_this->m0350.end(); - i_this->dr.mParticleCallBack.end(); + i_this->m0350.remove(); + i_this->dr.mParticleCallBack.remove(); enemy_fire_remove(&i_this->mEnemyFire); return TRUE; } diff --git a/src/d/actor/d_a_ib.cpp b/src/d/actor/d_a_ib.cpp index ed60e35a4..b21cd1b74 100644 --- a/src/d/actor/d_a_ib.cpp +++ b/src/d/actor/d_a_ib.cpp @@ -222,7 +222,7 @@ void daIball_c::checkGeo() { /* 800F3E78-800F3EB0 .text mode_wait_init__9daIball_cFv */ void daIball_c::mode_wait_init() { - mRippleCb.end(); + mRippleCb.remove(); mMode = MODE_WAIT; } @@ -395,7 +395,7 @@ BOOL daIball_c::_daIball_execute() { /* 800F4634-800F4678 .text _daIball_delete__9daIball_cFv */ BOOL daIball_c::_daIball_delete() { - mRippleCb.end(); + mRippleCb.remove(); dKy_plight_cut(&mLight); remove(this); return TRUE; diff --git a/src/d/actor/d_a_item.cpp b/src/d/actor/d_a_item.cpp index 2a05cf1c5..53d445a6e 100644 --- a/src/d/actor/d_a_item.cpp +++ b/src/d/actor/d_a_item.cpp @@ -358,7 +358,7 @@ void daItem_c::execInitNormalDirection() { mCyl.SetTgType(0); mCyl.OffCoSetBit(); - mPtclSmokeCb.end(); + mPtclSmokeCb.remove(); if (mpParticleEmitter) { mpParticleEmitter->becomeInvalidEmitter(); mpParticleEmitter = NULL; @@ -393,7 +393,7 @@ void daItem_c::execInitGetDemoDirection() { daPy_lk_c* link = daPy_getPlayerLinkActorClass(); hide(); - mPtclFollowCb.end(); + mPtclFollowCb.remove(); if (player == link) { fopAcM_orderItemEvent(this); @@ -534,9 +534,9 @@ void daItem_c::setTevStr() { /* 800F61C8-800F6268 .text _daItem_delete__8daItem_cFv */ BOOL daItem_c::_daItem_delete() { - mPtclRippleCb.end(); - mPtclFollowCb.end(); - mPtclSmokeCb.end(); + mPtclRippleCb.remove(); + mPtclFollowCb.remove(); + mPtclSmokeCb.remove(); if (mpParticleEmitter) { mpParticleEmitter->becomeInvalidEmitter(); mpParticleEmitter = NULL; @@ -1199,7 +1199,7 @@ BOOL daItem_c::timeCount() { void daItem_c::mode_wait_init() { mMode = MODE_WAIT; gravity = getData()->mGravity; - mPtclRippleCb.end(); + mPtclRippleCb.remove(); } /* 800F7F50-800F80CC .text mode_water_init__8daItem_cFv */ diff --git a/src/d/actor/d_a_lamp.cpp b/src/d/actor/d_a_lamp.cpp index 043a783c2..1f10f22db 100644 --- a/src/d/actor/d_a_lamp.cpp +++ b/src/d/actor/d_a_lamp.cpp @@ -122,7 +122,7 @@ static BOOL daLamp_Execute(lamp_class* i_this) { } } else { i_this->mHitTimeoutLeft--; - if (i_this->mPa.mpEmitter) { + if (i_this->mPa.getEmitter()) { float tgtZ; if (i_this->mHitTimeoutLeft > 10) { tgtZ = 4.0f; @@ -131,14 +131,12 @@ static BOOL daLamp_Execute(lamp_class* i_this) { } cLib_addCalc2(&i_this->mHitReactCurZ, tgtZ, 1.0f, 0.5f); cMtx_YrotS(*calc_mtx, i_this->mHitAngle); - cXyz localPos; - localPos.set(0.0f, 1.0f, i_this->mHitReactCurZ); - cXyz globalPos; - MtxPosition(&localPos, &globalPos); - float y = globalPos.y; - float z = globalPos.z; - float x = globalPos.x; - i_this->mPa.mpEmitter->mEmitterDir.set(x, y, z); + cXyz offset; + offset.set(0.0f, 1.0f, i_this->mHitReactCurZ); + cXyz rotOffset; + MtxPosition(&offset, &rotOffset); + JGeometry::TVec3 dir(rotOffset); + i_this->mPa.getEmitter()->setDirection(dir); } } @@ -147,7 +145,7 @@ static BOOL daLamp_Execute(lamp_class* i_this) { /* 00000604-00000634 .text daLamp_IsDelete__FP10lamp_class */ static BOOL daLamp_IsDelete(lamp_class* i_this) { - i_this->mPa.end(); + i_this->mPa.remove(); return TRUE; } diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp index de42ed846..548906bb6 100644 --- a/src/d/actor/d_a_npc_ji1.cpp +++ b/src/d/actor/d_a_npc_ji1.cpp @@ -1896,7 +1896,7 @@ u32 daNpc_Ji1_c::setParticle(int max, f32 rate, f32 spread) { /* 000058B8-000058F0 .text dtParticle__11daNpc_Ji1_cFv */ void daNpc_Ji1_c::dtParticle() { if(field_0x2E0.getEmitter()) { - field_0x2E0.end(); + field_0x2E0.remove(); } } @@ -1926,7 +1926,7 @@ u32 daNpc_Ji1_c::setParticleAT(int max, f32 rate, f32 spread) { /* 000059E8-00005A20 .text dtParticleAT__11daNpc_Ji1_cFv */ void daNpc_Ji1_c::dtParticleAT() { if(field_0x300.getEmitter()) { - field_0x300.end(); + field_0x300.remove(); } } @@ -3444,8 +3444,8 @@ BOOL daNpc_Ji1_c::_delete() { dComIfGp_att_revivalAleart(); - field_0x2E0.end(); - field_0x300.end(); + field_0x2E0.remove(); + field_0x300.remove(); return true; } diff --git a/src/d/actor/d_a_obj_hha.cpp b/src/d/actor/d_a_obj_hha.cpp index e3b83e0fe..6765a74df 100644 --- a/src/d/actor/d_a_obj_hha.cpp +++ b/src/d/actor/d_a_obj_hha.cpp @@ -182,7 +182,7 @@ void daObjHhaSplash_c::create_s(u16 particleID, cXyz* pPos, float offsetY, float mPos += calcVec; mBasePos = mPos; mAngle = *pAngle; - dComIfGp_particle_set(particleID, &mPos, &mAngle, NULL, 255, &mEcallBack); + dComIfGp_particle_set(particleID, &mPos, &mAngle, NULL, 255, &mSplashCb); bIsActive = true; } diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp index 6c4bcff90..27b58757e 100644 --- a/src/d/actor/d_a_obj_toripost.cpp +++ b/src/d/actor/d_a_obj_toripost.cpp @@ -466,7 +466,7 @@ u16 daObjTpost_c::next_msgStatus(u32* pMsgNo) { case 0xCF4: case 0xCF8: if(mpCurrMsg->mSelectNum == 0) { - s32 price = 0x0A; + int price = 0x0A; if(m_letter[mNumReadable].mEventReg == 0xB203) { price = 0xC9; } diff --git a/src/d/actor/d_a_obj_vgnfd.cpp b/src/d/actor/d_a_obj_vgnfd.cpp index 044b063d5..f69efaf0f 100644 --- a/src/d/actor/d_a_obj_vgnfd.cpp +++ b/src/d/actor/d_a_obj_vgnfd.cpp @@ -186,8 +186,8 @@ cPhs_State daObjVgnfd_c::_create() { fopAcM_setCullSizeBox(this, -260.0f, -10.0f, -50.0f, 260.0f, 510.0f, 100.0f); mSmoke.setTevStr(&tevStr); mSmoke.setRateOff(0); - mSmoke.field_0x15 = 1; - mSmoke.field_0x12 = 1; + mSmoke.onWindOff(); + mSmoke.setFollowOff(); dComIfG_Bgsp()->Regist(M_bgw, this); M_bgw->Move(); @@ -209,7 +209,7 @@ bool daObjVgnfd_c::_delete() { } } - mSmoke.end(); + mSmoke.remove(); dComIfG_resDelete(&mPhs, M_arcname); return true; } diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index 9c7769ce1..1e0949505 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/src/d/actor/d_a_player_main.cpp @@ -3799,8 +3799,8 @@ static BOOL daPy_IsDelete(daPy_lk_c*) { BOOL daPy_lk_c::playerDelete() { int i; for (i = 0; i < (int)ARRAY_SIZE(mFootEffect); i++) { - mFootEffect[i].getSmokeCallBack()->end(); - mFootEffect[i].getOtherCallBack()->end(); + mFootEffect[i].getSmokeCallBack()->remove(); + mFootEffect[i].getOtherCallBack()->remove(); } if (mFanSwingCb.mpEmitter) { mFanSwingCb.mpEmitter->clearStatus(0x40); diff --git a/src/d/actor/d_a_player_particle.inc b/src/d/actor/d_a_player_particle.inc index a411e470b..3bc320e8e 100644 --- a/src/d/actor/d_a_player_particle.inc +++ b/src/d/actor/d_a_player_particle.inc @@ -821,8 +821,8 @@ void daPy_lk_c::setFootEffectType(int effectID, cXyz* i_pos, int param_2, int pa s32 oldEffectID = footEffect->getID(); if (effectID != oldEffectID) { if (oldEffectID != -1) { - footEffect->getSmokeCallBack()->end(); - footEffect->getOtherCallBack()->end(); + footEffect->getSmokeCallBack()->remove(); + footEffect->getOtherCallBack()->remove(); } if (effectID == -2) { @@ -1058,8 +1058,8 @@ void daPy_lk_c::setFootEffect() { void daPy_lk_c::resetFootEffect() { daPy_footEffect_c* pFootEffect = mFootEffect; for (int idx = 0; idx < (s32)ARRAY_SIZE(mFootEffect); idx++, pFootEffect++) { - pFootEffect->getSmokeCallBack()->end(); - pFootEffect->getOtherCallBack()->end(); + pFootEffect->getSmokeCallBack()->remove(); + pFootEffect->getOtherCallBack()->remove(); pFootEffect->setID(-1); } diff --git a/src/d/actor/d_a_player_swim.inc b/src/d/actor/d_a_player_swim.inc index 65c911fad..8732361a0 100644 --- a/src/d/actor/d_a_player_swim.inc +++ b/src/d/actor/d_a_player_swim.inc @@ -114,14 +114,12 @@ BOOL daPy_lk_c::checkNextModeSwim() { /* 8013CFC0-8013D1B0 .text changeSwimProc__9daPy_lk_cFv */ BOOL daPy_lk_c::changeSwimProc() { - float fVar1; BOOL res; cXyz local_18; if (checkNoResetFlg0(daPyFlg0_UNK80) && !checkModeFlg(ModeFlg_IN_SHIP | ModeFlg_SWIM) && !checkNoControll() && mDemo.getDemoMode() != daPy_demo_c::DEMO_UNK11_e && m35D0 - current.pos.y > l_HIO_swim_c0.m.field_0x24) { dComIfGp_setItemTimeCount(900); - dComIfGp_setItemTimeMax(1); - g_dComIfG_gameInfo.play.field_0x48c8 = 900; // Some inline? Debug maps make no mention of this function but perhaps it was used earlier? + dComIfGp_setItemTimeMax(900); offNoResetFlg0(daPyFlg0_EQUIP_HEAVY_BOOTS); offNoResetFlg1(daPyFlg1_EQUIP_DRAGON_SHIELD); @@ -205,13 +203,12 @@ void daPy_lk_c::swimOutAfter(int param_1) { seStartOnlyReverb(JA_SE_LK_OUTOF_WATER); } dComIfGp_clearItemTimeCount(); - dComIfGp_setItemTimeMax(0); resetPriTextureAnime(); } /* 8013D314-8013D354 .text checkSwimFallCheck__9daPy_lk_cFv */ BOOL daPy_lk_c::checkSwimFallCheck() { - if (!checkNoResetFlg0(daPyFlg0_UNK80) || current.pos.y > m35D0 + 30.1f && !dPa_control_c::isStatus(1)) { + if (!checkNoResetFlg0(daPyFlg0_UNK80) || (current.pos.y > m35D0 + 30.1f && !dPa_control_c::isStatus(1))) { return TRUE; } return FALSE; @@ -262,10 +259,12 @@ BOOL daPy_lk_c::changeSwimOutProc() { /* 8013D530-8013D638 .text setSwimMoveAnime__9daPy_lk_cFQ29daPy_lk_c8daPy_ANM */ void daPy_lk_c::setSwimMoveAnime(daPy_ANM swimMoveAnm) { - /* Nonmatching */ - //float startFrame = mFrameCtrlUnder[0].getFrame(); - float endFrame = mFrameCtrlUnder[0].getEnd(); - setSingleMoveAnime(swimMoveAnm, (std::fabsf(mVelocity) * ((l_HIO_swim_c0.m.field_0x54 - l_HIO_swim_c0.m.field_0x50))) / mMaxNormalSpeed + l_HIO_swim_c0.m.field_0x50 + (float)(getSwimTimerRate() * l_HIO_swim_c0.m.field_0x74), 0.0f, -1, l_HIO_swim_c0.m.field_0x58); // Missing a `* currentFrame` in here? + f32 startFrame = mFrameCtrlUnder[0].getFrame(); + f32 endFrame = startFrame * mFrameCtrlUnder[0].getEnd(); + f32 rate = (std::fabsf(mVelocity) * (l_HIO_swim_c0.m.field_0x54 - l_HIO_swim_c0.m.field_0x50) / mMaxNormalSpeed) + + l_HIO_swim_c0.m.field_0x50 + + (getSwimTimerRate() * l_HIO_swim_c0.m.field_0x74); + setSingleMoveAnime(swimMoveAnm, rate, 0.0f, -1, l_HIO_swim_c0.m.field_0x58); mFrameCtrlUnder[0].setFrame(endFrame * mFrameCtrlUnder[0].getEnd()); mAnmRatioUnder[0].getAnmTransform()->setFrame(mFrameCtrlUnder[0].getFrame()); } @@ -273,7 +272,7 @@ void daPy_lk_c::setSwimMoveAnime(daPy_ANM swimMoveAnm) { /* 8013D638-8013D6B8 .text getSwimTimerRate__9daPy_lk_cFv */ f32 daPy_lk_c::getSwimTimerRate() { f32 swimTimerRate; - if (dComIfGp_getItemTimeMax() != 0 && dComIfGp_event_getMode() == dEvtMode_NONE_e) { + if (dComIfGp_getItemSwimTimerStatus() && dComIfGp_event_getMode() == dEvtMode_NONE_e) { swimTimerRate = (1.0f - dComIfGp_getItemTimeCount() * 0.0011111111f); } else { @@ -292,7 +291,7 @@ void daPy_lk_c::setSwimTimerStartStop() { float target = 0.0f; if (mAcch.GetGroundH() <= m35D0 - 175.0f) { - dComIfGp_setItemTimeMax(1); + dComIfGp_startItemSwimTimer(); if (checkNoResetFlg0(daPyFlg0_UNK100)) { float swimTimerRate = getSwimTimerRate(); @@ -314,8 +313,7 @@ void daPy_lk_c::setSwimTimerStartStop() { } else { dComIfGp_setItemTimeCount(900); - dComIfGp_setItemTimeMax(1); - dComIfGp_setItemTimeMax(0); //Fakematch? Seems nonsensical to set it to 1 then immediately to 0, also could be `dComIfGp_stopItemSwimTimer` and `dComIfGp_startItemSwimTimer` inlines mentioned in the debug maps + dComIfGp_stopItemSwimTimer(); } cLib_chaseF(&m3608, target, 3.0f); diff --git a/src/d/actor/d_a_player_sword.inc b/src/d/actor/d_a_player_sword.inc index 1b5aff51e..3da7cc383 100644 --- a/src/d/actor/d_a_player_sword.inc +++ b/src/d/actor/d_a_player_sword.inc @@ -242,7 +242,7 @@ void daPy_lk_c::setJumpCutAtParam() { } /* 80155970-801559F0 .text getCutDirection__9daPy_lk_cFv */ -int daPy_lk_c::getCutDirection(){ +int daPy_lk_c::getCutDirection() { int iVar1; s16 sVar2; diff --git a/src/d/actor/d_a_pw.cpp b/src/d/actor/d_a_pw.cpp index fd71f499a..f0e4a6d35 100644 --- a/src/d/actor/d_a_pw.cpp +++ b/src/d/actor/d_a_pw.cpp @@ -393,13 +393,13 @@ void action_dousa(pw_class* i_this) { i_this->mState += 1; break; case 111: - if (i_this->m5C4.mpEmitter != NULL) { + if (i_this->m5C4.getEmitter() != NULL) { i_this->mActorPlace.pos = i_this->current.pos; i_this->mActorPlace.angle = i_this->shape_angle; } if (!i_this->mAcch.ChkGroundHit()) break; - i_this->m5C4.end(); + i_this->m5C4.remove(); i_this->speedF = 0.0f; i_this->speed.setall(0.0f); i_this->gravity = 0.0f; diff --git a/src/d/actor/d_a_ship.cpp b/src/d/actor/d_a_ship.cpp index 4ada14f87..5b7d04b4e 100644 --- a/src/d/actor/d_a_ship.cpp +++ b/src/d/actor/d_a_ship.cpp @@ -304,7 +304,7 @@ BOOL daShip_c::checkForceMessage() { else if (dComIfGs_isSymbol(2) && !dComIfGs_isEventBit(0xA08)) { mNextMessageNo = 0x5F6; } - else if (dComIfGs_isEventBit(0xA02) && !dComIfGs_isEventBit(0xA01)) { + else if (dComIfGs_isEventBit(dSv_evtBit_c::ENDLESS_NIGHT) && !dComIfGs_isEventBit(0xA01)) { mNextMessageNo = 0x607; } else if (dComIfGs_checkGetItem(dItem_BOMB_BAG_e) && !dComIfGs_isEventBit(0x1F02)) { @@ -548,7 +548,7 @@ void daShip_c::setInitMessage() { } } else { - if (dComIfGs_isEventBit(0x2A08)) { + if (dComIfGs_isEventBit(dSv_evtBit_c::RODE_KORL)) { mNextMessageNo = 0xd5c; } else { @@ -1517,7 +1517,7 @@ BOOL daShip_c::procPaddleMove_init() { current.pos.y -= 50.0f; } - dComIfGs_onEventBit(0x2A08); + dComIfGs_onEventBit(dSv_evtBit_c::RODE_KORL); if (dComIfGs_isEventBit(0xA80)) { dComIfGs_onEventBit(0x1980); @@ -2710,8 +2710,8 @@ BOOL daShip_c::procStartModeWarp() { camera->mCamera.Start(); camera->mCamera.Reset(); mTactWarpID = fpcM_ERROR_PROCESS_ID_e; - m1984.end(); - m1998.end(); + m1984.remove(); + m1998.remove(); dComIfGp_evmng_cutEnd(mEvtStaffId); procPaddleMove_init(); } @@ -2756,8 +2756,8 @@ BOOL daShip_c::procTactWarp() { if (mpTornado == NULL || fpcM_IsCreating(mTactWarpID)) { if (mTactWarpID == fpcM_ERROR_PROCESS_ID_e) { dComIfGp_event_onEventFlag(8); - m1984.end(); - m1998.end(); + m1984.remove(); + m1998.remove(); procPaddleMove_init(); dCam_getBody()->EndEventCamera(fopAcM_GetID(this)); } @@ -2771,8 +2771,8 @@ BOOL daShip_c::procTactWarp() { } current.pos.y += speed.y; mpTornado->current.pos.y = current.pos.y - 700.0f; - m1984.end(); - m1998.end(); + m1984.remove(); + m1998.remove(); } else { if ((!m037A) && (m03A6 > 0x1000)) { @@ -3319,7 +3319,7 @@ void daShip_c::setRopePos() { } } } - mRipple.end(); + mRipple.remove(); } if (m034F) { @@ -3327,7 +3327,7 @@ void daShip_c::setRopePos() { } if (!m19AC.getEmitter()) { - m19C0.end(); + m19C0.remove(); } m1074.x = mRopeLine.getPos(0)->x + cM_rndFX(20.0f); @@ -3653,7 +3653,6 @@ BOOL daShip_c::execute() { cLib_addCalcAngleS(&shape_angle.y, m040C * 10430.378f + 20480.0f, 5, 0x2000, 0x200); setControllAngle(getAimControllAngle(sVar16)); current.angle.y = shape_angle.y; - } else { if (mWhirlActor) { @@ -3726,7 +3725,8 @@ BOOL daShip_c::execute() { } else { fVar4 = m0404 * 30.0f + 10.0f; - if (dComIfGs_getBombNum() == 0 && fopAcM_GetRoomNo(this) == 0x2C) { + // Bug? This room check assumes we're on the sea without checking? + if (dComIfGs_getBombNum() == 0 && fopAcM_GetRoomNo(this) == dIsleRoom_OutsetIsland_e) { fVar4 *= 1.2f; } } @@ -3763,7 +3763,8 @@ BOOL daShip_c::execute() { } } else { - if (dComIfGs_getBombNum() == 0 && fopAcM_GetRoomNo(this) == 0x2C) { + // Bug? This room check assumes we're on the sea without checking? + if (dComIfGs_getBombNum() == 0 && fopAcM_GetRoomNo(this) == dIsleRoom_OutsetIsland_e) { fVar3 = 10.0f; } else { @@ -3937,9 +3938,9 @@ BOOL daShip_c::execute() { } } else { - m19C0.end(); - mRipple.end(); - m19AC.end(); + m19C0.remove(); + mRipple.remove(); + m19AC.remove(); mCurrentRopeSegmentIndex = 0; @@ -4297,10 +4298,10 @@ BOOL daShip_c::shipDelete() { mSplash.remove(); mTrack.remove(); mRipple.remove(); - m1984.end(); - m1998.end(); - m19AC.end(); - m19C0.end(); + m1984.remove(); + m1998.remove(); + m19AC.remove(); + m19C0.remove(); mDoAud_seDeleteObject(&m0438); mDoAud_seDeleteObject(&m0444); mDoAud_seDeleteObject(&m102C); @@ -4467,7 +4468,7 @@ cPhs_State daShip_c::create() { fopAcM_SetupActor(this, daShip_c); - if (!dComIfGs_isEventBit(0xF80)) { + if (!dComIfGs_isEventBit(dSv_evtBit_c::MET_KORL)) { return cPhs_ERROR_e; } diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index 39b4868d8..b37754576 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -459,7 +459,7 @@ void daTbox_c::CreateInit() { s32 funcType = getFuncType(); flagClr(); - mSmokeCB.field_0x15 = 1; + mSmokeCB.onWindOff(); mOpenAnm.setPlaySpeed(0.0f); if (checkOpen()) { diff --git a/src/d/actor/d_a_tori_flag.cpp b/src/d/actor/d_a_tori_flag.cpp index f546f782a..84899acea 100644 --- a/src/d/actor/d_a_tori_flag.cpp +++ b/src/d/actor/d_a_tori_flag.cpp @@ -49,8 +49,8 @@ static dCcD_SrcCyl l_cyl_src = { /* 000000EC-00000118 .text __ct__17daTori_Flag_HIO_cFv */ daTori_Flag_HIO_c::daTori_Flag_HIO_c() { mNo = -1; - someFloat = 0.0f; - someShort = 0; + m08 = 0.0f; + m0C = 0; return; } diff --git a/src/d/actor/d_a_tornado.cpp b/src/d/actor/d_a_tornado.cpp index 7f2e0d2a1..6cd205da3 100644 --- a/src/d/actor/d_a_tornado.cpp +++ b/src/d/actor/d_a_tornado.cpp @@ -182,7 +182,7 @@ BOOL daTornado_c::execute() { fopAcM_seStartCurrent(this, JA_SE_OBJ_TORNADE_SUS, 100); if (dComIfGs_isEventBit(0x2710)) { - mPtclCb.end(); + mPtclCb.remove(); daShip_c* ship = dComIfGp_getShipActor(); if (ship != NULL) { ship->offTornadoFlg(); @@ -241,7 +241,7 @@ static BOOL daTornado_IsDelete(daTornado_c*) { /* 00000CB0-00000D30 .text tornado_delete__11daTornado_cFv */ BOOL daTornado_c::tornado_delete() { - mPtclCb.end(); + mPtclCb.remove(); if (fopAcM_GetParam(this) == 0 && dComIfGp_getShipActor() != NULL) { dComIfGp_getShipActor()->offTornadoFlg(); } diff --git a/src/d/actor/d_a_wall.cpp b/src/d/actor/d_a_wall.cpp index 43931c43d..29c8692ee 100644 --- a/src/d/actor/d_a_wall.cpp +++ b/src/d/actor/d_a_wall.cpp @@ -218,7 +218,7 @@ void daWall_c::mode_break() { fopAcM_delete(this); } - JPABaseEmitter* pEmitter = mSmokeCb.mpEmitter; + JPABaseEmitter* pEmitter = mSmokeCb.getEmitter(); if (pEmitter != NULL) { pEmitter->setGlobalAlpha(mDst); } diff --git a/src/d/d_a_ship_static.cpp b/src/d/d_a_ship_static.cpp index d4b9b0b3c..3dcbcdc6d 100644 --- a/src/d/d_a_ship_static.cpp +++ b/src/d/d_a_ship_static.cpp @@ -18,9 +18,9 @@ void daShip_c::initStartPos(const cXyz* pos, short rotY) { mWaveR.remove(); mSplash.remove(); mTrack.remove(); - mRipple.end(); - m1984.end(); - m1998.end(); - m19AC.end(); - m19C0.end(); + mRipple.remove(); + m1984.remove(); + m1998.remove(); + m19AC.remove(); + m19C0.remove(); } diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index 089fc9d1f..126b9b67c 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -74,7 +74,7 @@ void dComIfG_play_c::itemInit() { mItemLifeCount = 0.0f; mItemRupeeCount = 0; mAirMeter = 0; - field_0x48c8 = 0; + mItemTimeMax = 0; mNpcNameMessageID = 0; mItemNameMessageID = 0; mItemKeyNumCount = 0; @@ -99,7 +99,7 @@ void dComIfG_play_c::itemInit() { mItemTimer = 0; mItemNowLife = 0; mItemNowRupee = 0; - mItemTimeMax = 0; + mItemSwimTimerStatus = 0; field_0x4929 = 0; mMesgStatus = 0; mbCamOverrideFarPlane = 0; diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index 72fb48457..47625d0e1 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -152,7 +152,6 @@ f32 float_kankyo_color_ratio_set(f32 param_0, f32 param_1, f32 param_2, f32 para /* 8018FAE0-8018FB14 .text get_parcent__Ffff */ static f32 get_parcent(f32 param_0, f32 param_1, f32 param_2) { f32 temp_f1; - f32 temp_f2; f32 temp_f4 = param_0 - param_1; if (0.0f != temp_f4) { diff --git a/src/d/d_particle.cpp b/src/d/d_particle.cpp index e81e5b8a2..9a93e3e7a 100644 --- a/src/d/d_particle.cpp +++ b/src/d/d_particle.cpp @@ -283,7 +283,7 @@ dPa_smokeEcallBack::dPa_smokeEcallBack(u8 param_1) { field_0x12 = 0; mTevstr = NULL; field_0x14 = -1; - field_0x15 = 0; + mWindOff = 0; } /* 8007B4B0-8007B558 .text __ct__18dPa_smokeEcallBackFUcUcUcUc */ @@ -296,7 +296,7 @@ dPa_smokeEcallBack::dPa_smokeEcallBack(u8 param_1, u8 param_2, u8 param_3, u8 pa mTevstr = NULL; field_0x14 = -1; mFlag = param_3; - field_0x15 = 0; + mWindOff = 0; } @@ -315,7 +315,7 @@ void dPa_smokeEcallBack::setup(JPABaseEmitter* param_1, const cXyz* param_2, con dPa_followEcallBack::setup(param_1, param_2, param_3, param_4); field_0x14 = param_4; param_1->mpParticleCallBack = &dPa_control_c::mSmokePcallback; - param_1->mUserData = field_0x15; + param_1->mUserData = mWindOff; } /* 8007B73C-8007B804 .text initiateLighting__FR11_GXColorS10R8_GXColorR8_GXColor */ diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp index a9715bbb5..b96fe05a4 100644 --- a/src/d/d_s_play.cpp +++ b/src/d/d_s_play.cpp @@ -1052,6 +1052,8 @@ static BOOL dScnPly_Execute(dScnPly_ply_c* i_this) { dKy_itudemo_se(); if (!dMenu_flag()) { dComIfGp_demo_update(); + // dComIfGp_jcame_update(); // Debug only + // dComIfGp_jprev_update(); // Debug only dComIfGp_evmng_execute(); if (dComIfGp_getAttention().Owner() != NULL) { @@ -1106,8 +1108,7 @@ static BOOL dScnPly_Delete(dScnPly_ply_c* i_this) { dComIfGp_removeWood(); dComIfGp_removeFlower(); - dComIfGp_setItemTimeCount(0); - dComIfGp_setItemTimeMax(0); + dComIfGp_clearItemTimeCount(); g_msgDHIO.field_0x06 = 0; g_msgDHIO.field_0x10 = -1; @@ -1317,11 +1318,14 @@ cPhs_State phase_4(dScnPly_ply_c* i_this) { dComIfGp_particle_createScene(NULL); } + // dComIfG_initStopwatch(); // Debug only dComIfG_Bgsp()->Ct(); dComIfG_Ccsp()->Ct(); dComIfGp_createDemo(); daSea_Init(); dSnap_Create(); + // dComIfGp_createJcame(); // Debug only + // dComIfGp_createJprev(); // Debug only dComIfGp_setPlayerInfo(0, NULL, 0); for (s32 i = 0; i < 3; i++) dComIfGp_setPlayerPtr(i, NULL);