mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-05 17:44:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_npc_impal work (#2449)

Browse Source 
* d_a_npc_impal work

* Address review comments
This commit is contained in:
hev7
2025-05-19 21:56:11 +01:00
committed by GitHub
parent 9ffb52027a
commit 84c616d6ff
20 changed files with 1366 additions and 1537 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc.cpp
+1 -1
View File
@@ -5219,7 +5219,7 @@ bool daNpcF_c::setExpressionAnm(int param_0, bool param_1) {
}
/* 80155BE8-80155BEC 150528 0004+00 2/0 0/0 0/0 .text setMotionAnm__8daNpcF_cFif */
bool daNpcF_c::setMotionAnm(int param_0, f32 param_1) {
void daNpcF_c::setMotionAnm(int param_0, f32 param_1) {
/* empty function */
}
src/d/actor/d_a_npc_ash.cpp
+3 -4
View File
@@ -786,7 +786,7 @@ bool daNpcAsh_c::setExpressionBtp(int i_idx) {
}
/* 809597C0-80959910 0015C0 0150+00 1/0 0/0 0/0 .text setMotionAnm__10daNpcAsh_cFif */
bool daNpcAsh_c::setMotionAnm(int i_idx, f32 i_morf) {
void daNpcAsh_c::setMotionAnm(int i_idx, f32 i_morf) {
if (i_idx < 8 || i_idx >= 18) {
return;
}
@@ -1513,10 +1513,9 @@ BOOL daNpcAsh_c::ctrlBtk() {
mpMatAnm->setNowOffsetX(cM_ssin(mEyeAngle.y) * 0.2f * -1.0f);
mpMatAnm->setNowOffsetY(cM_ssin(mEyeAngle.x) * 0.4f);
mpMatAnm->onEyeMoveFlag();
return true;
} else {
return false;
return TRUE;
}
return FALSE;
}
/* 8095C5C4-8095C9BC 0043C4 03F8+00 1/0 0/0 0/0 .text setAttnPos__10daNpcAsh_cFv */
src/d/actor/d_a_npc_ashB.cpp
+5 -7
View File
@@ -649,9 +649,7 @@ bool daNpcAshB_c::setExpressionBtp(int i_idx) {
}
/* 8095EEE0-8095F0A4 001180 01C4+00 1/0 0/0 0/0 .text setMotionAnm__11daNpcAshB_cFif */
// NONMATCHING regalloc
bool daNpcAshB_c::setMotionAnm(int i_idx, f32 i_morf) {
void daNpcAshB_c::setMotionAnm(int i_idx, f32 i_morf) {
if (i_idx < 7 || i_idx >= 21) {
return;
}
@@ -1371,13 +1369,13 @@ void daNpcAshB_c::lookat() {
if (mLookMode != LOOK_PLAYER_TALK) {
break;
}
body_down_angle = -80.0f;
body_up_angle = 80.0f;
head_right_angle = -80.0f;
head_left_angle = 80.0f;
break;
case LOOK_ACTOR:
actor = daPy_getPlayerActorClass();
head_up_angle = 0.0f;
head_right_angle = 0.0f;
body_right_angle = 0.0f;
body_left_angle = 0.0f;
break;
}
src/d/actor/d_a_npc_impal.cpp
+1142 -1420
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_npc_shoe.cpp
+1 -2
View File
@@ -771,8 +771,7 @@ void daNpcShoe_c::lookat() {
}
/* 80AE9A00-80AE9AD0 0021A0 00D0+00 1/0 0/0 0/0 .text setMotionAnm__11daNpcShoe_cFif */
bool daNpcShoe_c::setMotionAnm(int i_idx, f32 i_morf) {
// NONMATCHING
void daNpcShoe_c::setMotionAnm(int i_idx, f32 i_morf) {
J3DAnmTransformKey* morfAnm = getTrnsfrmKeyAnmP(l_arcNames[l_bckGetParamList[i_idx].arcIdx], l_bckGetParamList[i_idx].fileIdx);
int morfAttr = l_bckGetParamList[i_idx].attr;
src/d/actor/d_a_npc_the.cpp
+2 -3
View File
@@ -679,7 +679,7 @@ bool daNpcThe_c::setExpressionBtp(int i_idx) {
}
/* 80AF8564-80AF8744 000F84 01E0+00 2/0 0/0 0/0 .text setMotionAnm__10daNpcThe_cFif */
bool daNpcThe_c::setMotionAnm(int i_idx, f32 i_morf) {
void daNpcThe_c::setMotionAnm(int i_idx, f32 i_morf) {
J3DAnmTransformKey* anm_trans = NULL;
J3DAnmTextureSRTKey* anm_tex = NULL;
int attr = J3DFrameCtrl::EMode_LOOP;
@@ -1425,7 +1425,6 @@ void daNpcThe_c::setExpressionTalkAfter() {
}
/* 80AFA6CC-80AFADEC 0030EC 0720+00 1/1 0/0 0/0 .text doEvent__10daNpcThe_cFv */
// NONMATCHING regalloc and mr ordering
BOOL daNpcThe_c::doEvent() {
BOOL ret = false;
if (dComIfGp_event_runCheck() != false) {
@@ -1478,7 +1477,7 @@ BOOL daNpcThe_c::doEvent() {
}
ret = true;
} else {
int staff_id = event_manager.getMyStaffId(l_myName, this, -1);
s32 staff_id = event_manager.getMyStaffId(l_myName, this, -1);
if (staff_id != -1) {
mStaffID = staff_id;
int act_idx = event_manager.getMyActIdx(staff_id, mEvtCutNameList,
src/d/actor/d_a_npc_uri.cpp
+3 -3
View File
@@ -68,7 +68,7 @@ static s8 l_loadResPtrn9[5] = {
/* 80B2D108-80B2D124 -00001 001C+00 1/2 0/0 0/0 .data l_loadResPtrnList */
static s8* l_loadResPtrnList[7] = {l_loadResPtrn0, l_loadResPtrn1, l_loadResPtrn0, l_loadResPtrn2,
l_loadResPtrn3, l_loadResPtrn4, l_loadResPtrn9};
l_loadResPtrn3, l_loadResPtrn4, l_loadResPtrn9};
/* 80B2D124-80B2D338 0000DC 0214+00 0/1 0/0 0/0 .data l_faceMotionAnmData */
static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[19] = {
@@ -603,10 +603,10 @@ void daNpc_Uri_c::setAfterTalkMotion() {
case 8:
iVar2 = 10;
break;
case 9:
case 11:
iVar2 = 12;
break;
case 11:
case 9:
iVar2 = 16;
}
mFaceMotionSeqMngr.setNo(iVar2, -1.0f, 0, 0);
src/d/actor/d_a_npc_zra.cpp
+1 -1
View File
@@ -1458,7 +1458,7 @@ void daNpc_zrA_c::setExpression(int i_expression, f32 i_morf) {
}
/* 80B7BEA0-80B7C070 003A80 01D0+00 2/0 0/0 0/0 .text setMotionAnm__11daNpc_zrA_cFif */
bool daNpc_zrA_c::setMotionAnm(int i_idx, f32 i_morf) {
void daNpc_zrA_c::setMotionAnm(int i_idx, f32 i_morf) {
J3DAnmTransformKey* bck_anm = NULL;
J3DAnmTextureSRTKey* btk_anm = NULL;
int btk_idx = 0;
src/d/actor/d_a_npc_zrc.cpp
+1 -2
View File
@@ -791,8 +791,7 @@ void daNpc_zrC_c::setExpression(int i_expression, f32 i_morf) {
}
/* 80B8F9F8-80B8FBE4 001ED8 01EC+00 2/0 0/0 0/0 .text setMotionAnm__11daNpc_zrC_cFif */
// NONMATCHING regalloc
bool daNpc_zrC_c::setMotionAnm(int i_idx, f32 i_morf) {
void daNpc_zrC_c::setMotionAnm(int i_idx, f32 i_morf) {
J3DAnmTransformKey* bck_anm = NULL;
J3DAnmTextureSRTKey* btk_anm = NULL;
int btk_idx = 0;
src/d/actor/d_a_npc_zrz.cpp
+1 -1
View File
@@ -926,7 +926,7 @@ void daNpc_zrZ_c::setExpression(int i_expression, f32 i_morf) {
}
/* 80B95F3C-80B9612C 00225C 01F0+00 1/0 0/0 0/0 .text setMotionAnm__11daNpc_zrZ_cFif */
bool daNpc_zrZ_c::setMotionAnm(int i_idx, f32 i_morf) {
void daNpc_zrZ_c::setMotionAnm(int i_idx, f32 i_morf) {
J3DAnmTransformKey* bck_anm = NULL;
J3DAnmTextureSRTKey* btk_anm = NULL;
int attr = J3DFrameCtrl::EMode_LOOP;