From 97eb1fb31fb57ee96669f8a83848cb0327797180 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Fri, 24 Nov 2023 18:06:07 -0500 Subject: [PATCH] Remove fake inlines from fopAc_ac_c, add real inlines --- include/d/actor/d_a_obj_kanat.h | 4 ++-- include/f_op/f_op_actor.h | 5 ++--- src/d/actor/d_a_branch.cpp | 4 ++-- src/d/actor/d_a_disappear.cpp | 6 +++--- src/d/actor/d_a_hot_floor.cpp | 2 +- src/d/actor/d_a_item.cpp | 2 +- src/d/actor/d_a_itembase.cpp | 6 +++--- src/d/actor/d_a_kaji.cpp | 2 +- src/d/actor/d_a_kytag00.cpp | 14 +++++++------- src/d/actor/d_a_kytag01.cpp | 2 +- src/d/actor/d_a_mozo.cpp | 6 +++--- src/d/actor/d_a_nh.cpp | 2 +- src/d/actor/d_a_obj_AjavW.cpp | 4 ++-- src/d/actor/d_a_obj_Vteng.cpp | 4 ++-- src/d/actor/d_a_obj_Ygush00.cpp | 6 +++--- src/d/actor/d_a_obj_adnno.cpp | 2 +- src/d/actor/d_a_obj_akabe.cpp | 2 +- src/d/actor/d_a_obj_bscurtain.cpp | 2 +- src/d/actor/d_a_obj_cafelmp.cpp | 4 ++-- src/d/actor/d_a_obj_dmgroom.cpp | 4 ++-- src/d/actor/d_a_obj_dragonhead.cpp | 6 +++--- src/d/actor/d_a_obj_eayogn.cpp | 4 ++-- src/d/actor/d_a_obj_ganonbed.cpp | 4 ++-- src/d/actor/d_a_obj_gong.cpp | 4 ++-- src/d/actor/d_a_obj_hfuck1.cpp | 6 +++--- src/d/actor/d_a_obj_hole.cpp | 2 +- src/d/actor/d_a_obj_mknjd.cpp | 10 +++++----- src/d/actor/d_a_obj_monument.cpp | 6 +++--- src/d/actor/d_a_obj_paper.cpp | 6 +++--- src/d/actor/d_a_obj_toripost.cpp | 4 ++-- src/d/actor/d_a_shop_item.cpp | 2 +- src/d/actor/d_a_swhit0.cpp | 6 +++--- src/d/actor/d_a_swtact.cpp | 6 +++--- src/d/actor/d_a_swtdoor.cpp | 2 +- src/d/actor/d_a_tbox.cpp | 6 +++--- src/d/d_a_obj.cpp | 2 +- src/d/d_event_data.cpp | 2 +- src/d/d_kankyo_rain.cpp | 4 ++-- src/d/d_s_title.cpp | 2 +- src/d/d_throwstone.cpp | 4 ++-- src/f_op/f_op_actor.cpp | 4 ++-- 41 files changed, 87 insertions(+), 88 deletions(-) diff --git a/include/d/actor/d_a_obj_kanat.h b/include/d/actor/d_a_obj_kanat.h index dfb3fae3a..a6651e22c 100644 --- a/include/d/actor/d_a_obj_kanat.h +++ b/include/d/actor/d_a_obj_kanat.h @@ -12,13 +12,13 @@ namespace daObjKanat { public: enum Prm_e { PRM_SWSAVE_W = 0x08, - PRM_UNK_S = 0x00, + PRM_SWSAVE_S = 0x00, }; static Mtx M_tmp_mtx; static const char M_arcname[]; - int prm_get_swSave() const { return daObj::PrmAbstract(this, PRM_SWSAVE_W, PRM_UNK_S); } + int prm_get_swSave() const { return daObj::PrmAbstract(this, PRM_SWSAVE_W, PRM_SWSAVE_S); } int CreateHeap(); int Create(); diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index d5c8a4c1c..1c145edcd 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -261,9 +261,8 @@ public: static u32 stopStatus; - const cXyz& getPosition() const { return current.pos; } - cXyz* getPositionP() { return ¤t.pos; } - const csXyz& getAngle() const { return current.angle; } + static u32 getStopStatus() { return stopStatus; } + static void setStopStatus(u32 status) { stopStatus = status; } }; // Size: 0x290 STATIC_ASSERT(sizeof(fopAc_ac_c) == 0x290); diff --git a/src/d/actor/d_a_branch.cpp b/src/d/actor/d_a_branch.cpp index 49d51ef24..266f7ed70 100644 --- a/src/d/actor/d_a_branch.cpp +++ b/src/d/actor/d_a_branch.cpp @@ -26,8 +26,8 @@ void daBranch_c::set_mtx() { if (pMdl) { pMdl->setBaseScale(mScale); - mDoMtx_stack_c::transS(getPosition()); - mDoMtx_stack_c::XYZrotM(getAngle().x, getAngle().y, getAngle().z); + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::XYZrotM(current.angle); pMdl->setBaseTRMtx(mDoMtx_stack_c::get()); } diff --git a/src/d/actor/d_a_disappear.cpp b/src/d/actor/d_a_disappear.cpp index b7b929460..d5e0922ae 100644 --- a/src/d/actor/d_a_disappear.cpp +++ b/src/d/actor/d_a_disappear.cpp @@ -35,7 +35,7 @@ s32 daDisappear_Execute(disappear_class* i_this) { if (health != 1 && health != 3) { if (health == 2) { - fopAcM_createItemForBoss(i_this->getPositionP(), 0, i_this->current.roomNo, &i_this->current.angle, NULL, 0); + fopAcM_createItemForBoss(&i_this->current.pos, 0, i_this->current.roomNo, &i_this->current.angle, NULL, 0); } else if (health >= 0x0A && health <= 0x0D) { if (health < 0x0D) { @@ -43,11 +43,11 @@ s32 daDisappear_Execute(disappear_class* i_this) { 0, 10, 16 }; - fopAcM_createItem(i_this->getPositionP(), ki_item_d[health - 0xA], -1, -1, 0, NULL, 4, NULL); + fopAcM_createItem(&i_this->current.pos, ki_item_d[health - 0xA], -1, -1, 0, NULL, 4, NULL); } } else { - fopAcM_createIball(i_this->getPositionP(), i_this->mItemTableIdx, i_this->current.roomNo, &i_this->current.angle, i_this->mSwitchId); + fopAcM_createIball(&i_this->current.pos, i_this->mItemTableIdx, i_this->current.roomNo, &i_this->current.angle, i_this->mSwitchId); } } } diff --git a/src/d/actor/d_a_hot_floor.cpp b/src/d/actor/d_a_hot_floor.cpp index ee9906daa..c8916f36e 100644 --- a/src/d/actor/d_a_hot_floor.cpp +++ b/src/d/actor/d_a_hot_floor.cpp @@ -18,7 +18,7 @@ const char daHot_Floor_c::M_arcname[8] = "Ylesr00"; /* 00000078-00000108 .text set_mtx_init__13daHot_Floor_cFv */ void daHot_Floor_c::set_mtx_init() { - mDoMtx_stack_c::transS(getPosition()); + mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::ZXYrotM(shape_angle); for (s32 i = 0; i < 5; i++) mDoMtx_copy(mDoMtx_stack_c::get(), mtx[i]); diff --git a/src/d/actor/d_a_item.cpp b/src/d/actor/d_a_item.cpp index c7e97cbec..442ee9466 100644 --- a/src/d/actor/d_a_item.cpp +++ b/src/d/actor/d_a_item.cpp @@ -521,7 +521,7 @@ BOOL daItem_c::_daItem_draw() { /* 800F6110-800F61C8 .text setTevStr__8daItem_cFv */ void daItem_c::setTevStr() { - g_env_light.settingTevStruct(TEV_TYPE_ACTOR, getPositionP(), &mTevStr); + g_env_light.settingTevStruct(TEV_TYPE_ACTOR, ¤t.pos, &mTevStr); mTevStr.mColorC0.r = 0x96; mTevStr.mColorC0.g = 0x96; diff --git a/src/d/actor/d_a_itembase.cpp b/src/d/actor/d_a_itembase.cpp index 0504280b7..c6e785022 100644 --- a/src/d/actor/d_a_itembase.cpp +++ b/src/d/actor/d_a_itembase.cpp @@ -172,7 +172,7 @@ void daItemBase_c::settingBeforeDraw() { /* 800F9244-800F92DC .text setTevStr__12daItemBase_cFv */ void daItemBase_c::setTevStr() { - g_env_light.settingTevStruct(TEV_TYPE_ACTOR, getPositionP(), &mTevStr); + g_env_light.settingTevStruct(TEV_TYPE_ACTOR, ¤t.pos, &mTevStr); g_env_light.setLightTevColorType(mpModel, &mTevStr); for (int i = 0; i < 2; i++) { @@ -188,12 +188,12 @@ void daItemBase_c::setShadow() { f32 shadowSize = mScale.x * dItem_data::getShadowSize(m_itemNo); if (!dItem_data::chkFlag(m_itemNo, 0x10)) { dComIfGd_setSimpleShadow2( - getPositionP(), mAcch.GetGroundH(), shadowSize, mAcch.m_gnd, + ¤t.pos, mAcch.GetGroundH(), shadowSize, mAcch.m_gnd, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex() ); } else { mShadowId = dComIfGd_setShadow( - mShadowId, 1, mpModel, getPositionP(), 80.0f, shadowSize, + mShadowId, 1, mpModel, ¤t.pos, 80.0f, shadowSize, current.pos.y, mAcch.GetGroundH(), mAcch.m_gnd, &mTevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex() ); diff --git a/src/d/actor/d_a_kaji.cpp b/src/d/actor/d_a_kaji.cpp index 73b95e161..da08d3849 100644 --- a/src/d/actor/d_a_kaji.cpp +++ b/src/d/actor/d_a_kaji.cpp @@ -47,7 +47,7 @@ s32 daKaji_c::_create() { s32 phase_state = dComIfG_resLoad(&mPhs, M_arcname); if (phase_state == cPhs_COMPLEATE_e) { if (fopAcM_entrySolidHeap(this, (heapCallbackFunc)&CheckCreateHeap, 0x660)) { - mDoMtx_stack_c::transS(getPosition()); + mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(shape_angle.y); mDoMtx_stack_c::scaleM(mScale); MTXCopy(mDoMtx_stack_c::get(), mMtx); diff --git a/src/d/actor/d_a_kytag00.cpp b/src/d/actor/d_a_kytag00.cpp index cb9e3d709..9f3252adc 100644 --- a/src/d/actor/d_a_kytag00.cpp +++ b/src/d/actor/d_a_kytag00.cpp @@ -24,17 +24,17 @@ cXyz get_check_pos(kytag00_class* i_this) { camera_class * pCamera = dComIfGp_getCamera(0); fopAc_ac_c * pPlayer = dComIfGp_getPlayer(0); - f32 cameraDist = i_this->getPosition().abs(pCamera->mLookat.mEye); - f32 playerDist = i_this->getPosition().abs(pPlayer->current.pos); + f32 cameraDist = i_this->current.pos.abs(pCamera->mLookat.mEye); + f32 playerDist = i_this->current.pos.abs(pPlayer->current.pos); if (dComIfGp_event_runCheck() && i_this->mMode == 0) { if (cameraDist < playerDist) { ret = pCamera->mLookat.mEye; } else { - ret = pPlayer->getPosition(); + ret = pPlayer->current.pos; } } else { - ret = pPlayer->getPosition(); + ret = pPlayer->current.pos; } return ret; @@ -44,11 +44,11 @@ cXyz get_check_pos(kytag00_class* i_this) { void wether_tag_move(kytag00_class* i_this) { /* Nonmatching */ cXyz chk_pos = get_check_pos(i_this); - cXyz chk_pos_xz(chk_pos.x, i_this->getPosition().y, chk_pos.z); + cXyz chk_pos_xz(chk_pos.x, i_this->current.pos.y, chk_pos.z); f32 fade_y = i_this->mInnerFadeY * 100.0f; - f32 dist_xz = i_this->getPosition().abs(chk_pos_xz); + f32 dist_xz = i_this->current.pos.abs(chk_pos_xz); - if (dist_xz <= i_this->mOuterRadius && (chk_pos.y > (i_this->getPosition().y - fade_y) && chk_pos.y < (i_this->getPosition().y + i_this->mScale.y * 5000.0f + fade_y)) && i_this->mTarget > 0.0f) { + if (dist_xz <= i_this->mOuterRadius && (chk_pos.y > (i_this->current.pos.y - fade_y) && chk_pos.y < (i_this->current.pos.y + i_this->mScale.y * 5000.0f + fade_y)) && i_this->mTarget > 0.0f) { } else { if (i_this->mbPselSet) { diff --git a/src/d/actor/d_a_kytag01.cpp b/src/d/actor/d_a_kytag01.cpp index 77d391317..245fa152b 100644 --- a/src/d/actor/d_a_kytag01.cpp +++ b/src/d/actor/d_a_kytag01.cpp @@ -77,7 +77,7 @@ s32 daKytag01_Create(fopAc_ac_c* i_ac) { kytag01_class* i_this = (kytag01_class*)i_ac; fopAcM_SetupActor(i_this, kytag01_class); - i_this->mWaveInfo.mPos = i_this->getPosition(); + i_this->mWaveInfo.mPos = i_this->current.pos; i_this->mWaveInfo.mInnerRadius = i_this->mScale.x * 5000.0f; i_this->mWaveInfo.mOuterRadius = i_this->mScale.z * 5000.0f; diff --git a/src/d/actor/d_a_mozo.cpp b/src/d/actor/d_a_mozo.cpp index 45ce57010..abb1fdd99 100644 --- a/src/d/actor/d_a_mozo.cpp +++ b/src/d/actor/d_a_mozo.cpp @@ -162,8 +162,8 @@ void daMozo_c::set_mtx() { J3DModel* mdl = mAnimMorf->getModel(); mdl->setBaseScale(mScale); - mDoMtx_stack_c::transS(getPosition()); - mDoMtx_stack_c::YrotM(getAngle().y); + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(current.angle.y); mdl->setBaseTRMtx(mDoMtx_stack_c::get()); } @@ -313,7 +313,7 @@ bool daMozo_c::_execute() { bool daMozo_c::_draw() { /* Nonmatching */ J3DModelData* mdlData = mAnimMorf->getModel()->getModelData(); - g_env_light.settingTevStruct(TEV_TYPE_BG0, getPositionP(), &mTevStr); + g_env_light.settingTevStruct(TEV_TYPE_BG0, ¤t.pos, &mTevStr); g_env_light.setLightTevColorType(mAnimMorf->getModel(), &mTevStr); mBrkAnm.entry(mdlData); diff --git a/src/d/actor/d_a_nh.cpp b/src/d/actor/d_a_nh.cpp index d42c21d72..db3df1c01 100644 --- a/src/d/actor/d_a_nh.cpp +++ b/src/d/actor/d_a_nh.cpp @@ -86,7 +86,7 @@ void daNh_c::setBaseMtx() { J3DModel* model = mpModel; mScale.setall(l_HIO.prm.mModelScale); model->setBaseScale(mScale); - mDoMtx_stack_c::transS(getPosition()); + mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(shape_angle.y); MTXCopy(mDoMtx_stack_c::get(), model->getBaseTRMtx()); diff --git a/src/d/actor/d_a_obj_AjavW.cpp b/src/d/actor/d_a_obj_AjavW.cpp index bba5cb4b3..5ca9c8f43 100644 --- a/src/d/actor/d_a_obj_AjavW.cpp +++ b/src/d/actor/d_a_obj_AjavW.cpp @@ -72,7 +72,7 @@ s32 daObjAjavW_c::_create() { } else { fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); mpModel->setBaseScale(mScale); - mDoMtx_stack_c::transS(getPosition()); + mDoMtx_stack_c::transS(current.pos); mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); } @@ -109,7 +109,7 @@ bool daObjAjavW_c::_execute() { /* 000004F4-0000056C .text _draw__12daObjAjavW_cFv */ bool daObjAjavW_c::_draw() { - g_env_light.settingTevStruct(TEV_TYPE_BG1, getPositionP(), &mTevStr); + g_env_light.settingTevStruct(TEV_TYPE_BG1, ¤t.pos, &mTevStr); g_env_light.setLightTevColorType(mpModel, &mTevStr); mBtkAnm.entry(mpModel->getModelData()); mDoExt_modelUpdateDL(mpModel); diff --git a/src/d/actor/d_a_obj_Vteng.cpp b/src/d/actor/d_a_obj_Vteng.cpp index 0756a12eb..ab3539561 100644 --- a/src/d/actor/d_a_obj_Vteng.cpp +++ b/src/d/actor/d_a_obj_Vteng.cpp @@ -38,7 +38,7 @@ namespace { /* 00000078-00000120 .text init_mtx__12daObjVteng_cFv */ void daObjVteng_c::init_mtx() { mpModel->setBaseScale(mScale); - mDoMtx_stack_c::transS(getPosition()); + mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::XYZrotM(shape_angle); mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); mDoMtx_stack_c::scaleM(mScale); @@ -133,7 +133,7 @@ bool daObjVteng_c::_execute() { /* 00000510-00000578 .text _draw__12daObjVteng_cFv */ bool daObjVteng_c::_draw() { - g_env_light.settingTevStruct(TEV_TYPE_BG3, getPositionP(), &mTevStr); + g_env_light.settingTevStruct(TEV_TYPE_BG3, ¤t.pos, &mTevStr); g_env_light.setLightTevColorType(mpModel, &mTevStr); mpMorf->updateDL(); fopAcM_SetModel(this, mpModel); diff --git a/src/d/actor/d_a_obj_Ygush00.cpp b/src/d/actor/d_a_obj_Ygush00.cpp index 0b00a073c..90b90c7c9 100644 --- a/src/d/actor/d_a_obj_Ygush00.cpp +++ b/src/d/actor/d_a_obj_Ygush00.cpp @@ -73,7 +73,7 @@ s32 daObjYgush00_c::_create() { if (ret == cPhs_COMPLEATE_e) { if (fopAcM_entrySolidHeap(this, (heapCallbackFunc)solidHeapCB, 0x740) == 1) { mpModel->setBaseScale(mScale); - mDoMtx_stack_c::transS(getPosition()); + mDoMtx_stack_c::transS(current.pos); mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); @@ -103,7 +103,7 @@ bool daObjYgush00_c::_execute() { if (mType == 1) { if (mpGryw00 != NULL) { - if (mpGryw00->get_draw_water_lv(mpGryw00) <= getPosition().y) { + if (mpGryw00->get_draw_water_lv(mpGryw00) <= current.pos.y) { fopAcM_seStartCurrent(this, 0x61fe, 0); } } else { @@ -118,7 +118,7 @@ bool daObjYgush00_c::_execute() { /* 0000066C-000006FC .text _draw__14daObjYgush00_cFv */ bool daObjYgush00_c::_draw() { - g_env_light.settingTevStruct(TEV_TYPE_BG1, getPositionP(), &mTevStr); + g_env_light.settingTevStruct(TEV_TYPE_BG1, ¤t.pos, &mTevStr); g_env_light.setLightTevColorType(mpModel, &mTevStr); mBtkAnm.entry(mpModel->getModelData()); mBckAnm.entry(mpModel->getModelData()); diff --git a/src/d/actor/d_a_obj_adnno.cpp b/src/d/actor/d_a_obj_adnno.cpp index f7153d543..a0c3735ec 100644 --- a/src/d/actor/d_a_obj_adnno.cpp +++ b/src/d/actor/d_a_obj_adnno.cpp @@ -62,7 +62,7 @@ void daObjAdnno_c::set_mtx() { J3DModel * model = mpModel[i]; model->setBaseScale(mScale); - mDoMtx_stack_c::transS(getPosition()); + mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(current.angle.y); /* Nonmatching - this translation code is wrong */ mDoMtx_stack_c::transM(40.0f + i * 60.0f, 60.0f - 40.0f * i, 0.0f); diff --git a/src/d/actor/d_a_obj_akabe.cpp b/src/d/actor/d_a_obj_akabe.cpp index e257cccae..a69ca17d6 100644 --- a/src/d/actor/d_a_obj_akabe.cpp +++ b/src/d/actor/d_a_obj_akabe.cpp @@ -157,7 +157,7 @@ namespace daObjAkabe { /* 00000498-00000510 .text init_mtx__Q210daObjAkabe5Act_cFv */ void Act_c::init_mtx() { - mDoMtx_stack_c::transS(getPosition()); + mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::ZXYrotM(shape_angle); mDoMtx_stack_c::scaleM(mScale); mDoMtx_copy(mDoMtx_stack_c::get(), mMtx); diff --git a/src/d/actor/d_a_obj_bscurtain.cpp b/src/d/actor/d_a_obj_bscurtain.cpp index f7cfe2a48..2114fa273 100644 --- a/src/d/actor/d_a_obj_bscurtain.cpp +++ b/src/d/actor/d_a_obj_bscurtain.cpp @@ -88,7 +88,7 @@ bool daObj_Bscurtain_c::_execute() { bool daObj_Bscurtain_c::_draw() { dComIfGd_setListBG(); - g_env_light.settingTevStruct(TEV_TYPE_BG0, getPositionP(), &mTevStr); + g_env_light.settingTevStruct(TEV_TYPE_BG0, ¤t.pos, &mTevStr); g_env_light.setLightTevColorType(mpModel, &mTevStr); mDoExt_modelUpdateDL(mpModel); dComIfGd_setList(); diff --git a/src/d/actor/d_a_obj_cafelmp.cpp b/src/d/actor/d_a_obj_cafelmp.cpp index f6442a708..672552a5c 100644 --- a/src/d/actor/d_a_obj_cafelmp.cpp +++ b/src/d/actor/d_a_obj_cafelmp.cpp @@ -54,7 +54,7 @@ void daObjCafelmp_c::CreateInit() { /* 000001CC-0000024C .text set_mtx__14daObjCafelmp_cFv */ void daObjCafelmp_c::set_mtx() { mpModel->setBaseScale(mScale); - mDoMtx_stack_c::transS(getPosition()); + mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(current.angle.y); mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } @@ -87,7 +87,7 @@ bool daObjCafelmp_c::_execute() { } bool daObjCafelmp_c::_draw() { - g_env_light.settingTevStruct(TEV_TYPE_BG0, getPositionP(), &mTevStr); + g_env_light.settingTevStruct(TEV_TYPE_BG0, ¤t.pos, &mTevStr); g_env_light.setLightTevColorType(mpModel, &mTevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModel); diff --git a/src/d/actor/d_a_obj_dmgroom.cpp b/src/d/actor/d_a_obj_dmgroom.cpp index 90e4e08e5..203ed1bb6 100644 --- a/src/d/actor/d_a_obj_dmgroom.cpp +++ b/src/d/actor/d_a_obj_dmgroom.cpp @@ -60,7 +60,7 @@ void daObjDmgroom_c::CreateInit() { /* 0000026C-000002EC .text set_mtx__14daObjDmgroom_cFv */ void daObjDmgroom_c::set_mtx() { mpModel->setBaseScale(mScale); - mDoMtx_stack_c::transS(getPosition()); + mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(current.angle.y); mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } @@ -97,7 +97,7 @@ bool daObjDmgroom_c::_execute() { } bool daObjDmgroom_c::_draw() { - g_env_light.settingTevStruct(TEV_TYPE_BG0, getPositionP(), &mTevStr); + g_env_light.settingTevStruct(TEV_TYPE_BG0, ¤t.pos, &mTevStr); g_env_light.setLightTevColorType(mpModel, &mTevStr); dComIfGd_setListBG(); mBrkAnm.entry(mpModel->getModelData()); diff --git a/src/d/actor/d_a_obj_dragonhead.cpp b/src/d/actor/d_a_obj_dragonhead.cpp index ed889011d..5c5649a87 100644 --- a/src/d/actor/d_a_obj_dragonhead.cpp +++ b/src/d/actor/d_a_obj_dragonhead.cpp @@ -84,7 +84,7 @@ BOOL daObjDragonhead_c::CreateHeap() { s32 ret = 1; - mDoMtx_stack_c::transS(getPosition()); + mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(shape_angle.y); mDoMtx_stack_c::scaleM(mScale); mDoMtx_copy(mDoMtx_stack_c::get(), mtx); @@ -127,7 +127,7 @@ void daObjDragonhead_c::CreateInit() { /* 0000034C-000003CC .text set_mtx__17daObjDragonhead_cFv */ void daObjDragonhead_c::set_mtx() { mpModel->setBaseScale(mScale); - mDoMtx_stack_c::transS(getPosition()); + mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(current.angle.y); mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } @@ -203,7 +203,7 @@ bool daObjDragonhead_c::_execute() { } bool daObjDragonhead_c::_draw() { - g_env_light.settingTevStruct(TEV_TYPE_BG0, getPositionP(), &mTevStr); + g_env_light.settingTevStruct(TEV_TYPE_BG0, ¤t.pos, &mTevStr); g_env_light.setLightTevColorType(mpModel, &mTevStr); dComIfGd_setListBG(); J3DModelData* modelData = mpModel->getModelData(); diff --git a/src/d/actor/d_a_obj_eayogn.cpp b/src/d/actor/d_a_obj_eayogn.cpp index 22a0e2ba9..989fef374 100644 --- a/src/d/actor/d_a_obj_eayogn.cpp +++ b/src/d/actor/d_a_obj_eayogn.cpp @@ -103,7 +103,7 @@ BOOL daObjEayogn_c::check_ev_bit() const { /* 00000360-000003E8 .text init_mtx__13daObjEayogn_cFv */ void daObjEayogn_c::init_mtx() { mpModel->setBaseScale(mScale); - mDoMtx_stack_c::transS(getPosition()); + mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::ZXYrotM(shape_angle); mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } @@ -115,7 +115,7 @@ bool daObjEayogn_c::_execute() { /* 000003F0-00000490 .text _draw__13daObjEayogn_cFv */ bool daObjEayogn_c::_draw() { - g_env_light.settingTevStruct(TEV_TYPE_BG0, getPositionP(), &mTevStr); + g_env_light.settingTevStruct(TEV_TYPE_BG0, ¤t.pos, &mTevStr); g_env_light.setLightTevColorType(mpModel, &mTevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModel); diff --git a/src/d/actor/d_a_obj_ganonbed.cpp b/src/d/actor/d_a_obj_ganonbed.cpp index 13e3aabd1..ec9f39183 100644 --- a/src/d/actor/d_a_obj_ganonbed.cpp +++ b/src/d/actor/d_a_obj_ganonbed.cpp @@ -35,7 +35,7 @@ namespace { /* 00000078-00000100 .text init_mtx__11daObjGbed_cFv */ void daObjGbed_c::init_mtx() { mpModel->setBaseScale(mScale); - mDoMtx_stack_c::transS(getPosition()); + mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::XYZrotM(shape_angle); mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } @@ -111,7 +111,7 @@ bool daObjGbed_c::_execute() { /* 000003E4-00000444 .text _draw__11daObjGbed_cFv */ bool daObjGbed_c::_draw() { - g_env_light.settingTevStruct(TEV_TYPE_ACTOR, getPositionP(), &mTevStr); + g_env_light.settingTevStruct(TEV_TYPE_ACTOR, ¤t.pos, &mTevStr); g_env_light.setLightTevColorType(mpModel, &mTevStr); mDoExt_modelUpdateDL(mpModel); return true; diff --git a/src/d/actor/d_a_obj_gong.cpp b/src/d/actor/d_a_obj_gong.cpp index b27ca72a5..cf8872290 100644 --- a/src/d/actor/d_a_obj_gong.cpp +++ b/src/d/actor/d_a_obj_gong.cpp @@ -88,7 +88,7 @@ bool daObjGong::Act_c::_delete() { /* 000003A4-00000414 .text set_mtx__Q29daObjGong5Act_cFv */ void daObjGong::Act_c::set_mtx() { - mDoMtx_stack_c::transS(getPosition()); + mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::ZXYrotM(shape_angle); mpMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get()); } @@ -117,7 +117,7 @@ bool daObjGong::Act_c::_draw() { /* Nonmatching - just some tiny regalloc */ J3DModel* model = mpMorf->getModel(); J3DModelData* modelData = model->getModelData(); - g_env_light.settingTevStruct(TEV_TYPE_ACTOR, getPositionP(), &mTevStr); + g_env_light.settingTevStruct(TEV_TYPE_ACTOR, ¤t.pos, &mTevStr); g_env_light.setLightTevColorType(model, &mTevStr); dDlst_texSpecmapST(&mEyePos, &mTevStr, modelData, attr().spec); mpMorf->updateDL(); diff --git a/src/d/actor/d_a_obj_hfuck1.cpp b/src/d/actor/d_a_obj_hfuck1.cpp index 11eb05987..5798eab93 100644 --- a/src/d/actor/d_a_obj_hfuck1.cpp +++ b/src/d/actor/d_a_obj_hfuck1.cpp @@ -71,7 +71,7 @@ namespace { /* 00000078-00000100 .text init_mtx__13daObjHfuck1_cFv */ void daObjHfuck1_c::init_mtx() { mpModel->setBaseScale(mScale); - mDoMtx_stack_c::transS(getPosition()); + mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::XYZrotM(shape_angle); mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } @@ -132,7 +132,7 @@ s32 daObjHfuck1_c::_create() { mSph.Set(l_sph_src); mSph.SetStts(&mStts); - mDoMtx_stack_c::transS(getPosition()); + mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::XYZrotM(shape_angle); mDoMtx_stack_c::transM(0.0f, 0.0f, -50.0f); cXyz center; @@ -184,7 +184,7 @@ bool daObjHfuck1_c::_execute() { /* 000007CC-0000082C .text _draw__13daObjHfuck1_cFv */ bool daObjHfuck1_c::_draw() { - g_env_light.settingTevStruct(TEV_TYPE_BG0, getPositionP(), &mTevStr); + g_env_light.settingTevStruct(TEV_TYPE_BG0, ¤t.pos, &mTevStr); g_env_light.setLightTevColorType(mpModel, &mTevStr); mDoExt_modelUpdateDL(mpModel); return true; diff --git a/src/d/actor/d_a_obj_hole.cpp b/src/d/actor/d_a_obj_hole.cpp index ed0530a49..27ec1eb4b 100644 --- a/src/d/actor/d_a_obj_hole.cpp +++ b/src/d/actor/d_a_obj_hole.cpp @@ -252,7 +252,7 @@ s32 daObj_Hole_c::_draw() { } if (mHasModel == 0xFF) { - g_env_light.settingTevStruct(TEV_TYPE_BG0, getPositionP(), &mTevStr); + g_env_light.settingTevStruct(TEV_TYPE_BG0, ¤t.pos, &mTevStr); g_env_light.setLightTevColorType(mpMdl, &mTevStr); mDoExt_modelUpdateDL(mpMdl); diff --git a/src/d/actor/d_a_obj_mknjd.cpp b/src/d/actor/d_a_obj_mknjd.cpp index b249035de..aae40933d 100644 --- a/src/d/actor/d_a_obj_mknjd.cpp +++ b/src/d/actor/d_a_obj_mknjd.cpp @@ -349,7 +349,7 @@ s32 daObjMknjD::Act_c::Mthd_Delete() { /* 00000C34-00000CC8 .text set_mtx__Q210daObjMknjD5Act_cFv */ void daObjMknjD::Act_c::set_mtx() { - mDoMtx_stack_c::transS(getPosition()); + mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::ZXYrotM(shape_angle); mMainMdl->setBaseTRMtx(mDoMtx_stack_c::get()); @@ -370,7 +370,7 @@ void daObjMknjD::Act_c::init_mtx() { void daObjMknjD::Act_c::setGoal(int i_staffIdx) { cXyz pos = *dComIfGp_evmng_getMyXyzP(i_staffIdx, "Posion"); - mDoMtx_stack_c::transS(getPosition()); + mDoMtx_stack_c::transS(current.pos); mDoMtx_YrotM(mDoMtx_stack_c::get(), current.angle.y); mDoMtx_stack_c::transM(pos); @@ -387,7 +387,7 @@ void daObjMknjD::Act_c::setPlayerAngle(int i_staffIdx) { daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); player->setPlayerPosAndAngle( - player->getPositionP(), + &player->current.pos, current.angle.y + (s16)angle ); } @@ -964,10 +964,10 @@ void daObjMknjD::setMaterial(J3DMaterial* i_mat, u8 i_alpha) { /* 000022FC-00002430 .text Draw__Q210daObjMknjD5Act_cFv */ int daObjMknjD::Act_c::Draw() { - g_env_light.settingTevStruct(TEV_TYPE_BG0, getPositionP(), &mTevStr); + g_env_light.settingTevStruct(TEV_TYPE_BG0, ¤t.pos, &mTevStr); g_env_light.setLightTevColorType(mBreakMdl, &mTevStr); - g_env_light.settingTevStruct(TEV_TYPE_BG0, getPositionP(), &mTevStr); + g_env_light.settingTevStruct(TEV_TYPE_BG0, ¤t.pos, &mTevStr); g_env_light.setLightTevColorType(mMainMdl, &mTevStr); dComIfGd_setListBG(); diff --git a/src/d/actor/d_a_obj_monument.cpp b/src/d/actor/d_a_obj_monument.cpp index cf004ff0c..b25bf55fd 100644 --- a/src/d/actor/d_a_obj_monument.cpp +++ b/src/d/actor/d_a_obj_monument.cpp @@ -43,7 +43,7 @@ bool daObjMonument::Act_c::create_heap() { if (!mpModel) return false; - mDoMtx_stack_c::transS(getPosition()); + mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::ZXYrotM(shape_angle); MTXCopy(mDoMtx_stack_c::get(), mtx); mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); @@ -87,7 +87,7 @@ bool daObjMonument::Act_c::_delete() { /* 00000398-00000404 .text set_mtx__Q213daObjMonument5Act_cFv */ void daObjMonument::Act_c::set_mtx() { - mDoMtx_stack_c::transS(getPosition()); + mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::ZXYrotM(shape_angle); mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } @@ -110,7 +110,7 @@ bool daObjMonument::Act_c::_draw() { if (dComIfGs_isSwitch(swSave, fopAcM_GetHomeRoomNo(this))) return true; - g_env_light.settingTevStruct(TEV_TYPE_BG1, getPositionP(), &mTevStr); + g_env_light.settingTevStruct(TEV_TYPE_BG1, ¤t.pos, &mTevStr); g_env_light.setLightTevColorType(mpModel, &mTevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModel); diff --git a/src/d/actor/d_a_obj_paper.cpp b/src/d/actor/d_a_obj_paper.cpp index 9a6cb7b4a..b5094564d 100644 --- a/src/d/actor/d_a_obj_paper.cpp +++ b/src/d/actor/d_a_obj_paper.cpp @@ -288,7 +288,7 @@ namespace daObjPaper { /* 000008DC-00000948 .text set_mtx__Q210daObjPaper5Act_cFv */ void daObjPaper::Act_c::set_mtx() { - mDoMtx_stack_c::transS(getPosition()); + mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::ZXYrotM(shape_angle); mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); @@ -305,7 +305,7 @@ namespace daObjPaper { u32 hitResult = mCylinderCol.ChkTgHit(); if (hitResult) { daObj::HitSeStart(&mEyePos, current.roomNo, &mCylinderCol, 0x0D); - dKy_Sound_set(getPosition(), 4, fopAcM_GetID(this), 100); + dKy_Sound_set(current.pos, 4, fopAcM_GetID(this), 100); daObj::HitEff_hibana(this, &mCylinderCol); @@ -334,7 +334,7 @@ namespace daObjPaper { set_mtx(); if (mbHasCc) { - mCylinderCol.SetC(getPosition()); + mCylinderCol.SetC(current.pos); g_dComIfG_gameInfo.play.mCcS.Set(&mCylinderCol); } diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp index d7c09c153..2e7c0965b 100644 --- a/src/d/actor/d_a_obj_toripost.cpp +++ b/src/d/actor/d_a_obj_toripost.cpp @@ -877,10 +877,10 @@ bool daObjTpost_c::_draw() { } J3DModel* pModel = mMorf->getModel(); - g_env_light.settingTevStruct(TEV_TYPE_BG0, getPositionP(), &mTevStr); + g_env_light.settingTevStruct(TEV_TYPE_BG0, ¤t.pos, &mTevStr); g_env_light.setLightTevColorType(pModel, &mTevStr); mMorf->entryDL(); - dComIfGd_setSimpleShadow2(getPositionP(), mAcch.GetGroundH(), 40.0f, mAcch.m_gnd, shape_angle.y, 1.0f, 0); + dComIfGd_setSimpleShadow2(¤t.pos, mAcch.GetGroundH(), 40.0f, mAcch.m_gnd, shape_angle.y, 1.0f, 0); return 1; } diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp index 58aabf736..27dc1fb12 100644 --- a/src/d/actor/d_a_shop_item.cpp +++ b/src/d/actor/d_a_shop_item.cpp @@ -155,7 +155,7 @@ void daShopItem_c::settingBeforeDraw() { } void daShopItem_c::setTevStr() { - g_env_light.settingTevStruct(tevType, getPositionP(), &mTevStr); + g_env_light.settingTevStruct(tevType, ¤t.pos, &mTevStr); g_env_light.setLightTevColorType(mpModel, &mTevStr); for(int i = 0; i < 2; i++) { if(mpModelArrow[i] != 0) { diff --git a/src/d/actor/d_a_swhit0.cpp b/src/d/actor/d_a_swhit0.cpp index 932a3abdc..71d265e64 100644 --- a/src/d/actor/d_a_swhit0.cpp +++ b/src/d/actor/d_a_swhit0.cpp @@ -155,7 +155,7 @@ s32 daSwhit0_c::CreateInit() { if (mRetType == 0) { mColCyl.Set(l_cyl_src); mColCyl.SetStts(&mColStatus); - mColCyl.SetC(getPosition()); + mColCyl.SetC(current.pos); onFlag(0x02); } @@ -366,7 +366,7 @@ s32 daSwhit0_c::actionOnTimer() { void daSwhit0_c::setDrawMtx() { mpModel->setBaseScale(mScale); - mDoMtx_stack_c::transS(getPosition()); + mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::XYZrotM(current.angle); mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } @@ -380,7 +380,7 @@ s32 daSwhit0_c::draw() { { 0x78, 0x64, 0x32, 0x64 } }; - g_env_light.settingTevStruct(TEV_TYPE_BG0, getPositionP(), &mTevStr); + g_env_light.settingTevStruct(TEV_TYPE_BG0, ¤t.pos, &mTevStr); g_env_light.setLightTevColorType(mpModel, &mTevStr); J3DModelData* modelData = mpModel->getModelData(); diff --git a/src/d/actor/d_a_swtact.cpp b/src/d/actor/d_a_swtact.cpp index 9fa8e4113..b63a58643 100644 --- a/src/d/actor/d_a_swtact.cpp +++ b/src/d/actor/d_a_swtact.cpp @@ -97,7 +97,7 @@ void daSwTact_c::CreateInit() { void daSwTact_c::set_mtx() { if (daSwTact_prm::getModel(this) == 1) { model->setBaseScale(mScale); - mDoMtx_stack_c::transS(getPosition()); + mDoMtx_stack_c::transS(current.pos); model->setBaseTRMtx(mDoMtx_stack_c::get()); } } @@ -153,7 +153,7 @@ bool daSwTact_c::_execute() { if (player == NULL || dComIfGp_checkPlayerStatus0(0, 0x10000)) return true; - if ((player->getPosition() - getPosition()).absXZ() <= getR()) { + if ((player->current.pos - current.pos).absXZ() <= getR()) { if (mPlayerStatus != stts1 && stts1 != 0) { player->setTactZev(fopAcM_GetID(this), getAnswer(), NULL); } @@ -207,7 +207,7 @@ bool daSwTact_c::_draw() { if (daSwTact_prm::getModel(this) == 0) return TRUE; - g_env_light.settingTevStruct(TEV_TYPE_BG0, getPositionP(), &mTevStr); + g_env_light.settingTevStruct(TEV_TYPE_BG0, ¤t.pos, &mTevStr); g_env_light.setLightTevColorType(model, &mTevStr); mDoExt_modelUpdateDL(model); return TRUE; diff --git a/src/d/actor/d_a_swtdoor.cpp b/src/d/actor/d_a_swtdoor.cpp index 1a1cbc68a..73ee30af6 100644 --- a/src/d/actor/d_a_swtdoor.cpp +++ b/src/d/actor/d_a_swtdoor.cpp @@ -31,7 +31,7 @@ BOOL daSwtdoor_Draw(swtdoor_class* i_this) { /* 000000C4-000001BC .text daSwtdoor_Execute__FP13swtdoor_class */ BOOL daSwtdoor_Execute(swtdoor_class* i_this) { - g_env_light.settingTevStruct(TEV_TYPE_BG0, i_this->getPositionP(), &i_this->mTevStr); + g_env_light.settingTevStruct(TEV_TYPE_BG0, &i_this->current.pos, &i_this->mTevStr); if (dComIfGs_isSwitch(i_this->mSwitchNo, fopAcM_GetRoomNo(i_this)) && i_this->orig.pos.y > -300.0f) i_this->orig.pos.y -= 10.0f; diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index 2fe4cda3c..08b5fed5e 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -152,7 +152,7 @@ public: } mTevStr.mRoomNo = mRoomNo; - g_env_light.settingTevStruct(TEV_TYPE_ACTOR, getPositionP(), &mTevStr); + g_env_light.settingTevStruct(TEV_TYPE_ACTOR, ¤t.pos, &mTevStr); if (getFuncType() == FUNC_TYPE_TACT) { J3DModelData* platMdlData = mpTactPlatformMdl->getModelData(); @@ -777,7 +777,7 @@ void daTbox_c::CreateInit() { if (funcType == FUNC_TYPE_GRAVITY) { mAcchCir.SetWall(30.0f, 0.0f); - mObjAcch.Set(getPositionP(), &next.pos, this, 1, &mAcchCir, &speed, NULL, NULL); + mObjAcch.Set(¤t.pos, &next.pos, this, 1, &mAcchCir, &speed, NULL, NULL); mGravity = -2.5f; } @@ -788,7 +788,7 @@ void daTbox_c::CreateInit() { /* 00001560-00001624 .text boxCheck__8daTbox_cFv */ s32 daTbox_c::boxCheck() { fopAc_ac_c* player = dComIfGp_getPlayer(0); - cXyz playerChestDiff = player->getPosition() - orig.pos; + cXyz playerChestDiff = player->current.pos - orig.pos; if (playerChestDiff.abs2XZ() < 10000.0f) { if (fopAcM_seenActorAngleY(this, dComIfGp_getPlayer(0)) < 0x2000 && fopAcM_seenActorAngleY(player, this) < 0x2000) { diff --git a/src/d/d_a_obj.cpp b/src/d/d_a_obj.cpp index 7cb636080..31c134bba 100644 --- a/src/d/d_a_obj.cpp +++ b/src/d/d_a_obj.cpp @@ -53,7 +53,7 @@ namespace daObj { cXyz scaleV; scaleV.setall(scale); scaleV *= (5.0f / 3.0f); - fopAcM_create(PROC_Obj_Eff, 3, ac->getPositionP(), -1, NULL, &scaleV, 0xFF, NULL); + fopAcM_create(PROC_Obj_Eff, 3, &ac->current.pos, -1, NULL, &scaleV, 0xFF, NULL); } break; } diff --git a/src/d/d_event_data.cpp b/src/d/d_event_data.cpp index 582272a83..db89bbae2 100644 --- a/src/d/d_event_data.cpp +++ b/src/d/d_event_data.cpp @@ -498,7 +498,7 @@ void dEvDtStaff_c::specialProcCreate() { cXyz* pPos = dComIfGp_evmng_getMyXyzP(staffIdx, "POS"); cXyz pos; if (pPos == NULL) { - pos = dComIfGp_getPlayer(0)->getPosition(); + pos = dComIfGp_getPlayer(0)->current.pos; } else { pos = *pPos; } diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp index 879e9e146..ea8b88e2c 100644 --- a/src/d/d_kankyo_rain.cpp +++ b/src/d/d_kankyo_rain.cpp @@ -684,9 +684,9 @@ void wave_move() { { cXyz playerPos; - playerPos.x = pPlayer->getPosition().x; + playerPos.x = pPlayer->current.pos.x; playerPos.y = pos.y; - playerPos.z = pPlayer->getPosition().z; + playerPos.z = pPlayer->current.pos.z; f32 dist = pos.abs(playerPos); f32 innerRadius = 200.0f; f32 outerRadius = 2000.0f; diff --git a/src/d/d_s_title.cpp b/src/d/d_s_title.cpp index 76c26a7ac..aa13e7d46 100644 --- a/src/d/d_s_title.cpp +++ b/src/d/d_s_title.cpp @@ -120,7 +120,7 @@ s32 dScnTitle_Create(scene_class* i_scn) { return cPhs_INIT_e; dMenu_flagSet(0); - fopAc_ac_c::stopStatus = 0; + fopAc_ac_c::setStopStatus(0); dComIfGp_offEnableNextStage(); u32 parameter = fpcM_GetName(i_this) == PROC_TITLE_SCENE ? 0 : 1; diff --git a/src/d/d_throwstone.cpp b/src/d/d_throwstone.cpp index 81e43fac8..a28df76c1 100644 --- a/src/d/d_throwstone.cpp +++ b/src/d/d_throwstone.cpp @@ -53,7 +53,7 @@ s32 daThrowstone_c::_create() { if (!fopAcM_entrySolidHeap(this, (heapCallbackFunc)CheckCreateHeap, 0x4C0)) { result = cPhs_ERROR_e; } else { - mDoMtx_stack_c::transS(getPosition()); + mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(shape_angle.y); mDoMtx_stack_c::scaleM(mScale); @@ -106,7 +106,7 @@ bool daThrowstone_c::_draw() { if (!dComIfGs_isEventBit(0x0310)) return TRUE; - g_env_light.settingTevStruct(TEV_TYPE_ACTOR, getPositionP(), &mTevStr); + g_env_light.settingTevStruct(TEV_TYPE_ACTOR, ¤t.pos, &mTevStr); g_env_light.setLightTevColorType(mpModel, &mTevStr); mDoExt_modelUpdateDL(mpModel); diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp index dd6f1c894..ef0e3e3d0 100644 --- a/src/f_op/f_op_actor.cpp +++ b/src/f_op/f_op_actor.cpp @@ -41,7 +41,7 @@ s32 fopAc_Draw(void* pProc) { ( moveApproval == 2 || ( - !fopAcM_checkStatus(actor, fopAc_ac_c::stopStatus) + !fopAcM_checkStatus(actor, fopAc_ac_c::getStopStatus()) && !( fopAcM_checkStatus(actor, fopAcStts_CULL_e) && fopAcM_cullingCheck(actor) @@ -88,7 +88,7 @@ s32 fopAc_Execute(void* pProc) { || ( ( moveApproval != 0 - && !fopAcM_checkStatus(actor, fopAc_ac_c::stopStatus) + && !fopAcM_checkStatus(actor, fopAc_ac_c::getStopStatus()) ) && ( !fopAcM_checkStatus(actor, fopAcStts_NOCULLEXEC_e)