mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-15 20:35:13 +00:00
Code Issues Projects Releases Wiki Activity

PLAYER_STATE1_ACTOR_CARRY -> PLAYER_STATE1_CARRYING_ACTOR (#2213)

Browse source
This commit is contained in:
fig02 2024-09-21 18:25:19 -04:00 • committed by GitHub
parent 05b908d0eb
commit fcd5745d40
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 60 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/code/z_camera.c
View file

@ -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) {