diff options
| author | Tharo <17233964+Thar0@users.noreply.github.com> | 2023-10-17 20:16:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-17 21:16:31 +0200 |
| commit | a20163c6abf7700c432c711b03532cc4ad8d198a (patch) | |
| tree | df1d59b95bc42d14acd8c42c3557f0197be83799 /src/code/z_actor.c | |
| parent | b3486b57ef41a284a366eb40ca07bf82bf4750d6 (diff) | |
Use `long` over `int` for s32/u32 types (#1546)
* long s32
* Suggested changes
Diffstat (limited to 'src/code/z_actor.c')
| -rw-r--r-- | src/code/z_actor.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index e95a67ce6..bfae518bc 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -1000,15 +1000,15 @@ f32 func_8002DCE4(Player* player) { } } -s32 func_8002DD6C(Player* player) { +int func_8002DD6C(Player* player) { return player->stateFlags1 & PLAYER_STATE1_3; } -s32 func_8002DD78(Player* player) { +int func_8002DD78(Player* player) { return func_8002DD6C(player) && player->unk_834; } -s32 func_8002DDA8(PlayState* play) { +int func_8002DDA8(PlayState* play) { Player* player = GET_PLAYER(play); return (player->stateFlags1 & PLAYER_STATE1_11) || func_8002DD78(player); @@ -1049,7 +1049,7 @@ void Actor_MountHorse(PlayState* play, Player* player, Actor* horse) { horse->child = &player->actor; } -s32 func_8002DEEC(Player* player) { +int func_8002DEEC(Player* player) { return (player->stateFlags1 & (PLAYER_STATE1_7 | PLAYER_STATE1_29)) || (player->csAction != PLAYER_CSACTION_NONE); } @@ -2996,7 +2996,7 @@ Actor* Actor_Delete(ActorContext* actorCtx, Actor* actor, PlayState* play) { return newHead; } -s32 func_80032880(PlayState* play, Actor* actor) { +int func_80032880(PlayState* play, Actor* actor) { s16 sp1E; s16 sp1C; |
