mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-06-19 15:59:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

PlayerMeleeWeaponAnimation enum (#1154)

Browse Source 
* 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
This commit is contained in:
Dragorn421
2022-03-09 18:52:28 +01:00
committed by GitHub
parent 5cadc5df8a
commit c55a8530ee
15 changed files with 174 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_actor.c
+1 -1
View File
@@ -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;