mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-17 13:00:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Demo matches (#767)

Browse Source
This commit is contained in:
LagoLunatic
2025-05-24 18:54:46 -04:00
committed by GitHub
parent 4a29f64e6b
commit 7cd75e8f7b
83 changed files with 945 additions and 424 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc_btsw2.cpp
+10 -6
View File
@@ -108,11 +108,10 @@ static BOOL nodeCallBack(J3DNode* node, int calcTiming) {
u16 jointNo = joint->getJntNo();
mDoMtx_stack_c::copy(model->getAnmMtx(jointNo));
if (jointNo == i_this->m_jnt.getHeadJntNum()) {
mDoMtx_stack_c::multVec(&a_att_pos_offst, &i_this->mAttPos);
mDoMtx_stack_c::multVec(&a_att_pos_offst, &i_this->getAttentionBasePos());
Mtx sp14;
cMtx_copy(mDoMtx_stack_c::get(), sp14);
cXyz sp8;
mDoMtx_multVecZero(sp14, &sp8);
cXyz sp8(sp14[0][3], sp14[1][3], sp14[2][3]);
sp14[0][3] = sp14[1][3] = sp14[2][3] = 0.0f;
mDoMtx_stack_c::transS(sp8);
mDoMtx_stack_c::YrotM(i_this->current.angle.y + i_this->m_jnt.getHead_y());
@@ -382,7 +381,7 @@ BOOL daNpc_Btsw2_c::CreateHeap() {
modelData->getJointNodePointer(m_jnt.getBackboneJntNum())->setCallBack(nodeCallBack);
mpMorf->getModel()->setUserArea((u32)this);
mAcchCir.SetWall(30.0f, 0.0f);
mObjAcch.Set(&current.pos, &old.pos, this, 1, &mAcchCir, &speed);
mObjAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this));
return TRUE;
}
@@ -400,7 +399,7 @@ BOOL daNpc_Btsw2_c::CreateInit() {
setCollision(60.0f, 150.0f);
m724 = 0;
mPathNo = fopAcM_GetParamBit(fopAcM_GetParam(this), 0x10, 8);
mpPath = dPath_GetRoomPath(mPathNo, current.roomNo);
mpPath = dPath_GetRoomPath(mPathNo, fopAcM_GetRoomNo(this));
mFinalPathPntIdx = mpPath->m_num - 1;
m73E = 1.0f + cM_rndF(3.0f);
m742 = 90.0f + cM_rndF(300.0f);
@@ -555,7 +554,12 @@ cPhs_State daNpc_Btsw2_c::_create() {
/* 00001C34-00001C8C .text _delete__13daNpc_Btsw2_cFv */
BOOL daNpc_Btsw2_c::_delete() {
dComIfG_resDelete(&mPhs, m_arc_name);
if (heap && mpMorf) {
#if VERSION == VERSION_DEMO
if (mpMorf)
#else
if (heap && mpMorf)
#endif
{
mpMorf->stopZelAnime();
}
return TRUE;