diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2024-10-14 19:11:58 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-15 13:11:58 +1100 |
| commit | 15ddcac8a431506f5e34bea717dab80432ed5590 (patch) | |
| tree | e927fff31aa20644581b94574038b68afe6ba38b /src/code/z_actor.c | |
| parent | 278717bb0473ad2cb50c5916e9c6aff2dbcbc014 (diff) | |
Colliders Sync Cylinders (#1709)
Diffstat (limited to 'src/code/z_actor.c')
| -rw-r--r-- | src/code/z_actor.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 311085a3b..76885f852 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -4789,12 +4789,12 @@ void func_800BE3D0(Actor* actor, s16 angle, Vec3s* arg2) { } } -void func_800BE504(Actor* actor, ColliderCylinder* collider) { +void func_800BE504(Actor* actor, ColliderCylinder* cyl) { // Checks if was hit by either DMG_NORMAL_ARROW, DMG_FIRE_ARROW, DMG_ICE_ARROW, DMG_LIGHT_ARROW or DMG_DEKU_BUBBLE - if ((collider->info.acHitElem->toucher.dmgFlags & (0x10000 | 0x2000 | 0x1000 | 0x800 | 0x20))) { - actor->world.rot.y = collider->base.ac->shape.rot.y; + if ((cyl->elem.acHitElem->toucher.dmgFlags & (0x10000 | 0x2000 | 0x1000 | 0x800 | 0x20))) { + actor->world.rot.y = cyl->base.ac->shape.rot.y; } else { - actor->world.rot.y = Actor_WorldYawTowardActor(collider->base.ac, actor); + actor->world.rot.y = Actor_WorldYawTowardActor(cyl->base.ac, actor); } } |