diff options
| author | Caroline Madsen <69010899+randomsalience@users.noreply.github.com> | 2024-10-31 20:36:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-31 17:36:11 -0700 |
| commit | 09423b6fa00029d0325cbade59c78ae42f1014de (patch) | |
| tree | 15c444d2b60c559bbfd15385a4cfa83b8fe33521 /src/d/d_a_obj.cpp | |
| parent | 30777a85b5357a60f0d57f9127ff4e04d3b2bdd5 (diff) | |
more misc. cleanup (#2232)
Diffstat (limited to 'src/d/d_a_obj.cpp')
| -rw-r--r-- | src/d/d_a_obj.cpp | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/src/d/d_a_obj.cpp b/src/d/d_a_obj.cpp index fee6f61f8f..123d1184f2 100644 --- a/src/d/d_a_obj.cpp +++ b/src/d/d_a_obj.cpp @@ -17,18 +17,15 @@ void eff_break_tsubo(fopAc_ac_c* i_actor, cXyz i_scale, int i_type) { J3DModelData* tubo_bmd = (J3DModelData*)dComIfG_getObjectRes("Always", 0x20); J3DAnmTexPattern* tubo_btp = (J3DAnmTexPattern*)dComIfG_getObjectRes("Always", 0x42); - s32 roomNo = fopAcM_GetRoomNo(i_actor); - JPABaseEmitter* emitter = dComIfGp_particle_set( dPa_name::ZI_J_M_tuboHahen_e, &i_actor->current.pos, NULL, NULL, 0xFF, - (dPa_modelEcallBack*)&dPa_modelEcallBack::mEcallback, roomNo, NULL, NULL, &i_scale); + &dPa_modelEcallBack::mEcallback, fopAcM_GetRoomNo(i_actor), NULL, NULL, &i_scale); dPa_modelEcallBack::setModel(emitter, tubo_bmd, i_actor->tevStr, 3, tubo_btp, 0, i_type); - s32 roomNo2 = fopAcM_GetRoomNo(i_actor); dComIfGp_particle_set(dPa_name::ZI_J_tuboHahen_e, &i_actor->current.pos, NULL, NULL, 0xFF, - dPa_control_c::getTsuboSelectTexEcallBack(i_type), roomNo2, NULL, NULL, - &i_scale); + dPa_control_c::getTsuboSelectTexEcallBack(i_type), + fopAcM_GetRoomNo(i_actor), NULL, NULL, &i_scale); } /* 80037180-80037210 031AC0 0090+00 0/0 0/0 2/2 .text make_eff_break_kotubo__5daObjFP10fopAc_ac_c @@ -221,15 +218,3 @@ void HitSeStart(cXyz const* i_sePos, int i_roomNo, dCcD_GObjInf const* i_CcObj, } } } // namespace daObj - -/* 80037A4C-80037A54 03238C 0008+00 0/0 2/0 0/0 .text GetCoCP__12cCcD_CylAttrFv */ -// void cCcD_CylAttr::GetCoCP() { -extern "C" void GetCoCP__12cCcD_CylAttrFv() { - // NONMATCHING -} - -/* 80037A54-80037A5C 032394 0008+00 0/0 2/0 0/0 .text GetCoCP__12cCcD_SphAttrFv */ -// void cCcD_SphAttr::GetCoCP() { -extern "C" void GetCoCP__12cCcD_SphAttrFv() { - // NONMATCHING -}
\ No newline at end of file |