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>
This commit is contained in:
LagoLunatic
2025-12-20 01:59:16 -05:00
committed by GitHub
parent 0d25cfb3b4
commit d97e6656dc
6 changed files with 10 additions and 21 deletions
+1 -2
View File
@@ -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());