diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2022-03-09 18:52:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-09 12:52:28 -0500 |
| commit | c55a8530eea7da8a73eb8c7b5f2d340ac686ed7a (patch) | |
| tree | 671a7da9eabd5227b4341d901edb71e2b4443d33 /src/code | |
| parent | 5cadc5df8a76b849bc6a576beca954d541146e54 (diff) | |
`PlayerMeleeWeaponAnimation` enum (#1154)
* Move `PlayerSwordAnimation` from `z_en_torch2.c` to `z64player.h`
* `PlayerSwordAnimation` -> `PlayerMeleeWeaponAnimation`
* Add `PWMA_` prefix to `PlayerMeleeWeaponAnimation` values
* Use `PlayerMeleeWeaponAnimation` enum more
* Add `PWMA_MAX`
* Update comments in z_en_kanban.c
* Some cleanup around conditionals with `meleeWeaponAnimation`
* Comment `PWMA_` index value in `D_80854190`
* `PMWA_` -> `PLAYER_MWA_`
* Minor fixup
* Missed one spot
* Run formatter
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_actor.c | 2 | ||||
| -rw-r--r-- | src/code/z_player_lib.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index eb654a66b..2301446ab 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -4041,7 +4041,7 @@ u8 func_800355E4(GlobalContext* globalCtx, Collider* collider) { Player* player = GET_PLAYER(globalCtx); if ((collider->acFlags & AC_TYPE_PLAYER) && (player->meleeWeaponState != 0) && - (player->meleeWeaponAnimation == 0x16)) { + (player->meleeWeaponAnimation == PLAYER_MWA_HAMMER_FORWARD)) { return true; } else { return false; diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 6c04c7fe8..80a88493a 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -1111,7 +1111,7 @@ void func_800906D4(GlobalContext* globalCtx, Player* this, Vec3f* newTipPos) { } if ((this->meleeWeaponState > 0) && - ((this->meleeWeaponAnimation < 0x18) || (this->stateFlags2 & PLAYER_STATE2_17))) { + ((this->meleeWeaponAnimation < PLAYER_MWA_SPIN_ATTACK_1H) || (this->stateFlags2 & PLAYER_STATE2_17))) { func_80090480(globalCtx, &this->meleeWeaponQuads[0], &this->meleeWeaponInfo[1], &newTipPos[1], &newBasePos[1]); func_80090480(globalCtx, &this->meleeWeaponQuads[1], &this->meleeWeaponInfo[2], &newTipPos[2], &newBasePos[2]); } |