Update for CVAR changes

A-Green-Spoon · May 1, 2024 · 810ceda · 810ceda
1 parent 7da90f6
commit 810ceda
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/soh/src/code/z_player_lib.c b/soh/src/code/z_player_lib.c
@@ -1947,7 +1947,7 @@ void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList, Ve
                         Player_DrawHookshotReticle(play, this, RETICLE_MAX);
                     }
                 }
-            } else if (CVarGetInteger("gBoomerangReticle", 0) && (this->heldItemAction == PLAYER_IA_BOOMERANG)) {
+            } else if (CVarGetInteger(CVAR_ENHANCEMENT("BoomerangReticle"), 0) && (this->heldItemAction == PLAYER_IA_BOOMERANG)) {
                 if (Player_HoldsBoomerang(this) != 0) {
                     MtxF sp44;
                     s32 pad;

diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c
@@ -2978,7 +2978,7 @@ s32 func_808358F0(Player* this, PlayState* play) {
                                     this->skelAnime.jointTable);
     } else {
         // #region SOH [Enhancement]
-        if (CVarGetInteger("gBoomerangReticle", 0) == 1) {
+        if (CVarGetInteger(CVAR_ENHANCEMENT("BoomerangReticle"), 0) == 1) {
             // don't play animation
         // #endregion
         }
@@ -5369,7 +5369,7 @@ s32 func_8083AD4C(PlayState* play, Player* this) {
             cameraMode = shouldUseBowCamera ? CAM_MODE_BOWARROW : CAM_MODE_SLINGSHOT;
         } else {
             // #region SOH [Enhancement]
-            if (CVarGetInteger("gBoomerangFirstPerson", 0)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("BoomerangFirstPerson"), 0)) {
                 cameraMode = CAM_MODE_FIRSTPERSON;
             // #endregion
             } else {
@@ -10875,7 +10875,7 @@ void Player_UpdateCamAndSeqModes(PlayState* play, Player* this) {
                 } else if (this->stateFlags1 & PLAYER_STATE1_TARGET_LOCKED) {
                     if (this->stateFlags1 & PLAYER_STATE1_THREW_BOOMERANG) {
                         // #region SOH [Enhancement]
-                        if (CVarGetInteger("gBoomerangFirstPerson", 0) == 1) {
+                        if (CVarGetInteger(CVAR_ENHANCEMENT("BoomerangFirstPerson"), 0) == 1) {
                             camMode = CAM_MODE_TARGET;
                         // #endregion
                         } else {
@@ -10892,7 +10892,7 @@ void Player_UpdateCamAndSeqModes(PlayState* play, Player* this) {
                 camMode = CAM_MODE_CHARGE;
             } else if (this->stateFlags1 & PLAYER_STATE1_THREW_BOOMERANG) {
                 // #region SOH [Enhancement]
-                if (CVarGetInteger("gBoomerangFirstPerson", 0)) {
+                if (CVarGetInteger(CVAR_ENHANCEMENT("BoomerangFirstPerson"), 0)) {
                     camMode = CAM_MODE_TARGET;
                     Camera_SetParam(Play_GetCamera(play, 0), 8, this->boomerangActor);
                 // #endregion