diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-08-08 21:51:30 -0400 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-08-08 21:51:30 -0400 |
| commit | 5802571a5680c65e2fcdd39bceac26d42f490d64 (patch) | |
| tree | 371d72242beb595fd0887c025846062cf7a75efa /src/d/actor/d_a_npc_md.cpp | |
| parent | b24d8574cdef4f7e4521b2b0c72e0a8775706d9c (diff) | |
Add SQUARE macro to improve readibility for distances
Diffstat (limited to 'src/d/actor/d_a_npc_md.cpp')
| -rw-r--r-- | src/d/actor/d_a_npc_md.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/d/actor/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp index d3bbb379..6ae73dca 100644 --- a/src/d/actor/d_a_npc_md.cpp +++ b/src/d/actor/d_a_npc_md.cpp @@ -1197,15 +1197,15 @@ void daNpc_Md_c::NpcCall(int* r31) { if (!dComIfGs_isEventBit(0x1620)) { return; } - f32 dist2 = fopAcM_searchPlayerDistance2(this); + f32 dist_sq = fopAcM_searchPlayerDistance2(this); if (!checkNpcCallCommand()) { - if (dist2 < l_HIO.m0C8*l_HIO.m0C8) { + if (dist_sq < SQUARE(l_HIO.m0C8)) { daPy_getPlayerLinkActorClass()->onNpcCallCommand(); *r31 = 1; } } else { f32 temp = 2.0f*l_HIO.m0C4; - if (dist2 >= temp*temp) { + if (dist_sq >= temp*temp) { setNpcAction(&daNpc_Md_c::searchNpcAction); } *r31 = 1; @@ -1362,7 +1362,7 @@ BOOL daNpc_Md_c::waitNpcAction(void*) { f32 playerDistY = link->current.pos.y - current.pos.y; f32 f3 = l_HIO.m0BC; f32 f4 = l_HIO.m0C0; - if (playerDistXZ2 < l_HIO.m0CC * l_HIO.m0CC && playerDistY < f3 && playerDistY > f4) { + if (playerDistXZ2 < SQUARE(l_HIO.m0CC) && playerDistY < f3 && playerDistY > f4) { mCurEventMode = 0xB; } } else { |