From cc7b0ded08e3dc26fc970169a79c74c54e4f923b Mon Sep 17 00:00:00 2001
From: BobTheBob <32057864+BobTheBob9@users.noreply.github.com>
Date: Thu, 26 May 2022 03:16:46 +0100
Subject: lots of cleanup and starting moving to new hooking macros

---
 NorthstarDedicatedTest/convar.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'NorthstarDedicatedTest/convar.cpp')

diff --git a/NorthstarDedicatedTest/convar.cpp b/NorthstarDedicatedTest/convar.cpp
index df570da9..1b2e0679 100644
--- a/NorthstarDedicatedTest/convar.cpp
+++ b/NorthstarDedicatedTest/convar.cpp
@@ -1,9 +1,7 @@
 #include "pch.h"
-#include "hooks.h"
 #include "bits.h"
 #include "cvar.h"
 #include "convar.h"
-#include "hookutils.h"
 #include "sourceinterface.h"
 
 typedef void (*ConVarRegisterType)(
@@ -36,8 +34,8 @@ ON_DLL_LOAD("engine.dll", ConVar, [](HMODULE baseAddress)
 	g_pConVar_Vtable = (char*)baseAddress + 0x67FD28;
 	g_pIConVar_Vtable = (char*)baseAddress + 0x67FDC8;
 
-	g_pCVarInterface = new SourceInterface<CCvar>("vstdlib.dll", "VEngineCvar007");
-	g_pCVar = *g_pCVarInterface;
+	R2::g_pCVarInterface = new SourceInterface<CCvar>("vstdlib.dll", "VEngineCvar007");
+	R2::g_pCVar = *R2::g_pCVarInterface;
 })
 
 //-----------------------------------------------------------------------------
-- 
cgit v1.2.3