diff options
| author | fig02 <fig02srl@gmail.com> | 2024-09-21 18:25:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-21 18:25:19 -0400 |
| commit | fcd5745d404493cda2fdb09f749f53f06f79ba48 (patch) | |
| tree | 4ceadadbe3a3c9b901be7fd6242e54df73d34c56 /src/code | |
| parent | 05b908d0eb881da10a0bca74a8649cf4bfc9b1b2 (diff) | |
PLAYER_STATE1_ACTOR_CARRY -> PLAYER_STATE1_CARRYING_ACTOR (#2213)
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_actor.c | 6 | ||||
| -rw-r--r-- | src/code/z_camera.c | 2 | ||||
| -rw-r--r-- | src/code/z_player_lib.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index e64b9345b..4405ae21c 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -1104,7 +1104,7 @@ int func_8002DD78(Player* player) { int func_8002DDA8(PlayState* play) { Player* player = GET_PLAYER(play); - return (player->stateFlags1 & PLAYER_STATE1_ACTOR_CARRY) || func_8002DD78(player); + return (player->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR) || func_8002DD78(player); } s32 func_8002DDE4(PlayState* play) { @@ -1814,7 +1814,7 @@ s32 Actor_OfferGetItem(Actor* actor, PlayState* play, s32 getItemId, f32 xzRange Player_GetExplosiveHeld(player) < 0) { if ((((player->heldActor != NULL) || (actor == player->talkActor)) && (getItemId > GI_NONE) && (getItemId < GI_MAX)) || - (!(player->stateFlags1 & (PLAYER_STATE1_ACTOR_CARRY | PLAYER_STATE1_29)))) { + (!(player->stateFlags1 & (PLAYER_STATE1_CARRYING_ACTOR | PLAYER_STATE1_29)))) { if ((actor->xzDistToPlayer < xzRange) && (fabsf(actor->yDistToPlayer) < yRange)) { s16 yawDiff = actor->yawTowardsPlayer - player->actor.shape.rot.y; s32 absYawDiff = ABS(yawDiff); @@ -1883,7 +1883,7 @@ u32 Actor_SetRideActor(PlayState* play, Actor* horse, s32 mountSide) { Player* player = GET_PLAYER(play); if (!(player->stateFlags1 & - (PLAYER_STATE1_DEAD | PLAYER_STATE1_ACTOR_CARRY | PLAYER_STATE1_CHARGING_SPIN_ATTACK | PLAYER_STATE1_13 | + (PLAYER_STATE1_DEAD | PLAYER_STATE1_CARRYING_ACTOR | PLAYER_STATE1_CHARGING_SPIN_ATTACK | PLAYER_STATE1_13 | PLAYER_STATE1_14 | PLAYER_STATE1_18 | PLAYER_STATE1_19 | PLAYER_STATE1_20 | PLAYER_STATE1_21))) { player->rideActor = horse; player->mountSide = mountSide; diff --git a/src/code/z_camera.c b/src/code/z_camera.c index be7cc4d27..4f49197df 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -6609,7 +6609,7 @@ s32 Camera_Demo5(Camera* camera) { sp4A = playerhead.rot.y - playerTargetGeo.yaw; if (camera->target->category == ACTORCAT_PLAYER) { framesDiff = camera->play->state.frames - sDemo5PrevAction12Frame; - if (player->stateFlags1 & PLAYER_STATE1_ACTOR_CARRY) { + if (player->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR) { // holding object over head. Player_SetCsActionWithHaltedActors(camera->play, camera->target, PLAYER_CSACTION_8); } else if (ABS(framesDiff) > 3000) { diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index f589748f0..d2642b9ea 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -1686,7 +1686,7 @@ void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList, Ve Matrix_Get(&sp14C); Matrix_MtxFToYXZRotS(&sp14C, &hookedActor->world.rot, 0); hookedActor->shape.rot = hookedActor->world.rot; - } else if (this->stateFlags1 & PLAYER_STATE1_ACTOR_CARRY) { + } else if (this->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR) { Vec3s spB8; Matrix_Get(&sp14C); |