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_os.cpp | |
| parent | b24d8574cdef4f7e4521b2b0c72e0a8775706d9c (diff) | |
Add SQUARE macro to improve readibility for distances
Diffstat (limited to 'src/d/actor/d_a_npc_os.cpp')
| -rw-r--r-- | src/d/actor/d_a_npc_os.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/d/actor/d_a_npc_os.cpp b/src/d/actor/d_a_npc_os.cpp index 96bbe148..1a939267 100644 --- a/src/d/actor/d_a_npc_os.cpp +++ b/src/d/actor/d_a_npc_os.cpp @@ -713,15 +713,15 @@ BOOL daNpc_Os_c::waitNpcAction(void*) { cLib_offBit<u32>(attention_info.flags, (fopAc_Attn_LOCKON_TALK_e | fopAc_Attn_ACTION_SPEAK_e)); - f32 dist = fopAcM_searchPlayerDistance2(this); + f32 dist_sq = fopAcM_searchPlayerDistance2(this); if(!checkNpcCallCommand()) { - if(dist < l_HIO.field_0x64 * l_HIO.field_0x64) { + if(dist_sq < SQUARE(l_HIO.field_0x64)) { daPy_getPlayerLinkActorClass()->onNpcCallCommand(); } } else { if(wakeupCheck()) { - if(dist >= l_HIO.field_0x60 * l_HIO.field_0x60) { + if(dist_sq >= SQUARE(l_HIO.field_0x60)) { setNpcAction(&daNpc_Os_c::searchNpcAction, 0); } } @@ -1064,16 +1064,16 @@ BOOL daNpc_Os_c::searchNpcAction(void*) { daPy_py_c* player = daPy_getPlayerActorClass(); BOOL door = player->eventInfo.checkCommandDoor(); - f32 dist = fopAcM_searchPlayerDistanceXZ2(this); + f32 dist_sq = fopAcM_searchPlayerDistanceXZ2(this); f32 temp; - if (dist < l_HIO.field_0x60 * l_HIO.field_0x60) { + if (dist_sq < SQUARE(l_HIO.field_0x60)) { temp = 0.0f; } else { temp = l_HIO.field_0xA8; } s16 angle, adjustedAngle; angle = adjustedAngle = fopAcM_searchPlayerAngleY(this); - BOOL temp3 = routeCheck(dist, &adjustedAngle) && cLib_distanceAngleS(angle, adjustedAngle) <= 0x2000; + BOOL temp3 = routeCheck(dist_sq, &adjustedAngle) && cLib_distanceAngleS(angle, adjustedAngle) <= 0x2000; if(door || !temp3 || (dComIfGp_checkPlayerStatus0(0, daPyStts0_UNK2000000_e | daPyStts0_UNK100_e | daPyStts0_UNK1_e) || player->checkAttentionLock())) { temp = 0.0f; offNpcCallCommand(); |