summaryrefslogtreecommitdiff
path: root/src/d/actor/d_a_npc_post.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/d/actor/d_a_npc_post.cpp')
-rw-r--r--src/d/actor/d_a_npc_post.cpp146
1 files changed, 78 insertions, 68 deletions
diff --git a/src/d/actor/d_a_npc_post.cpp b/src/d/actor/d_a_npc_post.cpp
index cd04616d26..b7bfe44042 100644
--- a/src/d/actor/d_a_npc_post.cpp
+++ b/src/d/actor/d_a_npc_post.cpp
@@ -159,6 +159,52 @@ enum Type {
/* 0x3 */ TYPE_DEFAULT,
};
+daNpc_Post_HIOParam const daNpc_Post_Param_c::m = {
+ 190.0f,
+ -3.0f,
+ 1.0f,
+ 700.0f,
+ 255.0f,
+ 180.0f,
+ 35.0f,
+ 30.0f,
+ 0.0f,
+ 0.0f,
+ 10.0f,
+ -10.0f,
+ 30.0f,
+ -10.0f,
+ 45.0f,
+ -45.0f,
+ 0.6f,
+ 12.0f,
+ 3,
+ 6,
+ 5,
+ 6,
+ 110.0f,
+ 0.0f,
+ 0.0f,
+ 0.0f,
+ 60,
+ 8,
+ 0,
+ 0,
+ 0,
+ false,
+ false,
+ 4.0f,
+ 0.0f,
+ 0.0f,
+ 0.0f,
+ 0.0f,
+ 0.0f,
+ 0.0f,
+ 0.0f,
+ 16.0f,
+ 60,
+};
+
#if DEBUG
daNpc_Post_HIO_c::daNpc_Post_HIO_c() {
m = daNpc_Post_Param_c::m;
@@ -173,7 +219,7 @@ void daNpc_Post_HIO_c::listenPropertyEvent(const JORPropertyEvent* evt) {
switch ((u32)evt->id) {
case 0x40000002:
- if (jorFile.open(6, "", NULL, NULL, NULL)) {
+ if (jorFile.open(6, "すべてのファイル(*.*)\0*.*\0", NULL, NULL, NULL)) {
memset(&buffer, 0, sizeof(buffer));
len = 0;
daNpcT_cmnListenPropertyEvent(buffer, &len, &m.common);
@@ -321,7 +367,7 @@ daNpc_Post_c::cutFunc daNpc_Post_c::mCutList[2] = {
static NPC_POST_HIO_CLASS l_HIO;
daNpc_Post_c::~daNpc_Post_c() {
- OS_REPORT("|%06d:%x|daNpc_Post_c -> コンストラクト\n", g_Counter.mCounter0, this);
+ OS_REPORT("|%06d:%x|daNpc_Post_c -> デストラクト\n", g_Counter.mCounter0, this);
if (mpMorf[0] != NULL) {
mpMorf[0]->stopZelAnime();
@@ -340,52 +386,6 @@ daNpc_Post_c::~daNpc_Post_c() {
deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
}
-daNpc_Post_HIOParam const daNpc_Post_Param_c::m = {
- 190.0f,
- -3.0f,
- 1.0f,
- 700.0f,
- 255.0f,
- 180.0f,
- 35.0f,
- 30.0f,
- 0.0f,
- 0.0f,
- 10.0f,
- -10.0f,
- 30.0f,
- -10.0f,
- 45.0f,
- -45.0f,
- 0.6f,
- 12.0f,
- 3,
- 6,
- 5,
- 6,
- 110.0f,
- 0.0f,
- 0.0f,
- 0.0f,
- 60,
- 8,
- 0,
- 0,
- 0,
- false,
- false,
- 4.0f,
- 0.0f,
- 0.0f,
- 0.0f,
- 0.0f,
- 0.0f,
- 0.0f,
- 0.0f,
- 16.0f,
- 60,
-};
-
cPhs_Step daNpc_Post_c::create() {
daNpcT_ct(this, daNpc_Post_c, l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData,
4, l_motionSequenceData, 4, l_evtList, l_resNameList);
@@ -414,7 +414,7 @@ cPhs_Step daNpc_Post_c::create() {
return cPhs_ERROR_e;
}
- J3DModel* model = mpMorf[0]->getModel();
+ J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx());
fopAcM_setCullSizeBox(this, -200.0f, -100.0f, -200.0f, 200.0f, 300.0f, 200.0f);
@@ -454,21 +454,24 @@ cPhs_Step daNpc_Post_c::create() {
}
int daNpc_Post_c::CreateHeap() {
+ J3DModelData* modelData = NULL;
+ J3DModel* model = NULL;
int bmdIdx = 0;
int resIdx = l_bmdData[bmdIdx][1];
int idx = l_bmdData[bmdIdx][0];
- J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_resNameList[resIdx], idx));
+ modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_resNameList[resIdx], idx));
if (modelData == NULL) {
return 0;
}
- u32 uVar1 = 0x11020284;
- mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, uVar1);
+ u32 sp28 = 0x11020284;
+ mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000,
+ sp28);
if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) {
return 0;
}
- J3DModel* model = mpMorf[0]->getModel();
+ model = mpMorf[0]->getModel();
for (u16 i = 0; i < modelData->getJointNum(); i++) {
modelData->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
}
@@ -488,8 +491,9 @@ int daNpc_Post_c::CreateHeap() {
}
if (mType != TYPE_BAR) {
- u32 uVar2 = 0x11000084;
- mpFlagModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, NULL, J3DMdlFlag_DifferedDLBuffer, uVar2);
+ sp28 = 0x11000084;
+ mpFlagModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, NULL,
+ J3DMdlFlag_DifferedDLBuffer, sp28);
if (mpFlagModelMorf == NULL || mpFlagModelMorf->getModel() == NULL) {
return 0;
}
@@ -501,13 +505,16 @@ int daNpc_Post_c::CreateHeap() {
for (int i = 0; i < 2; i++) {
if (l_bmdData[bmdTypeList[i]][0] >= 0) {
- modelData = (J3DModelData*)dComIfG_getObjectRes(l_resNameList[l_bmdData[bmdTypeList[i]][1]], l_bmdData[bmdTypeList[i]][0]);
+ modelData =
+ (J3DModelData*)dComIfG_getObjectRes(l_resNameList[l_bmdData[bmdTypeList[i]][1]],
+ l_bmdData[bmdTypeList[i]][0]);
} else {
modelData = NULL;
}
if (modelData != NULL) {
- mpLetterModels[i] = mDoExt_J3DModel__create(modelData, J3DMdlFlag_DifferedDLBuffer, 0x11000084);
+ mpLetterModels[i] = mDoExt_J3DModel__create(modelData, J3DMdlFlag_DifferedDLBuffer,
+ 0x11000084);
} else {
mpLetterModels[i] = NULL;
}
@@ -521,7 +528,7 @@ int daNpc_Post_c::CreateHeap() {
}
int daNpc_Post_c::Delete() {
- OS_REPORT("|%06d:%x|daNpc_Post_c -> コンストラクト\n", g_Counter.mCounter0, this);
+ OS_REPORT("|%06d:%x|daNpc_Post_c -> Delete\n", g_Counter.mCounter0, this);
fopAcM_RegisterDeleteID(this, "NPC_POST");
this->~daNpc_Post_c();
return 1;
@@ -688,6 +695,8 @@ BOOL daNpc_Post_c::checkChangeEvt() {
return TRUE;
}
+
+ (int)mType;
}
return FALSE;
@@ -854,7 +863,7 @@ void daNpc_Post_c::setAttnPos() {
mpFlagModelMorf->play(0, 0);
mDoMtx_stack_c::copy(mpMorf[0]->getModel()->getAnmMtx(JNT_BACKBONE2));
Mtx mtx;
- MTXCopy(mDoMtx_stack_c::get(), mtx);
+ cMtx_copy(mDoMtx_stack_c::get(), mtx);
mpFlagModelMorf->getModel()->setBaseTRMtx(mtx);
mpFlagModelMorf->modelCalc();
}
@@ -970,7 +979,7 @@ void daNpc_Post_c::drawOtherMdl() {
mDoMtx_stack_c::copy(model->getAnmMtx(jointNo[i]));
Mtx mtx;
- MTXCopy(mDoMtx_stack_c::get(), mtx);
+ cMtx_copy(mDoMtx_stack_c::get(), mtx);
mpLetterModels[i]->setBaseTRMtx(mtx);
mDoExt_modelUpdateDL(mpLetterModels[i]);
dComIfGd_addRealShadow(mShadowKey, mpLetterModels[i]);
@@ -996,9 +1005,10 @@ bool daNpc_Post_c::setFlagAnm(int i_idx, int i_attr, f32 i_morf) {
};
J3DAnmTransform* anm = NULL;
+ int idx = i_idx;
if (mpFlagModelMorf != NULL) {
- if (flagAnmData[i_idx].fileIdx > 0) {
- anm = getTrnsfrmKeyAnmP(l_resNameList[flagAnmData[i_idx].arcIdx], flagAnmData[i_idx].fileIdx);
+ if (flagAnmData[idx].fileIdx > 0) {
+ anm = getTrnsfrmKeyAnmP(l_resNameList[flagAnmData[idx].arcIdx], flagAnmData[idx].fileIdx);
}
if (anm != NULL) {
@@ -1093,10 +1103,6 @@ void daNpc_Post_c::pullOutLetter() {
}
}
-static int const dummy[2] = {
- -1, -1,
-};
-
int daNpc_Post_c::cutDeliver(int i_staffId) {
cXyz work;
csXyz angle;
@@ -1255,6 +1261,8 @@ int daNpc_Post_c::cutDeliver(int i_staffId) {
}
}
+ int arr[2] = {-1, -1};
+
switch (prm) {
case 0:
mJntAnm.lookPlayer(0);
@@ -1360,6 +1368,7 @@ int daNpc_Post_c::cutDeliver(int i_staffId) {
}
int daNpc_Post_c::wait(void* param_1) {
+ daTag_EvtArea_c* actor_p = NULL;
daPy_py_c* player = daPy_getPlayerActorClass();
f32 fVar1 = mHIO->m.nod_interval;
@@ -1388,7 +1397,7 @@ int daNpc_Post_c::wait(void* param_1) {
)
) {
for (int i = 0; i < 4; i++) {
- daTag_EvtArea_c* actor_p = (daTag_EvtArea_c*)mActorMngrs[i].getActorP();
+ actor_p = (daTag_EvtArea_c*)mActorMngrs[i].getActorP();
if (actor_p != NULL) {
if (actor_p->chkPointInArea(player->current.pos)) {
if (daPy_getPlayerActorClass()->checkBoarRide()) {
@@ -1397,7 +1406,8 @@ int daNpc_Post_c::wait(void* param_1) {
mActorPos = actor_p->current.pos;
f32 fVar2 = player->current.pos.absXZ(actor_p->current.pos);
- if (actor_p->scale.x - 700.0f <= fVar2) {
+ f32 adjustedScale = actor_p->scale.x - 700.0f;
+ if (adjustedScale <= fVar2) {
if (daPy_getPlayerActorClass()->checkHorseRide()) {
mEvtNo = EVT_DELIVERTO_PLAYER_ON_HORSE;
} else if (daPy_py_c::checkNowWolf()) {
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 06:53:25 +0000