From 1144df0ea869221eccfa94f12967e4bece08521f Mon Sep 17 00:00:00 2001
From: Luke Street <luke.street@encounterpc.com>
Date: Sat, 27 Feb 2021 23:45:23 -0500
Subject: [PATCH] CTweakGame: Add CVar definitions in header

---
 DataSpec/DNAMP1/Tweaks/CTweakGame.cpp |  5 ++---
 DataSpec/DNAMP1/Tweaks/CTweakGame.hpp | 26 +++++++++++++++++++++++++-
 Runtime/Camera/CFirstPersonCamera.cpp |  6 +-----
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/DataSpec/DNAMP1/Tweaks/CTweakGame.cpp b/DataSpec/DNAMP1/Tweaks/CTweakGame.cpp
index 1204918f2..e4bf27155 100644
--- a/DataSpec/DNAMP1/Tweaks/CTweakGame.cpp
+++ b/DataSpec/DNAMP1/Tweaks/CTweakGame.cpp
@@ -35,8 +35,7 @@
   }
 
 namespace DataSpec::DNAMP1 {
-namespace {
-constexpr hecl::CVar::EFlags skDefaultFlags = hecl::CVar::EFlags::Game | hecl::CVar::EFlags::Archive;
+
 DEFINE_CVAR_GLOBAL(WorldPrefix);
 DEFINE_CVAR_GLOBAL(FieldOfView);
 DEFINE_CVAR_GLOBAL(SplashScreensDisabled);
@@ -54,7 +53,6 @@ DEFINE_CVAR_GLOBAL(GravityWaterFogDistanceBase);
 DEFINE_CVAR_GLOBAL(GravityWaterFogDistanceRange);
 DEFINE_CVAR_GLOBAL(HardModeDamageMult);
 DEFINE_CVAR_GLOBAL(HardModeWeaponMult);
-} // anonymous namespace
 
 void CTweakGame::_tweakListener(hecl::CVar* cv) {
   UPDATE_CVAR(WorldPrefix, cv, x4_worldPrefix);
@@ -77,6 +75,7 @@ void CTweakGame::_tweakListener(hecl::CVar* cv) {
 }
 
 void CTweakGame::initCVars(hecl::CVarManager* mgr) {
+  constexpr hecl::CVar::EFlags skDefaultFlags = hecl::CVar::EFlags::Game | hecl::CVar::EFlags::Archive;
   CREATE_CVAR(WorldPrefix, "", x4_worldPrefix, skDefaultFlags);
   CREATE_CVAR(FieldOfView, "", x24_fov, skDefaultFlags);
   CREATE_CVAR(SplashScreensDisabled, "", x2b_splashScreensDisabled,
diff --git a/DataSpec/DNAMP1/Tweaks/CTweakGame.hpp b/DataSpec/DNAMP1/Tweaks/CTweakGame.hpp
index 2b0ad0201..b0868b92f 100644
--- a/DataSpec/DNAMP1/Tweaks/CTweakGame.hpp
+++ b/DataSpec/DNAMP1/Tweaks/CTweakGame.hpp
@@ -4,10 +4,33 @@
 
 namespace hecl {
 class CVar;
-}
+} // namespace hecl
 
 namespace DataSpec::DNAMP1 {
 
+#define DEFINE_CVAR_GLOBAL(name)                                                                                       \
+  extern hecl::CVar* tw_##name;
+
+DEFINE_CVAR_GLOBAL(WorldPrefix);
+DEFINE_CVAR_GLOBAL(FieldOfView);
+DEFINE_CVAR_GLOBAL(SplashScreensDisabled);
+DEFINE_CVAR_GLOBAL(PressStartDelay);
+DEFINE_CVAR_GLOBAL(WavecapIntensityNormal);
+DEFINE_CVAR_GLOBAL(WavecapIntensityPoison);
+DEFINE_CVAR_GLOBAL(WavecapIntensityLava);
+DEFINE_CVAR_GLOBAL(RippleIntensityNormal);
+DEFINE_CVAR_GLOBAL(RippleIntensityPoison);
+DEFINE_CVAR_GLOBAL(RippleIntensityLava);
+DEFINE_CVAR_GLOBAL(FluidEnvBumpScale);
+DEFINE_CVAR_GLOBAL(WaterFogDistanceBase);
+DEFINE_CVAR_GLOBAL(WaterFogDistanceRange);
+DEFINE_CVAR_GLOBAL(GravityWaterFogDistanceBase);
+DEFINE_CVAR_GLOBAL(GravityWaterFogDistanceRange);
+DEFINE_CVAR_GLOBAL(HardModeDamageMult);
+DEFINE_CVAR_GLOBAL(HardModeWeaponMult);
+
+#undef DEFINE_CVAR_GLOBAL
+
 struct CTweakGame final : ITweakGame {
   AT_DECL_DNA_YAML
   String<-1> x4_worldPrefix;
@@ -60,6 +83,7 @@ struct CTweakGame final : ITweakGame {
   }
 
   void initCVars(hecl::CVarManager* mgr) override;
+
 private:
   void _tweakListener(hecl::CVar* cv);
 };
diff --git a/Runtime/Camera/CFirstPersonCamera.cpp b/Runtime/Camera/CFirstPersonCamera.cpp
index 9523e9c50..d8aabbd2b 100644
--- a/Runtime/Camera/CFirstPersonCamera.cpp
+++ b/Runtime/Camera/CFirstPersonCamera.cpp
@@ -8,10 +8,6 @@
 
 #include "TCastTo.hpp" // Generated file, do not modify include path
 
-namespace DataSpec::DNAMP1 {
-extern hecl::CVar* tw_fov;
-}
-
 namespace urde {
 
 CFirstPersonCamera::CFirstPersonCamera(TUniqueId uid, const zeus::CTransform& xf, TUniqueId watchedObj,
@@ -20,7 +16,7 @@ CFirstPersonCamera::CFirstPersonCamera(TUniqueId uid, const zeus::CTransform& xf
               nearz, farz, aspect, watchedObj, false, 0)
 , x188_orbitCameraSpeed(orbitCameraSpeed)
 , x190_gunFollowXf(xf) {
-  DataSpec::DNAMP1::tw_fov->addListener([this](hecl::CVar* cv) { _fovListener(cv); });
+  DataSpec::DNAMP1::tw_FieldOfView->addListener([this](hecl::CVar* cv) { _fovListener(cv); });
 }
 
 void CFirstPersonCamera::Accept(IVisitor& visitor) { visitor.Visit(this); }