mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-22 08:08:53 -05:00
Code Issues Projects Releases Wiki Activity

Fix camera mode not following boomerang with first person rang (#4716)

Browse Source
This commit is contained in:
Archez 2024-12-18 17:54:55 -05:00 committed by GitHub
parent 380d4c66f8
commit fd8bd31507
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
soh/src/overlays/actors/ovl_player_actor/z_player.c
View File

@ -11496,13 +11496,7 @@ void Player_UpdateCamAndSeqModes(PlayState* play, Player* this) {
camMode = CAM_MODE_TALK; camMode = CAM_MODE_TALK;
} else if (this->stateFlags1 & PLAYER_STATE1_FRIENDLY_ACTOR_FOCUS) { } else if (this->stateFlags1 & PLAYER_STATE1_FRIENDLY_ACTOR_FOCUS) {
if (this->stateFlags1 & PLAYER_STATE1_BOOMERANG_THROWN) { if (this->stateFlags1 & PLAYER_STATE1_BOOMERANG_THROWN) {
// #region SOH [Enhancement]
if (CVarGetInteger(CVAR_ENHANCEMENT("BoomerangFirstPerson"), 0)) {
camMode = CAM_MODE_TARGET;
// #endregion
} else {
camMode = CAM_MODE_FOLLOWBOOMERANG; camMode = CAM_MODE_FOLLOWBOOMERANG;
}
} else { } else {
camMode = CAM_MODE_FOLLOWTARGET; camMode = CAM_MODE_FOLLOWTARGET;
} }
@ -11515,7 +11509,13 @@ void Player_UpdateCamAndSeqModes(PlayState* play, Player* this) {
} else if (this->stateFlags1 & PLAYER_STATE1_BOOMERANG_THROWN) { } else if (this->stateFlags1 & PLAYER_STATE1_BOOMERANG_THROWN) {
// #region SOH [Enhancement] // #region SOH [Enhancement]
if (CVarGetInteger(CVAR_ENHANCEMENT("BoomerangFirstPerson"), 0)) { if (CVarGetInteger(CVAR_ENHANCEMENT("BoomerangFirstPerson"), 0)) {
camMode = CAM_MODE_TARGET; // Avoid camera jumps by switching to normal cam to exit the first person camera,
// before following the boomerang
if (Play_GetCamera(play, 0)->mode == CAM_MODE_FIRSTPERSON) {
camMode = CAM_MODE_NORMAL;
} else {
camMode = CAM_MODE_FOLLOWBOOMERANG;
}
// #endregion // #endregion
} else { } else {
camMode = CAM_MODE_FOLLOWBOOMERANG; camMode = CAM_MODE_FOLLOWBOOMERANG;