diff options
| author | hev7 <143887945+hev7@users.noreply.github.com> | 2025-05-19 21:56:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-19 23:56:11 +0300 |
| commit | 84c616d6ffeef11638a6f69a921f3a05561e8973 (patch) | |
| tree | a7215f9b9e04ff6b7fd0baeb3e8afbb5d22fe4e5 /src/d/actor/d_a_npc_the.cpp | |
| parent | 9ffb52027a27a2e3c6ad6bb8b954ff0924db2503 (diff) | |
d_a_npc_impal work (#2449)
* d_a_npc_impal work
* Address review comments
Diffstat (limited to 'src/d/actor/d_a_npc_the.cpp')
| -rw-r--r-- | src/d/actor/d_a_npc_the.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/d/actor/d_a_npc_the.cpp b/src/d/actor/d_a_npc_the.cpp index 33288a31de..2800560afc 100644 --- a/src/d/actor/d_a_npc_the.cpp +++ b/src/d/actor/d_a_npc_the.cpp @@ -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, |