From 179d19412b4f7e0bb0a1498a395a5d16d9055a3d Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Mon, 9 Mar 2020 20:45:01 -0400
Subject: [PATCH] CPlayerCameraBob: Make static non-const member variables
 private

Prevents accidental modification of the values from occurring in code
that makes use of them. Many of these constants aren't even used outside
of the class itself in the first place.
---
 Runtime/Weapon/CPlayerGun.cpp      |  5 ++---
 Runtime/World/CPlayer.cpp          | 21 ++++++++++-----------
 Runtime/World/CPlayerCameraBob.hpp |  8 +++++++-
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/Runtime/Weapon/CPlayerGun.cpp b/Runtime/Weapon/CPlayerGun.cpp
index e5116ae27..f4456b7af 100644
--- a/Runtime/Weapon/CPlayerGun.cpp
+++ b/Runtime/Weapon/CPlayerGun.cpp
@@ -29,9 +29,8 @@ float CPlayerGun::skTractorBeamFactor = 0.5f / CPlayerState::GetMissileComboChar
 CPlayerGun::CPlayerGun(TUniqueId playerId)
 : x0_lights(8, zeus::CVector3f{-30.f, 0.f, 30.f}, 4, 4, 0, 0, 0, 0.1f)
 , x538_playerId(playerId)
-, x550_camBob(CPlayerCameraBob::ECameraBobType::One,
-              zeus::CVector2f(CPlayerCameraBob::kCameraBobExtentX, CPlayerCameraBob::kCameraBobExtentY),
-              CPlayerCameraBob::kCameraBobPeriod)
+, x550_camBob(CPlayerCameraBob::ECameraBobType::One, CPlayerCameraBob::GetCameraBobExtent(),
+              CPlayerCameraBob::GetCameraBobPeriod())
 , x678_morph(g_tweakPlayerGun->GetGunTransformTime(), g_tweakPlayerGun->GetHoloHoldTime())
 , x6c8_hologramClipCube(zeus::CVector3f(-0.29329199f, 0.f, -0.2481945f),
                         zeus::CVector3f(0.29329199f, 1.292392f, 0.2481945f))
diff --git a/Runtime/World/CPlayer.cpp b/Runtime/World/CPlayer.cpp
index 45c053cd3..30a1e2990 100644
--- a/Runtime/World/CPlayer.cpp
+++ b/Runtime/World/CPlayer.cpp
@@ -225,10 +225,9 @@ CPlayer::CPlayer(TUniqueId uid, const zeus::CTransform& xf, const zeus::CAABox&
   x490_gun = std::make_unique<CPlayerGun>(uid);
   x49c_gunHolsterRemTime = g_tweakPlayerGun->GetGunNotFiringTime();
   x4a0_failsafeTest = std::make_unique<CFailsafeTest>();
-  x76c_cameraBob.reset(
-      new CPlayerCameraBob(CPlayerCameraBob::ECameraBobType::One,
-                           zeus::CVector2f{CPlayerCameraBob::kCameraBobExtentX, CPlayerCameraBob::kCameraBobExtentY},
-                           CPlayerCameraBob::kCameraBobPeriod));
+  x76c_cameraBob.reset(new CPlayerCameraBob(CPlayerCameraBob::ECameraBobType::One,
+                                            CPlayerCameraBob::GetCameraBobExtent(),
+                                            CPlayerCameraBob::GetCameraBobPeriod()));
   x9c4_26_ = true;
   x9c4_27_canEnterMorphBall = true;
   x9c4_28_canLeaveMorphBall = true;
@@ -722,8 +721,8 @@ float CPlayer::UpdateCameraBob(float dt, CStateManager& mgr) {
     const float strafeDist =
         skStrafeDistances[size_t(x2b0_outOfWaterTicks == 2 ? x2ac_surfaceRestraint : ESurfaceRestraints::Water)];
     bobMag = std::min(std::sqrt(f30 * f30 + f29 * f29) / std::sqrt(strafeDist * strafeDist + maxVel * maxVel) *
-                          CPlayerCameraBob::kOrbitBobScale,
-                      CPlayerCameraBob::kMaxOrbitBobScale);
+                          CPlayerCameraBob::GetOrbitBobScale(),
+                      CPlayerCameraBob::GetMaxOrbitBobScale());
     if (bobMag < 0.01f)
       bobMag = 0.f;
   }
@@ -770,8 +769,8 @@ float CPlayer::UpdateCameraBob(float dt, CStateManager& mgr) {
   x76c_cameraBob->SetPlayerVelocity(backupVel);
   x76c_cameraBob->SetState(state, mgr);
   x76c_cameraBob->SetBobMagnitude(bobMag);
-  x76c_cameraBob->SetBobTimeScale((1.f - CPlayerCameraBob::kSlowSpeedPeriodScale) * bobMag +
-                                  CPlayerCameraBob::kSlowSpeedPeriodScale);
+  x76c_cameraBob->SetBobTimeScale((1.f - CPlayerCameraBob::GetSlowSpeedPeriodScale()) * bobMag +
+                                  CPlayerCameraBob::GetSlowSpeedPeriodScale());
   x76c_cameraBob->Update(dt, mgr);
 
   return bobMag;
@@ -799,9 +798,9 @@ void CPlayer::PostUpdate(float dt, CStateManager& mgr) {
 
   float cameraBobT = 0.f;
   if (mgr.GetCameraManager()->IsInCinematicCamera()) {
-    const zeus::CVector2f bobExtent(CPlayerCameraBob::kCameraBobExtentX, CPlayerCameraBob::kCameraBobExtentY);
-    x76c_cameraBob = std::make_unique<CPlayerCameraBob>(CPlayerCameraBob::ECameraBobType::One, bobExtent,
-                                                        CPlayerCameraBob::kCameraBobPeriod);
+    x76c_cameraBob = std::make_unique<CPlayerCameraBob>(CPlayerCameraBob::ECameraBobType::One,
+                                                        CPlayerCameraBob::GetCameraBobExtent(),
+                                                        CPlayerCameraBob::GetCameraBobPeriod());
   } else {
     cameraBobT = UpdateCameraBob(dt, mgr);
   }
diff --git a/Runtime/World/CPlayerCameraBob.hpp b/Runtime/World/CPlayerCameraBob.hpp
index b0d3a1404..e8561594e 100644
--- a/Runtime/World/CPlayerCameraBob.hpp
+++ b/Runtime/World/CPlayerCameraBob.hpp
@@ -27,6 +27,13 @@ public:
     Unspecified
   };
 
+  static zeus::CVector2f GetCameraBobExtent() { return {kCameraBobExtentX, kCameraBobExtentY}; }
+  static float GetCameraBobPeriod() { return kCameraBobPeriod; }
+  static float GetOrbitBobScale() { return kOrbitBobScale; }
+  static float GetMaxOrbitBobScale() { return kMaxOrbitBobScale; }
+  static float GetSlowSpeedPeriodScale() { return kSlowSpeedPeriodScale; }
+
+private:
   static float kCameraBobExtentX;
   static float kCameraBobExtentY;
   static float kCameraBobPeriod;
@@ -46,7 +53,6 @@ public:
   static const float kLandingBobDamping2;
   static const float kCameraDamping;
 
-private:
   ECameraBobType x0_type;
   zeus::CVector2f x4_vec;
   float xc_bobPeriod;