diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2023-09-18 15:29:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-18 12:29:40 -0700 |
| commit | 01f2fc433f52c78cd09d8398f338c9df296c6ee0 (patch) | |
| tree | ec1370289df22d5abfe4b9229efbe1fac8ff7182 /src/d/d_npc.cpp | |
| parent | 1040e0498cb0a10bc8ed79a167d690d78f05dbd6 (diff) | |
d_a_nh done (no match) (#55)
* Fix sin and cos
* Fix dCcD_GObjInf JP inlining difference
* Improvements to dDlst_alphaModel_c
* d_a_nh done (no match)
Diffstat (limited to 'src/d/d_npc.cpp')
| -rw-r--r-- | src/d/d_npc.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/d/d_npc.cpp b/src/d/d_npc.cpp index 9681373a..7572f67e 100644 --- a/src/d/d_npc.cpp +++ b/src/d/d_npc.cpp @@ -893,8 +893,8 @@ void dNpc_EventCut_c::cutTurnToActorProc() { if(addAngle && pDelDistance) { u16 angle = mpTargetActor->shape_angle.y + addAngle; mPos = mpTargetActor->current.pos; - mPos.x -= pDelDistance * JMASinShort(angle); - mPos.z -= pDelDistance * JMASCosShort(angle); + mPos.x -= pDelDistance * cM_ssin(angle); + mPos.z -= pDelDistance * cM_scos(angle); } else { mPos = mpTargetActor->current.pos + mOffsetPos; @@ -1002,8 +1002,8 @@ void dNpc_EventCut_c::cutMoveToActorProc() { angle = mpTargetActor->shape_angle.y + mAddAngle; } - temp.x -= pDelDistance * JMASinShort(angle); - temp.z -= pDelDistance * JMASCosShort(angle); + temp.x -= pDelDistance * cM_ssin(angle); + temp.z -= pDelDistance * cM_scos(angle); if(mSpeed == 0.0f) { mpActor->current.pos = temp; @@ -1188,7 +1188,7 @@ void dNpc_EventCut_c::cutMoveToPosStart() { void dNpc_EventCut_c::cutMoveToPosProc() { s16 angle = cLib_targetAngleY(&mpActor->current.pos, &mPos); - cXyz temp(pDelDistance * JMASinShort(angle), mPos.y, pDelDistance * JMASCosShort(angle)); + cXyz temp(pDelDistance * cM_ssin(angle), mPos.y, pDelDistance * cM_scos(angle)); if(mSpeed == 0.0f) { mpActor->current.pos = temp; |