mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-06 03:44:30 -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_shoe.cpp
+20 -20
View File
@@ -121,7 +121,7 @@ daNpcShoe_c::~daNpcShoe_c() {
dComIfG_resDelete(&mPhases[i], l_arcNames[i]);
}
if (heap != NULL) {
mpMorf->stopZelAnime();
mAnm_p->stopZelAnime();
}
}
@@ -146,7 +146,7 @@ cPhs__Step daNpcShoe_c::Create() {
return cPhs_ERROR_e;
}
fopAcM_SetMtx(this, mpMorf->mpModel->getBaseTRMtx());
fopAcM_SetMtx(this, mAnm_p->mpModel->getBaseTRMtx());
fopAcM_setCullSizeBox(this, -50.0f, -10.0f, -50.0f, 50.0f, 160.0f, 50.0f);
@@ -185,23 +185,23 @@ BOOL daNpcShoe_c::CreateHeap() {
JUT_ASSERT(292, NULL != mdlData_p)
mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreature, 0x80000,
mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreature, 0x80000,
0x11020084);
if (mpMorf != NULL && mpMorf->mpModel == NULL) {
mpMorf->stopZelAnime();
mpMorf = NULL;
if (mAnm_p != NULL && mAnm_p->mpModel == NULL) {
mAnm_p->stopZelAnime();
mAnm_p = NULL;
}
if (mpMorf == NULL) {
if (mAnm_p == NULL) {
return false;
}
cXyz cstack_30(1.0f, 0.5581154f, 1.0f);
mpMorf->offTranslate();
mpMorf->setTranslateScale(cstack_30);
mAnm_p->offTranslate();
mAnm_p->setTranslateScale(cstack_30);
J3DModel* model = mpMorf->getModel();
J3DModel* model = mAnm_p->getModel();
for (u16 jointNo = 0; jointNo < mdlData_p->getJointNum(); jointNo++) {
mdlData_p->getJointNodePointer(jointNo)->setCallBack(ctrlJointCallBack);
}
@@ -268,7 +268,7 @@ int daNpcShoe_c::Draw() {
draw(false, false, mpHIO->m.common.real_shadow_size, NULL, false);
g_env_light.setLightTevColorType_MAJI(mpModel1->mModelData, &tevStr);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(11));
mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(11));
mpModel1->setBaseTRMtx(mDoMtx_stack_c::get());
mDoExt_modelUpdateDL(mpModel1);
g_env_light.setLightTevColorType_MAJI(mpModel2->mModelData, &tevStr);
@@ -286,11 +286,11 @@ bool daNpcShoe_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
int lookat_joints[3] = {1, 2, 3};
if (joint_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(2));
mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(2));
mDoMtx_stack_c::multVecZero(&mLookatPos[1]);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3));
mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3));
mDoMtx_stack_c::multVecZero(&mLookatPos[2]);
}
@@ -394,7 +394,7 @@ void daNpcShoe_c::reset() {
J3DAnmTexPattern* btpAnm = getTexPtrnAnmP(l_arcNames[0], 12);
mAnmFlags &= ~(ANM_PAUSE_BTP | ANM_PLAY_BTP | ANM_FLAG_800);
if (setBtpAnm(btpAnm, mpMorf->getModel()->getModelData(), 1.0f, 2)) {
if (setBtpAnm(btpAnm, mAnm_p->getModel()->getModelData(), 1.0f, 2)) {
mAnmFlags |= ANM_PAUSE_BTP | ANM_PLAY_BTP | ANM_FLAG_800;
}
@@ -436,7 +436,7 @@ void daNpcShoe_c::playMotion() {
/* 80AE9820-80AE9A00 001FC0 01E0+00 1/1 0/0 0/0 .text lookat__11daNpcShoe_cFv */
void daNpcShoe_c::lookat() {
fopAc_ac_c* actor = NULL;
J3DModel* model = mpMorf->getModel();
J3DModel* model = mAnm_p->getModel();
BOOL snap = false;
f32 body_angleX_min = mpHIO->m.common.body_angleX_min;
@@ -568,7 +568,7 @@ bool daNpcShoe_c::fear(void* param_0) {
case 1:
break;
case 2:
if (mpMorf->checkFrame(1.0f)) {
if (mAnm_p->checkFrame(1.0f)) {
mCreature.playVoice(2);
}
break;
@@ -729,7 +729,7 @@ void daNpcShoe_c::setAttnPos() {
lookat();
cXyz vec(10.0f, 15.0f, 0.0f);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3));
mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3));
mDoMtx_stack_c::multVecZero(&mHeadPos);
mDoMtx_stack_c::multVec(&vec, &eyePos);
vec.x = 0.0f;
@@ -738,12 +738,12 @@ void daNpcShoe_c::setAttnPos() {
mHeadAngle.x = cLib_targetAngleX(&mHeadPos, &vec);
mHeadAngle.y = cLib_targetAngleY(&mHeadPos, &vec);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3));
mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3));
mDoMtx_stack_c::multVecZero(&attention_info.position);
attention_info.position.y += mpHIO->m.common.attention_offset;
cXyz cStack28;
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1));
mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1));
mDoMtx_stack_c::multVecZero(&cStack28);
cStack28.y = current.pos.y;
mCcCyl.SetC(cStack28);