diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2024-09-07 21:55:59 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-07 20:55:59 -0700 |
| commit | 6eaf196927eb6c4465c3b6c8fcdcefb08a9bc377 (patch) | |
| tree | d519b46246312e8947507f840f39afbf06829216 /src/code/z_sub_s.c | |
| parent | 2e2b2e2c7a59bd3544de5e73f72a03b947ec8ab3 (diff) | |
Misc Clean (#1680)
* vramu32 in Overlay_Relocate
* Actor_SetColorFilter args
* Effect Hitmark enum
* Actor_WorldToActorCoords
* Some fault clean up
* contoller.h
* macros.h no longer needs stdint.h
Diffstat (limited to 'src/code/z_sub_s.c')
| -rw-r--r-- | src/code/z_sub_s.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/code/z_sub_s.c b/src/code/z_sub_s.c index a7e4adfc8..1924dc87f 100644 --- a/src/code/z_sub_s.c +++ b/src/code/z_sub_s.c @@ -1148,12 +1148,12 @@ s32 SubS_MoveActorToPoint(Actor* actor, Vec3f* point, s16 rotStep) { f32 distSqBefore; f32 distSqAfter; - Actor_OffsetOfPointInActorCoords(actor, &offsetBefore, point); + Actor_WorldToActorCoords(actor, &offsetBefore, point); Math_SmoothStepToS(&actor->world.rot.y, SubS_GetDistSqAndOrientPoints(point, &actor->world.pos, &distSqBefore), 4, rotStep, 1); actor->shape.rot.y = actor->world.rot.y; Actor_MoveWithGravity(actor); - Actor_OffsetOfPointInActorCoords(actor, &offsetAfter, point); + Actor_WorldToActorCoords(actor, &offsetAfter, point); SubS_GetDistSqAndOrientPoints(point, &actor->world.pos, &distSqAfter); return ((offsetBefore.z > 0.0f) && (offsetAfter.z <= 0.0f)) ? true : false; } |