diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2024-09-23 11:22:14 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-22 18:22:14 -0700 |
| commit | c83b4cf1079db85e0008dc62a617778c24e58bf8 (patch) | |
| tree | c75ebd8fcacf5349e8d84352980f65dc075f4b8d /src/code/z_actor.c | |
| parent | 24086dc67b76c6eb389fc9a67f6d9e61f3574e81 (diff) | |
Player: Document "WaitForPutAway" (#1694)
* import OoT docs
* cleanup
* carry actor
* more cleanup
* PLAYER_STATE1_CARRYING_ACTOR
Diffstat (limited to 'src/code/z_actor.c')
| -rw-r--r-- | src/code/z_actor.c | 8 |
1 files changed, 4 insertions, 4 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); |