diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-12-20 01:59:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-19 22:59:16 -0800 |
| commit | 039505373732d70534f598f0d3f8d3eca62482ab (patch) | |
| tree | 1a39d042a2796580ceddfb6b207f2438beea5629 /src/d/actor/d_a_npc2.cpp | |
| parent | ac9a361676852f28a968add1e7919250fcb358d7 (diff) | |
Match dNpcLib_lookat_c::action and daBaseNpc_lookat_c::calc (#2973)
* Match dNpcLib_lookat_c::action and daBaseNpc_lookat_c::calc
Co-authored-by: Cuyler36 <Cuyler36@users.noreply.github.com>
* Improve d_a_npc weak func order
---------
Co-authored-by: Cuyler36 <Cuyler36@users.noreply.github.com>
Diffstat (limited to 'src/d/actor/d_a_npc2.cpp')
| -rw-r--r-- | src/d/actor/d_a_npc2.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/d/actor/d_a_npc2.cpp b/src/d/actor/d_a_npc2.cpp index 778f0c7efe..7573fbeb54 100644 --- a/src/d/actor/d_a_npc2.cpp +++ b/src/d/actor/d_a_npc2.cpp @@ -275,7 +275,6 @@ void daBaseNpc_lookat_c::limitter(s16 i_value, s16* o_value_p, s16 i_max, s16 i_ *o_value_p = 0; } -// NONMATCHING - regalloc, equivalent ? (matches debug) void daBaseNpc_lookat_c::calc(fopAc_ac_c* param_0, Mtx param_1, s16 param_2) { if (mpAttnPos == NULL) { for (int i = 0; i < 4; i++) { @@ -335,6 +334,7 @@ void daBaseNpc_lookat_c::calc(fopAc_ac_c* param_0, Mtx param_1, s16 param_2) { csXyz sp2C; cXyz sp94; cXyz sp88; + s16 sp16, sp14, sp12, sp10; for (int i = 2; i >= -1; i--) { sp2C = csXyz::Zero; @@ -368,7 +368,6 @@ void daBaseNpc_lookat_c::calc(fopAc_ac_c* param_0, Mtx param_1, s16 param_2) { if (!sp88.isZero()) { sp88.normalize(); - s16 sp16, sp14, sp12, sp10; sp16 = -cM_atan2s(sp94.y, sp94.absXZ()); sp12 = cM_atan2s(sp94.x, sp94.z); sp14 = -cM_atan2s(sp88.y, sp88.absXZ()); |