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

rename variable in accordance with assert (#2797)

Browse Source
This commit is contained in:
roeming
2025-11-12 19:45:53 -05:00
committed by GitHub
parent 63093fea4a
commit a3c76c8a7e
36 changed files with 996 additions and 996 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc_zrz.cpp
+25 -25
View File
@@ -191,7 +191,7 @@ daNpc_zrZ_c::~daNpc_zrZ_c() {
}
if (heap != NULL) {
mpMorf->stopZelAnime();
mAnm_p->stopZelAnime();
}
}
@@ -232,7 +232,7 @@ cPhs__Step daNpc_zrZ_c::create() {
return cPhs_ERROR_e;
}
fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx());
fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx());
fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 800.0f, 300.0f);
mCreatureSound.init(&current.pos, &eyePos, 3, 1);
mAcchCir.SetWall(daNpc_zrZ_Param_c::m.mWallR, daNpc_zrZ_Param_c::m.mWallH);
@@ -274,21 +274,21 @@ int daNpc_zrZ_c::CreateHeap() {
}
}
mpMorf = new mDoExt_McaMorfSO(model_data, NULL, NULL, NULL, -1, 1.0f, 0, -1,
mAnm_p = new mDoExt_McaMorfSO(model_data, NULL, NULL, NULL, -1, 1.0f, 0, -1,
&mCreatureSound, 0x80000, 0x11020284);
if (mpMorf != NULL && mpMorf->getModel() == NULL) {
mpMorf->stopZelAnime();
mpMorf = NULL;
if (mAnm_p != NULL && mAnm_p->getModel() == NULL) {
mAnm_p->stopZelAnime();
mAnm_p = NULL;
}
if (mpMorf == NULL) {
if (mAnm_p == NULL) {
return 0;
}
if (!mInvisibleModel.create(mpMorf->getModel(), 1)) {
if (!mInvisibleModel.create(mAnm_p->getModel(), 1)) {
return 0;
}
J3DModel* model = mpMorf->getModel();
J3DModel* model = mAnm_p->getModel();
for (u16 i = 0; i < model_data->getJointNum(); i++) {
model_data->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
}
@@ -320,7 +320,7 @@ int daNpc_zrZ_c::Execute() {
/* 80B94A48-80B94B34 000D68 00EC+00 1/1 0/0 0/0 .text Draw__11daNpc_zrZ_cFv */
int daNpc_zrZ_c::Draw() {
mpMorf->getModel()->getModelData()->getMaterialNodePointer(1)->setMaterialAnm(mpMatAnm);
mAnm_p->getModel()->getModelData()->getMaterialNodePointer(1)->setMaterialAnm(mpMatAnm);
if (mType == 1) {
return draw(chkAction(&daNpc_zrZ_c::test), false, daNpc_zrZ_Param_c::m.mShadowDepth, NULL, false);
} else {
@@ -333,7 +333,7 @@ int daNpc_zrZ_c::Draw() {
int daNpc_zrZ_c::draw(int i_isTest, int param_1, f32 i_shadowDepth, _GXColorS10* i_fogColor,
int i_hideDamage) {
f32 damage_ratio, frame;
J3DModel* model = mpMorf->getModel();
J3DModel* model = mAnm_p->getModel();
J3DModelData* modelData = model->getModelData();
field_0x9f3 = 1;
@@ -417,11 +417,11 @@ int daNpc_zrZ_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
cXyz pos;
if (jnt_no == 0) {
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1));
mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1));
mDoMtx_stack_c::multVecZero(&mLookatPos[0]);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3));
mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3));
mDoMtx_stack_c::multVecZero(&mLookatPos[1]);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4));
mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4));
mDoMtx_stack_c::multVecZero(&mLookatPos[2]);
}
@@ -470,8 +470,8 @@ int daNpc_zrZ_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
if ((jnt_no == 4 || jnt_no == 12) && (mAnmFlags & ANM_PLAY_BCK)) {
J3DAnmTransform* bck_anm = mBckAnm.getBckAnm();
mBckAnm.changeBckOnly(mpMorf->getAnm());
mpMorf->changeAnm(bck_anm);
mBckAnm.changeBckOnly(mAnm_p->getAnm());
mAnm_p->changeAnm(bck_anm);
}
return 1;
@@ -652,12 +652,12 @@ void daNpc_zrZ_c::setAttnPos() {
}
}
J3DModelData* model_data = mpMorf->getModel()->getModelData();
J3DModelData* model_data = mAnm_p->getModel()->getModelData();
setMtx();
lookat();
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4));
mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4));
mDoMtx_stack_c::multVecZero(&mHeadPos);
mDoMtx_stack_c::multVec(&eyeOffset, &eyePos);
eyeOffset.y = 0.0f;
@@ -704,7 +704,7 @@ void daNpc_zrZ_c::setAttnPos() {
/* 80B95BB8-80B95C6C 001ED8 00B4+00 1/0 0/0 0/0 .text setMtx__11daNpc_zrZ_cFv */
void daNpc_zrZ_c::setMtx() {
J3DModel* model = mpMorf->getModel();
J3DModel* model = mAnm_p->getModel();
cXyz pos = current.pos;
pos.y += mModulationOffset;
mDoMtx_stack_c::transS(pos);
@@ -715,9 +715,9 @@ void daNpc_zrZ_c::setMtx() {
if (mAnmFlags & ANM_PLAY_BCK) {
mBckAnm.getBckAnm()->setFrame(mBckAnm.getFrame());
mpMorf->modelCalc();
mAnm_p->modelCalc();
} else {
mpMorf->modelCalc();
mAnm_p->modelCalc();
}
}
@@ -799,7 +799,7 @@ bool daNpc_zrZ_c::setExpressionBtp(int i_idx) {
return true;
}
if (setBtpAnm(btp_anm, mpMorf->getModel()->getModelData(), 1.0f, attr)) {
if (setBtpAnm(btp_anm, mAnm_p->getModel()->getModelData(), 1.0f, attr)) {
mAnmFlags |= ANM_PLAY_BTP | ANM_PAUSE_BTP;
if (i_idx == 0) {
mAnmFlags |= ANM_FLAG_800;
@@ -864,7 +864,7 @@ void daNpc_zrZ_c::setMotionAnm(int i_idx, f32 i_morf) {
}
}
if (btk_anm != NULL && setBtkAnm(btk_anm, mpMorf->getModel()->getModelData(), 1.0f, 2)) {
if (btk_anm != NULL && setBtkAnm(btk_anm, mAnm_p->getModel()->getModelData(), 1.0f, 2)) {
mAnmFlags |= ANM_PLAY_BTK | ANM_PAUSE_BTK;
}
@@ -1218,7 +1218,7 @@ void daNpc_zrZ_c::setLookMode(int i_lookMode) {
/* 80B96EA0-80B97128 0031C0 0288+00 1/1 0/0 0/0 .text lookat__11daNpc_zrZ_cFv */
void daNpc_zrZ_c::lookat() {
fopAc_ac_c* attn_actor = NULL;
J3DModel* model = mpMorf->getModel();
J3DModel* model = mAnm_p->getModel();
BOOL snap = false;
f32 body_down_angle = daNpc_zrZ_Param_c::m.mBodyDownAngle;
f32 body_up_angle = daNpc_zrZ_Param_c::m.mBodyUpAngle;
@@ -2473,7 +2473,7 @@ void daNpc_zrZ_c::himoCalc() {
mLimbCalcPos = vec2 + vec1;
mDoMtx_stack_c::push();
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(29));
mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(29));
mDoMtx_stack_c::inverse();
mDoMtx_stack_c::multVec(&mLimbCalcPos, &mLimbCalcRelPos);
mDoMtx_stack_c::pop();