mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-15 06:31:10 -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_prayer.cpp
+19 -19
View File
@@ -69,7 +69,7 @@ daNpcPray_c::~daNpcPray_c() {
}
if (heap != NULL) {
mpMorf->stopZelAnime();
mAnm_p->stopZelAnime();
}
}
@@ -129,8 +129,8 @@ int daNpcPray_c::Create() {
return cPhs_ERROR_e;
}
J3DModelData* modelData = mpMorf->getModel()->getModelData();
fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx());
J3DModelData* modelData = mAnm_p->getModel()->getModelData();
fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx());
fopAcM_setCullSizeBox(this, -60.0f, -10.0f, -60.0f, 60.0f, 220.0f, 60.0f);
mSound.init(&current.pos, &eyePos, 3, 1);
@@ -165,21 +165,21 @@ int daNpcPray_c::CreateHeap() {
J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_arcNames[0], 9);
JUT_ASSERT(313, NULL != mdlData_p);
mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084);
if (mpMorf != NULL && mpMorf->getModel() == NULL) {
mpMorf->stopZelAnime();
mpMorf = NULL;
mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084);
if (mAnm_p != NULL && mAnm_p->getModel() == NULL) {
mAnm_p->stopZelAnime();
mAnm_p = NULL;
}
if (mpMorf == NULL) {
if (mAnm_p == NULL) {
return 0;
}
cXyz scale(1.0f, 1.0999999f, 1.0f);
mpMorf->offTranslate();
mpMorf->setTranslateScale(scale);
mAnm_p->offTranslate();
mAnm_p->setTranslateScale(scale);
J3DModel* model_p = mpMorf->getModel();
J3DModel* model_p = mAnm_p->getModel();
for (u16 i = 0; i < mdlData_p->getJointNum(); i++) {
mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
}
@@ -215,13 +215,13 @@ int daNpcPray_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
int spC[] = {1, 2, 3};
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(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]);
}
@@ -298,7 +298,7 @@ void daNpcPray_c::setAttnPos() {
cXyz sp14(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(&sp14, &eyePos);
sp14.x = 0.0f;
@@ -309,7 +309,7 @@ void daNpcPray_c::setAttnPos() {
attention_info.position.set(mHeadPos.x, mHeadPos.y + daNpcPray_Param_c::m.common.attention_offset, mHeadPos.z);
cXyz cyl_center;
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1));
mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1));
mDoMtx_stack_c::multVecZero(&cyl_center);
cyl_center.y = current.pos.y;
@@ -435,7 +435,7 @@ void daNpcPray_c::setLookMode(int i_mode) {
/* 80AB4020-80AB4200 001320 01E0+00 1/1 0/0 0/0 .text lookat__11daNpcPray_cFv */
void daNpcPray_c::lookat() {
daPy_py_c* player = NULL;
J3DModel* model_p = mpMorf->getModel();
J3DModel* model_p = mAnm_p->getModel();
int var_r28 = 0;
f32 body_angleX_min = daNpcPray_Param_c::m.common.body_angleX_min;
@@ -600,8 +600,8 @@ bool daNpcPray_c::fear(void*) {
mActionMode = 2;
break;
case 2:
OS_REPORT("-------------prayer frame=%f\n", mpMorf->getFrame());
if (1.0f == mpMorf->getFrame()) {
OS_REPORT("-------------prayer frame=%f\n", mAnm_p->getFrame());
if (1.0f == mAnm_p->getFrame()) {
OS_REPORT("-------------prayer fear se start!!\n");
mSound.playVoice(2);
}