diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2022-02-21 00:45:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-20 18:45:12 -0500 |
| commit | 145b14dbc4eeabe2547d458de7bbd3fffd446190 (patch) | |
| tree | d10bb4f01284760323b562359c5f0d1fe20ca168 /src/code/z_actor.c | |
| parent | b9cc31dc74bd3472375ae06412ace007c8f46534 (diff) | |
sword -> meleeWeapon (#1147)
Diffstat (limited to 'src/code/z_actor.c')
| -rw-r--r-- | src/code/z_actor.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 7e90800c9..2781e2a4c 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -3999,7 +3999,8 @@ s32 func_800354B4(GlobalContext* globalCtx, Actor* actor, f32 range, s16 arg3, s var1 = (s16)(actor->yawTowardsPlayer + 0x8000) - player->actor.shape.rot.y; var2 = actor->yawTowardsPlayer - arg5; - if ((actor->xzDistToPlayer <= range) && (player->swordState != 0) && (arg4 >= ABS(var1)) && (arg3 >= ABS(var2))) { + if ((actor->xzDistToPlayer <= range) && (player->meleeWeaponState != 0) && (arg4 >= ABS(var1)) && + (arg3 >= ABS(var2))) { return true; } else { return false; @@ -4039,7 +4040,8 @@ void func_800355B8(GlobalContext* globalCtx, Vec3f* pos) { u8 func_800355E4(GlobalContext* globalCtx, Collider* collider) { Player* player = GET_PLAYER(globalCtx); - if ((collider->acFlags & AC_TYPE_PLAYER) && (player->swordState != 0) && (player->swordAnimation == 0x16)) { + if ((collider->acFlags & AC_TYPE_PLAYER) && (player->meleeWeaponState != 0) && + (player->meleeWeaponAnimation == 0x16)) { return true; } else { return false; |