mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-10 03:05:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

misc work and cleanup

Browse Source
This commit is contained in:
LagoLunatic
2024-04-02 16:56:08 -04:00
parent 7303d2997a
commit a3f191dc63
12 changed files with 142 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_npc_btsw2.h
+18 -12
View File
@@ -8,15 +8,21 @@ class daNpc_Btsw2_c : public fopNpc_npc_c {
public:
typedef BOOL (daNpc_Btsw2_c::*ActionFunc)(void*);
enum ActionStatus {
ACTION_STARTING = 0,
ACTION_ONGOING = 1,
ACTION_ENDING = -1,
};
void getAttentionBasePos() {}
void setAction(ActionFunc func, void*) {
if (mCurrActionFunc != func) {
if (mCurrActionFunc) {
m74A = -1;
mActionStatus = ACTION_ENDING;
(this->*mCurrActionFunc)(NULL);
}
mCurrActionFunc = func;
m74A = 0;
mActionStatus = ACTION_STARTING;
(this->*mCurrActionFunc)(NULL);
}
}
@@ -48,16 +54,16 @@ public:
public:
/* 0x6C4 */ request_of_phase_process_class mPhs;
/* 0x6CC */ u32 mShadowId;
/* 0x6D0 */ J3DModel* m6D0;
/* 0x6D4 */ J3DModel* m6D4;
/* 0x6D0 */ J3DModel* mpKabanModel; // Bag
/* 0x6D4 */ J3DModel* mpTirasiModel; // Flyer
/* 0x6D8 */ J3DAnmTexPattern* m_btp;
/* 0x6DC */ mDoExt_btpAnm mBtpAnm;
/* 0x6F0 */ u8 m6F0;
/* 0x6F1 */ s8 m6F1;
/* 0x6F2 */ s8 m6F2;
/* 0x6F4 */ s16 m6F4;
/* 0x6F0 */ u8 mBtpFrame;
/* 0x6F1 */ s8 m_handL_jnt_num;
/* 0x6F2 */ s8 m_handR_jnt_num;
/* 0x6F4 */ s16 mBlinkTimer;
/* 0x6F6 */ u8 m6F6[0x704 - 0x6F6];
/* 0x704 */ cXyz m704;
/* 0x704 */ cXyz mAttPos;
/* 0x710 */ u8 m710[0x714 - 0x710];
/* 0x714 */ csXyz m714;
/* 0x71A */ u8 m71A[0x71D - 0x71A];
@@ -70,16 +76,16 @@ public:
/* 0x735 */ u8 m735;
/* 0x736 */ u8 m736;
/* 0x738 */ dPath* mpPath;
/* 0x73C */ s16 m73C;
/* 0x73C */ s16 mFinalPathPntIdx;
/* 0x73E */ s16 m73E;
/* 0x740 */ s16 m740;
/* 0x740 */ s16 mPathPntIdx;
/* 0x742 */ s16 m742;
/* 0x744 */ s8 m744;
/* 0x745 */ s8 m745;
/* 0x746 */ s8 m746;
/* 0x747 */ s8 m747;
/* 0x748 */ u8 m748[0x74A - 0x748];
/* 0x74A */ s8 m74A;
/* 0x74A */ s8 mActionStatus;
};
class daNpc_Btsw2_HIO_c {
include/d/actor/d_a_npc_os.h
+1
View File
@@ -65,6 +65,7 @@ public:
BOOL isGravity() { return cLib_checkBit(field_0x784, 0x8UL); }
void onGravity() { cLib_onBit(field_0x784, 0x8UL); }
void offGravity() { cLib_offBit(field_0x784, 0x8UL); }
// Note: The 0x10 bit is used in the final release, but not in the demo debug maps, so its official name is unknown.
void offPlayerRoom(int idx) { m_playerRoom[idx] = false; }
void onPlayerRoom(int idx) { m_playerRoom[idx] = true; }
void setCattleRoomNo(s8 roomNo) { m_cattleRoomNo = roomNo; }
include/d/actor/d_a_player_npc.h
+1 -1
View File
@@ -35,7 +35,7 @@ public:
void setOffsetHomePos();
void setPointRestart(s16, s8);
BOOL checkRestart(s8);
BOOL initialRestartOption(s8, int);
BOOL initialRestartOption(s8, BOOL);
BOOL checkNowPosMove(const char*);
void drawDamageFog();
int chkMoveBlock(cXyz*);
include/d/actor/d_a_pz.h
+11 -10
View File
@@ -2,6 +2,7 @@
#define D_A_PZ_H
#include "f_op/f_op_actor.h"
#include "d/d_npc.h"
#include "c/c_damagereaction.h"
#include "SSystem/SComponent/c_phase.h"
@@ -15,15 +16,15 @@ class daPz_matAnm_c {
void calc(J3DMaterial*) const;
};
class daPz_c : public fopAc_ac_c {
class daPz_c : public fopNpc_npc_c {
public:
enum Proc_e {
};
void getRightHandMatrix() {}
void isAnm(signed char) {}
void isEyeAnm(signed char) {}
MtxP getRightHandMatrix() { return mpMorf->getModel()->getAnmMtx(0x13); } // hand_R1 joint
void isAnm(s8) {}
void isEyeAnm(s8) {}
void modeProcInit(int) {}
void setAfraid() {}
void setDown() {}
@@ -39,9 +40,9 @@ public:
void _createHeap();
void getGndPos();
void checkEyeArea(cXyz&);
void getMsg();
void next_msgStatus(unsigned long*);
void anmAtr(unsigned short);
virtual u32 getMsg();
virtual u16 next_msgStatus(u32*);
virtual void anmAtr(u16);
void eventOrder();
void checkOrder();
void setFallSplash();
@@ -52,13 +53,13 @@ public:
void checkTgHit();
void getArg();
void setAttention();
void setBowAnm(signed char, bool);
void setBowAnm(s8, bool);
void setBowString(bool);
void setAnm(signed char, bool, int);
void setAnm(s8, bool, int);
void setAnmRunSpeed();
void setEyeBtp(int);
void setEyeBtk(int);
void setEyeAnm(signed char);
void setEyeAnm(s8);
void ctrlEye();
void playEyeAnm();
void setMtx();
include/d/d_npc.h
+1 -1
View File
@@ -245,7 +245,7 @@ public:
}
/* 0x290 */ dNpc_JntCtrl_c m_jnt;
/* 0x2C4 */ dNpc_EventCut_c mEventCut;
/* 0x330 */ mDoExt_McaMorf* mpMcaMorf;
/* 0x330 */ mDoExt_McaMorf* mpMorf;
/* 0x334 */ dBgS_ObjAcch mObjAcch;
/* 0x4F8 */ dBgS_AcchCir mAcchCir;
/* 0x538 */ dCcD_Stts mStts;
src/d/actor/d_a_arrow.cpp
+4 -7
View File
@@ -18,6 +18,7 @@ u32 daPy_py_c::checkPlayerFly() const { return 0; }
#include "d/d_item_data.h"
#include "d/actor/d_a_player.h"
#include "d/actor/d_a_player_main.h"
#include "d/actor/d_a_pz.h"
#include "d/d_jnt_hit.h"
#include "d/d_s_play.h"
#include "d/res/res_link.h"
@@ -539,15 +540,13 @@ void daArrow_c::setRoomInfo() {
void daArrow_c::setKeepMatrix() {
// Transform the arrow onto its archer's hand.
if (mbSetByZelda) {
fopNpc_npc_c* zelda;
daPz_c* zelda;
fopAcM_SearchByID(parentActorID, (fopAc_ac_c**)&zelda);
mDoMtx_stack_c::transS(0.7f, -0.07f, -0.2f);
mDoMtx_stack_c::XYZrotM(0x238E, 0x2CDF, 0x29BE);
// Copy the matrix of Zelda's hand_R1 joint to the arrow model.
// TODO: After daPz_c is implemented, this should use her daPz_c::getRightHandMatrix() inline method.
MtxP handMtx = zelda->mpMcaMorf->getModel()->mpNodeMtx[0x13];
MtxP handMtx = zelda->getRightHandMatrix();
cMtx_concat(handMtx, mDoMtx_stack_c::get(), mDoMtx_stack_c::get());
mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
@@ -984,9 +983,7 @@ BOOL daArrow_c::procStop_BG() {
field_0x6a0--;
if (field_0x6a0 < 60) {
// Fakematch
u32 signBit = ((u32)field_0x6a0)>>31;
if ((((field_0x6a0&1) ^ signBit) - signBit) == 0) {
if (field_0x6a0 % 2 == 0) {
field_0x698 = false;
} else {
field_0x698 = true;
src/d/actor/d_a_bg.cpp
-2
View File
@@ -53,7 +53,6 @@ BOOL daBg_btkAnm_c::create(J3DModelData* modelData, J3DAnmTextureSRTKey* anmData
if (!anm->init(modelData, anmData, true, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0))
return FALSE;
// probably an inline
J3DAnmTextureSRTKey * data = anm->getBtkAnm();
for (u16 i = 0; i < data->getUpdateMaterialNum(); i++) {
u16 mat_no = data->getUpdateMaterialID(i);
@@ -93,7 +92,6 @@ BOOL daBg_brkAnm_c::create(J3DModelData* modelData, J3DAnmTevRegKey* anmData) {
if (!anm->init(modelData, anmData, true, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0))
return FALSE;
// probably an inline
J3DAnmTevRegKey * data = anm->getBrkAnm();
for (u16 i = 0; i < data->getCRegUpdateMaterialNum(); i++) {
u16 mat_no = data->getCRegUpdateMaterialID(i);
src/d/actor/d_a_npc_btsw2.cpp
+68 -65
View File
@@ -176,7 +176,7 @@ static BOOL nodeCallBack(J3DNode* node, int param_1) {
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->m704);
mDoMtx_stack_c::multVec(&a_att_pos_offst, &i_this->mAttPos);
Mtx sp14;
cMtx_copy(mDoMtx_stack_c::get(), sp14);
cXyz sp8;
@@ -189,8 +189,7 @@ static BOOL nodeCallBack(J3DNode* node, int param_1) {
mDoMtx_stack_c::concat(sp14);
mDoMtx_stack_c::multVec(&a_eye_pos_offst, &i_this->eyePos);
} else if (jointNo == i_this->m_jnt.getBackboneJntNum()) {
int backboneY = i_this->m_jnt.getBackbone_y();
mDoMtx_stack_c::XrotM(backboneY);
mDoMtx_stack_c::XrotM(i_this->m_jnt.getBackbone_y());
mDoMtx_stack_c::ZrotM(-i_this->m_jnt.getBackbone_x());
}
cMtx_copy(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx);
@@ -201,26 +200,26 @@ static BOOL nodeCallBack(J3DNode* node, int param_1) {
}
/* 0000041C-00000524 .text initTexPatternAnm__13daNpc_Btsw2_cFb */
BOOL daNpc_Btsw2_c::initTexPatternAnm(bool r31) {
J3DModelData* modelData = mpMcaMorf->getModel()->getModelData();
BOOL daNpc_Btsw2_c::initTexPatternAnm(bool i_modify) {
J3DModelData* modelData = mpMorf->getModel()->getModelData();
m_btp = static_cast<J3DAnmTexPattern*>(dComIfG_getObjectRes(m_arc_name, l_btp_ix_tbl[m744]));
JUT_ASSERT(282, m_btp != 0);
if (!mBtpAnm.init(modelData, m_btp, TRUE, 2, 1.0f, 0, -1, r31, 0)) {
if (!mBtpAnm.init(modelData, m_btp, TRUE, 2, 1.0f, 0, -1, i_modify, 0)) {
return FALSE;
}
m6F0 = 0;
m6F4 = 0;
mBtpFrame = 0;
mBlinkTimer = 0;
return TRUE;
}
/* 00000524-000005B0 .text playTexPatternAnm__13daNpc_Btsw2_cFv */
void daNpc_Btsw2_c::playTexPatternAnm() {
if (cLib_calcTimer(&m6F4) == 0) {
if (m6F0 >= m_btp->getFrameMax()) {
m6F0 -= m_btp->getFrameMax();
m6F4 = 30 + cM_rndF(100.0f);
if (cLib_calcTimer(&mBlinkTimer) == 0) {
if (mBtpFrame >= m_btp->getFrameMax()) {
mBtpFrame -= m_btp->getFrameMax();
mBlinkTimer = 30 + cM_rndF(100.0f);
} else {
m6F0++;
mBtpFrame++;
}
}
}
@@ -257,7 +256,7 @@ void daNpc_Btsw2_c::setAnm(s8 param_0) {
m745 = param_0;
dNpc_setAnm(
mpMcaMorf, a_play_mode_tbl[m747],
mpMorf, a_play_mode_tbl[m747],
a_morf_frame_tbl[m747], a_play_speed_tbl[m747],
l_bck_ix_tbl[m745], -1,
m_arc_name
@@ -338,7 +337,7 @@ void daNpc_Btsw2_c::anmAtr(u16) {
break;
}
if (mpMcaMorf->checkFrame(mpMcaMorf->getEndFrame()-1.0f)) {
if (mpMorf->checkFrame(mpMorf->getEndFrame()-1.0f)) {
if (m745 == 4 || m745 == 6) {
setAnm(1);
}
@@ -349,16 +348,16 @@ void daNpc_Btsw2_c::anmAtr(u16) {
/* 0000097C-000009EC .text getMsg__13daNpc_Btsw2_cFv */
u32 daNpc_Btsw2_c::getMsg() {
u32 ret;
u32 msgNo;
if (!dComIfGs_isEventBit(0x3102)) {
dComIfGs_onEventBit(0x3102);
ret = 0x1AB0;
msgNo = 0x1AB0;
} else if (dKy_daynight_check()) {
ret = 0x1AB2;
msgNo = 0x1AB2;
} else {
ret = 0x1AB1;
msgNo = 0x1AB1;
}
return ret;
return msgNo;
}
/* 000009EC-000009F4 .text next_msgStatus__13daNpc_Btsw2_cFPUl */
@@ -368,7 +367,7 @@ u16 daNpc_Btsw2_c::next_msgStatus(u32*) {
/* 000009F4-00000A20 .text setAttention__13daNpc_Btsw2_cFv */
void daNpc_Btsw2_c::setAttention() {
attention_info.position.set(m704.x, m704.y + l_HIO.mNpc.mAttnYOffset, m704.z);
attention_info.position.set(mAttPos.x, mAttPos.y + l_HIO.mNpc.mAttnYOffset, mAttPos.z);
}
/* 00000A20-00000B94 .text lookBack__13daNpc_Btsw2_cFv */
@@ -413,13 +412,13 @@ static BOOL CallbackCreateHeap(fopAc_ac_c* i_this) {
BOOL daNpc_Btsw2_c::CreateHeap() {
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arc_name, BTSW_INDEX_BDL_BN));
JUT_ASSERT(616, modelData != 0);
mpMcaMorf = new mDoExt_McaMorf(
mpMorf = new mDoExt_McaMorf(
modelData,
NULL, NULL,
static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(m_arc_name, BTSW_INDEX_BCK_BN_WAIT01)),
J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, 1, NULL, 0x80000, 0x15020022
);
if (mpMcaMorf == NULL || mpMcaMorf->getModel() == NULL) {
if (mpMorf == NULL || mpMorf->getModel() == NULL) {
return FALSE;
}
@@ -427,17 +426,17 @@ BOOL daNpc_Btsw2_c::CreateHeap() {
JUT_ASSERT(634, m_jnt.getHeadJntNum() >= 0);
m_jnt.setBackboneJntNum(modelData->getJointName()->getIndex("backbone"));
JUT_ASSERT(639, m_jnt.getBackboneJntNum() >= 0);
m6F1 = modelData->getJointName()->getIndex("handL");
m6F2 = modelData->getJointName()->getIndex("handR");
m_handL_jnt_num = modelData->getJointName()->getIndex("handL");
m_handR_jnt_num = modelData->getJointName()->getIndex("handR");
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Btsw", BTSW_INDEX_BDL_BN_KABAN));
m6D0 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (m6D0 == NULL) {
mpKabanModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (mpKabanModel == NULL) {
return FALSE;
}
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Btsw", BTSW_INDEX_BDL_BN_TIRASI));
m6D4 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (m6D4 == NULL) {
mpTirasiModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (mpTirasiModel == NULL) {
return FALSE;
}
@@ -446,10 +445,10 @@ BOOL daNpc_Btsw2_c::CreateHeap() {
return FALSE;
}
modelData = mpMcaMorf->getModel()->getModelData();
modelData = mpMorf->getModel()->getModelData();
modelData->getJointNodePointer(m_jnt.getHeadJntNum())->setCallBack(nodeCallBack);
modelData->getJointNodePointer(m_jnt.getBackboneJntNum())->setCallBack(nodeCallBack);
mpMcaMorf->getModel()->setUserArea((u32)this);
mpMorf->getModel()->setUserArea((u32)this);
mAcchCir.SetWall(30.0f, 0.0f);
mObjAcch.Set(&current.pos, &old.pos, this, 1, &mAcchCir, &speed);
@@ -462,7 +461,7 @@ BOOL daNpc_Btsw2_c::CreateInit() {
attention_info.flags = fopAc_Attn_LOCKON_TALK_e | fopAc_Attn_ACTION_TALK_e;
gravity = -30.0f;
setAction(&daNpc_Btsw2_c::wait_action, NULL);
m704 = current.pos;
mAttPos = current.pos;
mStts.Init(0xFF, 0xFF, this);
mCyl.Set(l_cyl_src);
mCyl.SetStts(&mStts);
@@ -470,12 +469,12 @@ BOOL daNpc_Btsw2_c::CreateInit() {
m724 = 0;
mPathNo = fopAcM_GetParamBit(fopAcM_GetParam(this), 0x10, 8);
mpPath = dPath_GetRoomPath(mPathNo, current.roomNo);
m73C = mpPath->m_num - 1;
mFinalPathPntIdx = mpPath->m_num - 1;
m73E = 1.0f + cM_rndF(3.0f);
m742 = 90.0f + cM_rndF(300.0f);
m735 = 0;
m736 = 0;
m740 = 0;
mPathPntIdx = 0;
mEventCut.setActorInfo2("Btsw2", this);
attention_info.distances[1] = 0xAB;
attention_info.distances[3] = 0xAB;
@@ -514,19 +513,23 @@ void daNpc_Btsw2_c::pathMove() {
setAnm(7);
m73E = 1.0f + cM_rndF(3.0f);
}
if (m745 == 8 && mpMcaMorf->checkFrame(mpMcaMorf->getEndFrame()-1.0f)) {
if (m745 == 8 && mpMorf->checkFrame(mpMorf->getEndFrame()-1.0f)) {
setAnm(0);
}
return;
}
cXyz sp54;
int r30 = m740 < m73C ? (s16)(m740+1) : 0; // fakematch?
dPath__Point* pnt = &mpPath->mpPnt[(s16)r30];
sp54.set(pnt->mPos.x, pnt->mPos.y, pnt->mPos.z);
s16 r29 = cLib_targetAngleY(&current.pos, &sp54);
cLib_addCalcAngleS2(&current.angle.y, r29, l_HIO.m32, l_HIO.m30);
cXyz sp48 = sp54 - current.pos;
s16 pathPntIdx;
if (mPathPntIdx < mFinalPathPntIdx) {
pathPntIdx = mPathPntIdx+1;
} else {
pathPntIdx = 0;
}
dPath__Point* pnt = &mpPath->mpPnt[pathPntIdx];
cXyz targetPos(pnt->mPos.x, pnt->mPos.y, pnt->mPos.z);
s16 targetAngle = cLib_targetAngleY(&current.pos, &targetPos);
cLib_addCalcAngleS2(&current.angle.y, targetAngle, l_HIO.m32, l_HIO.m30);
cXyz sp48 = targetPos - current.pos;
speedF = l_HIO.m34;
if (sp48.normalizeRS()) {
cXyz sp3c(
@@ -539,8 +542,8 @@ void daNpc_Btsw2_c::pathMove() {
if (m736 != 0) {
speedF = 0.0f;
s16 r27 = cLib_distanceAngleS(current.angle.y, r29);
cLib_addCalcAngleS2(&current.angle.y, r29, 4, 0x1800);
s16 r27 = cLib_distanceAngleS(current.angle.y, targetAngle);
cLib_addCalcAngleS2(&current.angle.y, targetAngle, 4, 0x1800);
if (r27 < 0x10) {
m736 = 0;
setAnm(7);
@@ -549,9 +552,9 @@ void daNpc_Btsw2_c::pathMove() {
fopAcM_posMoveF(this, mStts.GetCCMoveP());
cXyz sp30 = sp54 - current.pos;
cXyz sp30 = targetPos - current.pos;
if (sp30.absXZ() < 10.0f) {
m740 = r30;
mPathPntIdx = pathPntIdx;
if (m73E > 0) {
m73E--;
return;
@@ -567,10 +570,10 @@ void daNpc_Btsw2_c::pathMove() {
/* 00001574-00001660 .text wait_action__13daNpc_Btsw2_cFPv */
BOOL daNpc_Btsw2_c::wait_action(void*) {
if (m74A == 0) {
if (mActionStatus == ACTION_STARTING) {
m747 = 1;
m74A++;
} else if (m74A != -1) {
mActionStatus++; // ACTION_ONGOING
} else if (mActionStatus != ACTION_ENDING) {
s16 facingAngleY = current.angle.y + m_jnt.getHead_y() + m_jnt.getBackbone_y();
mHasAttention = chkAttention(current.pos, facingAngleY);
m746 = 0;
@@ -607,7 +610,7 @@ s32 daNpc_Btsw2_c::_create() {
return cPhs_ERROR_e;
}
fopAcM_SetMtx(this, mpMcaMorf->getModel()->getBaseTRMtx());
fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx());
if (!CreateInit()) {
return cPhs_ERROR_e;
@@ -620,8 +623,8 @@ s32 daNpc_Btsw2_c::_create() {
/* 00001C34-00001C8C .text _delete__13daNpc_Btsw2_cFv */
BOOL daNpc_Btsw2_c::_delete() {
dComIfG_resDelete(&mPhs, m_arc_name);
if (heap && mpMcaMorf) {
mpMcaMorf->stopZelAnime();
if (heap && mpMorf) {
mpMorf->stopZelAnime();
}
return TRUE;
}
@@ -634,7 +637,7 @@ BOOL daNpc_Btsw2_c::_execute() {
l_HIO.mNpc.mMaxTurnStep
);
playTexPatternAnm();
mpMcaMorf->play(&eyePos, 0, 0);
mpMorf->play(&eyePos, 0, 0);
checkOrder();
if (!mEventCut.cutProc()) {
(this->*mCurrActionFunc)(NULL);
@@ -644,7 +647,7 @@ BOOL daNpc_Btsw2_c::_execute() {
tevStr.mRoomNo = dComIfG_Bgsp()->GetRoomId(mObjAcch.m_gnd);
tevStr.mEnvrIdxOverride = dComIfG_Bgsp()->GetPolyColor(mObjAcch.m_gnd);
J3DModel* model = mpMcaMorf->getModel();
J3DModel* model = mpMorf->getModel();
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::YrotM(current.angle.y);
model->setBaseTRMtx(mDoMtx_stack_c::get());
@@ -656,25 +659,25 @@ BOOL daNpc_Btsw2_c::_execute() {
/* 00001DDC-00001F6C .text _draw__13daNpc_Btsw2_cFv */
BOOL daNpc_Btsw2_c::_draw() {
J3DModel* model = mpMcaMorf->getModel();
J3DModel* model = mpMorf->getModel();
J3DModelData* modelData = model->getModelData();
g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
g_env_light.setLightTevColorType(model, &tevStr);
g_env_light.setLightTevColorType(m6D0, &tevStr);
g_env_light.setLightTevColorType(m6D4, &tevStr);
g_env_light.setLightTevColorType(mpKabanModel, &tevStr);
g_env_light.setLightTevColorType(mpTirasiModel, &tevStr);
mBtpAnm.entry(modelData, m6F0);
mpMcaMorf->updateDL();
m6D0->setBaseTRMtx(model->getAnmMtx(m6F1));
m6D4->setBaseTRMtx(model->getAnmMtx(m6F2));
mDoExt_modelUpdateDL(m6D0);
mDoExt_modelUpdateDL(m6D4);
mBtpAnm.entry(modelData, mBtpFrame);
mpMorf->updateDL();
mpKabanModel->setBaseTRMtx(model->getAnmMtx(m_handL_jnt_num));
mpTirasiModel->setBaseTRMtx(model->getAnmMtx(m_handR_jnt_num));
mDoExt_modelUpdateDL(mpKabanModel);
mDoExt_modelUpdateDL(mpTirasiModel);
mBtpAnm.remove(modelData);
cXyz sp8(current.pos.x, current.pos.y + 130.0f, current.pos.z);
cXyz shadowPos(current.pos.x, current.pos.y + 130.0f, current.pos.z);
mShadowId = dComIfGd_setShadow(
mShadowId, 1, mpMcaMorf->getModel(), &sp8, 800.0f, 20.0f,
mShadowId, 1, mpMorf->getModel(), &shadowPos, 800.0f, 20.0f,
current.pos.y, mObjAcch.GetGroundH(), mObjAcch.m_gnd, &tevStr,
0, 1.0f, dDlst_shadowControl_c::getSimpleTex()
);
src/d/actor/d_a_npc_os.cpp
+5 -5
View File
@@ -743,7 +743,7 @@ BOOL daNpc_Os_c::finish01NpcAction(void* param_1) {
if(field_0x7A9 == 0) {
if(dComIfGp_getCb1Player() == this) {
onNpcNotChange();
dComIfGp_setCb1Player(0);
dComIfGp_setCb1Player(NULL);
}
setAnm(0);
@@ -1272,7 +1272,7 @@ BOOL daNpc_Os_c::eventProc() {
setNpcAction(&waitNpcAction, 0);
offNpcCallCommand();
onNpcNotChange();
dComIfGp_setCb1Player(0);
dComIfGp_setCb1Player(NULL);
setFinish();
}
else if(field_0x7A5 == 8) {
@@ -2024,7 +2024,7 @@ BOOL daNpc_Os_c::draw() {
mBrkAnm.entry(pModelData, mBrkAnm.getFrame());
mpMorf->entryDL();
pModelData->getMaterialTable().removeTevRegAnimator(mBrkAnm.getBrkAnm());
mBrkAnm.remove(pModelData);
if(!fopAcM_checkCarryNow(this) && field_0x784 & 0x10) {
cXyz shadowPos(current.pos.x, current.pos.y + 150.0f, current.pos.z);
@@ -2082,14 +2082,14 @@ BOOL daNpc_Os_c::execute() {
if(!finishCheck()) {
if(!check_initialRoom()) {
if(dComIfGp_getCb1Player() == this) {
dComIfGp_setCb1Player(0);
dComIfGp_setCb1Player(NULL);
}
endBeam();
return true;
}
initialRestartOption(getRestartNumber(), 1);
initialRestartOption(getRestartNumber(), TRUE);
if(wakeupCheck()) {
offNpcNotChange();
src/d/actor/d_a_player_main.cpp
+26 -2
View File
@@ -2238,12 +2238,36 @@ BOOL daPy_lk_c::procSubjectivity() {
/* 80112BEC-80112C90 .text procCall_init__9daPy_lk_cFv */
BOOL daPy_lk_c::procCall_init() {
/* Nonmatching */
commonProcInit(daPyProc_CALL_e);
mVelocity = 0.0f;
daPy_matAnm_c::offMabaFlg();
daPy_matAnm_c::setMabaTimer(1);
setSingleMoveAnime(ANM_YOBU, 1.0f, 0.0f, -1, daPy_HIO_basic_c0::m.field_0xC);
current.angle.y = shape_angle.y;
if (mHeldItemType == 0x101) {
deleteEquipItem(FALSE);
}
voiceStart(0x2A);
return TRUE;
}
/* 80112C90-80112D38 .text procCall__9daPy_lk_cFv */
BOOL daPy_lk_c::procCall() {
/* Nonmatching */
if (dComIfGp_getCb1Player()) {
s16 targetAngle = cLib_targetAngleY(&current.pos, &dComIfGp_getCb1Player()->eyePos);
cLib_addCalcAngleS(&shape_angle.y, targetAngle, 2, 0x2000, 0x800);
current.angle.y = shape_angle.y;
}
if (mFrameCtrlUnder[0].getRate() < 0.01f) {
if (dComIfGp_getCb1Player()) {
daPy_py_c* partner = (daPy_py_c*)dComIfGp_getCb1Player();
partner->onNpcCallCommand();
}
checkNextMode(0);
}
return TRUE;
}
/* 80112D38-80112DF4 .text procControllWait_init__9daPy_lk_cFv */
src/d/actor/d_a_player_npc.cpp
+1 -1
View File
@@ -130,7 +130,7 @@ BOOL daPy_npc_c::checkRestart(s8 option) {
}
/* 8015AB28-8015ABD8 .text initialRestartOption__10daPy_npc_cFSci */
BOOL daPy_npc_c::initialRestartOption(s8 option, int save) {
BOOL daPy_npc_c::initialRestartOption(s8 option, BOOL save) {
fopAc_ac_c* partner = dComIfGp_getCb1Player();
if (!partner) {
dComIfGp_setCb1Player(this);
src/d/actor/d_a_pw.cpp
+6 -6
View File
@@ -285,14 +285,14 @@ void action_dousa(pw_class* i_this) {
i_this->mActorPlace.pos.x = i_this->m2CC.x + camfwd.x * 150.0f;
i_this->mActorPlace.pos.y = i_this->m2CC.y;
i_this->mActorPlace.pos.z = i_this->m2CC.z + camfwd.z * 150.0f;
fopAc_ac_c* searchResult;
fopAc_ac_c* kantera;
if (i_this->mKanteraID != fpcM_ERROR_PROCESS_ID_e &&
fopAcM_SearchByID(i_this->mKanteraID, &searchResult) && searchResult != NULL &&
fopAcM_GetName(searchResult) == PROC_KANTERA)
fopAcM_SearchByID(i_this->mKanteraID, &kantera) && kantera != NULL &&
fopAcM_GetName(kantera) == PROC_KANTERA)
{
searchResult->current.pos = i_this->m2CC;
searchResult->current.angle.y = i_this->shape_angle.y;
searchResult->scale.setall(1.0f);
kantera->current.pos = i_this->m2CC;
kantera->current.angle.y = i_this->shape_angle.y;
kantera->scale.setall(1.0f);
if (i_this->mpMorf->isStop()) {
i_this->m341 = 0;
i_this->mBehaviorType = VisibleFromStart;