diff options
| author | fig02 <fig02srl@gmail.com> | 2024-09-14 16:42:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-14 16:42:28 -0400 |
| commit | 03a15027063f643ff238266745aabc707e650608 (patch) | |
| tree | d644f3533477babea7825adab277492d973de797 /src/code | |
| parent | 65cc42a71737e945fa8f7d3917aaae2efc474e0d (diff) | |
More Player Z Target documentation (#2196)
* document flag
* Player_FriendlyLockOnOrParallel
* quirk
* z target functions
* more comments
* more comment changes
* format
* comment change
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_player_lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index f52068507..e6d11311f 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -618,7 +618,7 @@ void func_8008EE08(Player* this) { (this->stateFlags1 & (PLAYER_STATE1_21 | PLAYER_STATE1_23 | PLAYER_STATE1_27)) || (!(this->stateFlags1 & (PLAYER_STATE1_18 | PLAYER_STATE1_19)) && ((this->actor.world.pos.y - this->actor.floorHeight) < 100.0f))) { - this->stateFlags1 &= ~(PLAYER_STATE1_Z_TARGETING | PLAYER_STATE1_16 | PLAYER_STATE1_PARALLEL | + this->stateFlags1 &= ~(PLAYER_STATE1_Z_TARGETING | PLAYER_STATE1_FRIENDLY_ACTOR_FOCUS | PLAYER_STATE1_PARALLEL | PLAYER_STATE1_18 | PLAYER_STATE1_19 | PLAYER_STATE1_LOCK_ON_FORCED_TO_RELEASE); } else if (!(this->stateFlags1 & (PLAYER_STATE1_18 | PLAYER_STATE1_19 | PLAYER_STATE1_21))) { this->stateFlags1 |= PLAYER_STATE1_19; @@ -633,7 +633,7 @@ void func_8008EEAC(PlayState* play, Actor* actor) { func_8008EE08(this); this->focusActor = actor; this->unk_684 = actor; - this->stateFlags1 |= PLAYER_STATE1_16; + this->stateFlags1 |= PLAYER_STATE1_FRIENDLY_ACTOR_FOCUS; Camera_SetViewParam(Play_GetCamera(play, CAM_ID_MAIN), CAM_VIEW_TARGET, actor); Camera_RequestMode(Play_GetCamera(play, CAM_ID_MAIN), CAM_MODE_Z_TARGET_FRIENDLY); } |