diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-11-19 17:10:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-19 14:10:03 -0800 |
| commit | 4cf2c7e37d08cc2ae9c0ef42435fc89ab87734e7 (patch) | |
| tree | 881aa06a300da3bcb30d95a27a18a291463dc47a /src/d/actor/d_a_npc_moir.cpp | |
| parent | 8956be538efe0517dc2c5f1fbedee9fbed48115d (diff) | |
Misc fixes (#2830)
* Replace DANPCF_C_HACK with a better fakematch
* d_a_obj_item OK
* Fix ninja diff
* Misc debug/nonmatching fixes
* Fix ninja diff for PAL
* Fix bad PAL split
Diffstat (limited to 'src/d/actor/d_a_npc_moir.cpp')
| -rw-r--r-- | src/d/actor/d_a_npc_moir.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/d/actor/d_a_npc_moir.cpp b/src/d/actor/d_a_npc_moir.cpp index a478ce9843..3381654437 100644 --- a/src/d/actor/d_a_npc_moir.cpp +++ b/src/d/actor/d_a_npc_moir.cpp @@ -783,9 +783,7 @@ void daNpcMoiR_c::playExpression() { daNpcF_anmPlayData* pDat2[1] = {&dat2}; daNpcF_anmPlayData dat3 = {ANM_FH_SERIOUS, mpHIO->m.common.morf_frame, 0}; daNpcF_anmPlayData* pDat3[1] = {&dat3}; - // FIXME: daNpcF hack in configure.py prevents us from converting more of these, - // otherwise this function will not inline in GCN. - daNpcF_anmPlayData dat4 = {ANM_F_TAKAJO_HI, daNpcMoiR_Param_c::m.common.morf_frame, 0}; + daNpcF_anmPlayData dat4 = {ANM_F_TAKAJO_HI, mpHIO->m.common.morf_frame, 0}; daNpcF_anmPlayData* pDat4[1] = {&dat4}; daNpcF_anmPlayData dat5 = {ANM_FH_TAKAJO_HI, 0.0f, 0}; daNpcF_anmPlayData* pDat5[1] = {&dat5}; @@ -795,9 +793,9 @@ void daNpcMoiR_c::playExpression() { daNpcF_anmPlayData* pDat7[1] = {&dat7}; daNpcF_anmPlayData dat8 = {ANM_F_HOLD_S, 0.0f, 0}; daNpcF_anmPlayData* pDat8[1] = {&dat8}; - daNpcF_anmPlayData dat9 = {ANM_FH_HOLD_S, daNpcMoiR_Param_c::m.common.morf_frame, 0}; + daNpcF_anmPlayData dat9 = {ANM_FH_HOLD_S, mpHIO->m.common.morf_frame, 0}; daNpcF_anmPlayData* pDat9[1] = {&dat9}; - daNpcF_anmPlayData dat10 = {ANM_NONE, daNpcMoiR_Param_c::m.common.morf_frame, 0}; + daNpcF_anmPlayData dat10 = {ANM_NONE, mpHIO->m.common.morf_frame, 0}; daNpcF_anmPlayData* pDat10[1] = {&dat10}; daNpcF_anmPlayData* pDat11[1] = {&dat0}; |