diff options
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_actor.c | 8 | ||||
| -rw-r--r-- | src/code/z_player_lib.c | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 462a81661..de6f2a38a 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -2164,7 +2164,7 @@ s32 Actor_OfferGetItem(Actor* actor, PlayState* play, GetItemId getItemId, f32 x (getItemId == GI_DEED_LAND) || (((player->heldActor != NULL) || (actor == player->talkActor)) && ((getItemId > GI_NONE) && (getItemId < GI_MAX)))) || - !(player->stateFlags1 & (PLAYER_STATE1_800 | PLAYER_STATE1_20000000))) { + !(player->stateFlags1 & (PLAYER_STATE1_CARRYING_ACTOR | PLAYER_STATE1_20000000))) { s16 yawDiff = actor->yawTowardsPlayer - player->actor.shape.rot.y; s32 absYawDiff = ABS_ALT(yawDiff); @@ -2244,9 +2244,9 @@ s32 Actor_HasRider(PlayState* play, Actor* horse) { s32 Actor_SetRideActor(PlayState* play, Actor* horse, s32 mountSide) { Player* player = GET_PLAYER(play); - if (!(player->stateFlags1 & - (PLAYER_STATE1_80 | PLAYER_STATE1_800 | PLAYER_STATE1_1000 | PLAYER_STATE1_2000 | PLAYER_STATE1_4000 | - PLAYER_STATE1_40000 | PLAYER_STATE1_80000 | PLAYER_STATE1_100000 | PLAYER_STATE1_200000))) { + if (!(player->stateFlags1 & (PLAYER_STATE1_80 | PLAYER_STATE1_CARRYING_ACTOR | PLAYER_STATE1_1000 | + PLAYER_STATE1_2000 | PLAYER_STATE1_4000 | PLAYER_STATE1_40000 | PLAYER_STATE1_80000 | + PLAYER_STATE1_100000 | PLAYER_STATE1_200000))) { player->rideActor = horse; player->mountSide = mountSide; CutsceneManager_Queue(CS_ID_GLOBAL_TALK); diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 75a9867f6..445d50165 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -353,8 +353,8 @@ s32 Player_GetCurMaskItemId(PlayState* play) { void func_80122F28(Player* player) { if ((player->actor.category == ACTORCAT_PLAYER) && - !(player->stateFlags1 & (PLAYER_STATE1_400 | PLAYER_STATE1_800 | PLAYER_STATE1_200000 | PLAYER_STATE1_800000 | - PLAYER_STATE1_20000000)) && + !(player->stateFlags1 & (PLAYER_STATE1_400 | PLAYER_STATE1_CARRYING_ACTOR | PLAYER_STATE1_200000 | + PLAYER_STATE1_800000 | PLAYER_STATE1_20000000)) && !(player->stateFlags2 & PLAYER_STATE2_1)) { if (player->doorType <= PLAYER_DOORTYPE_TALKING) { CutsceneManager_Queue(CS_ID_GLOBAL_TALK); @@ -540,11 +540,11 @@ bool func_801234D4(PlayState* play) { bool func_80123590(PlayState* play, Actor* actor) { Player* player = GET_PLAYER(play); - if ((player->stateFlags1 & PLAYER_STATE1_800) && (player->heldActor == actor)) { + if ((player->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR) && (player->heldActor == actor)) { player->interactRangeActor = NULL; player->heldActor = NULL; player->actor.child = NULL; - player->stateFlags1 &= ~PLAYER_STATE1_800; + player->stateFlags1 &= ~PLAYER_STATE1_CARRYING_ACTOR; return true; } @@ -3411,7 +3411,7 @@ void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList1, G temp_s1 = &heldActor->world.rot; Matrix_MtxFToYXZRot(&sp230, temp_s1, false); heldActor->shape.rot = *temp_s1; - } else if (player->stateFlags1 & PLAYER_STATE1_800) { + } else if (player->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR) { heldActor->world.rot.y = heldActor->shape.rot.y = player->actor.shape.rot.y + player->leftHandWorld.rot.y; } |