diff options
| author | fig02 <fig02srl@gmail.com> | 2024-09-08 17:43:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-08 17:43:27 -0400 |
| commit | 900c2f0f686fc391a50d24f391d7a1cb4e2ed614 (patch) | |
| tree | 3c448e6059c8b6865b3929749ba75dbbd31f293d /include | |
| parent | c7ec814d7897456ecdf1772e395a13f048b5133d (diff) | |
Name `PLAYER_STATE1_ACTOR_CARRY` (#2173)
* actor carry flag
* format and add comments
* comment changes
Diffstat (limited to 'include')
| -rw-r--r-- | include/z64player.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/z64player.h b/include/z64player.h index 248b3bdfe..5fc1eca57 100644 --- a/include/z64player.h +++ b/include/z64player.h @@ -649,17 +649,17 @@ typedef struct WeaponInfo { #define LEDGE_DIST_MAX 399.96002f #define PLAYER_STATE1_0 (1 << 0) -#define PLAYER_STATE1_SWINGING_BOTTLE (1 << 1) +#define PLAYER_STATE1_SWINGING_BOTTLE (1 << 1) // Bottle is swung; Bottle is active and can catch things #define PLAYER_STATE1_2 (1 << 2) #define PLAYER_STATE1_3 (1 << 3) #define PLAYER_STATE1_4 (1 << 4) #define PLAYER_STATE1_5 (1 << 5) #define PLAYER_STATE1_6 (1 << 6) #define PLAYER_STATE1_7 (1 << 7) -#define PLAYER_STATE1_START_CHANGING_HELD_ITEM (1 << 8) +#define PLAYER_STATE1_START_CHANGING_HELD_ITEM (1 << 8) // Item change process has begun #define PLAYER_STATE1_9 (1 << 9) #define PLAYER_STATE1_10 (1 << 10) -#define PLAYER_STATE1_11 (1 << 11) +#define PLAYER_STATE1_ACTOR_CARRY (1 << 11) // Currently carrying an actor #define PLAYER_STATE1_12 (1 << 12) #define PLAYER_STATE1_13 (1 << 13) #define PLAYER_STATE1_14 (1 << 14) @@ -690,14 +690,14 @@ typedef struct WeaponInfo { #define PLAYER_STATE2_6 (1 << 6) #define PLAYER_STATE2_7 (1 << 7) #define PLAYER_STATE2_8 (1 << 8) -#define PLAYER_STATE2_FORCE_SAND_FLOOR_SOUND (1 << 9) +#define PLAYER_STATE2_FORCE_SAND_FLOOR_SOUND (1 << 9) // Forces sand footstep sounds regardless of current floor type #define PLAYER_STATE2_10 (1 << 10) #define PLAYER_STATE2_11 (1 << 11) #define PLAYER_STATE2_12 (1 << 12) #define PLAYER_STATE2_13 (1 << 13) #define PLAYER_STATE2_14 (1 << 14) #define PLAYER_STATE2_15 (1 << 15) -#define PLAYER_STATE2_DO_ACTION_ENTER (1 << 16) // Turns on the "Enter On A" DoAction +#define PLAYER_STATE2_DO_ACTION_ENTER (1 << 16) // Sets the "Enter On A" DoAction #define PLAYER_STATE2_17 (1 << 17) #define PLAYER_STATE2_CRAWLING (1 << 18) // Crawling through a crawlspace #define PLAYER_STATE2_19 (1 << 19) |