From b33c8794a05cec435f9f54ed4dd5655d9bda2b7a Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Tue, 31 Jan 2023 17:21:16 +0100
Subject: [PATCH] Reorder registration order

Slight reorder, removed 'VStudioRenderContext' from dedicated.
---
 r5dev/core/init.cpp                   | 20 ++++++++++----------
 r5dev/game/client/viewrender.h        |  2 +-
 r5dev/vproj/dedicated.vcxproj         |  1 -
 r5dev/vproj/dedicated.vcxproj.filters |  6 ------
 4 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/r5dev/core/init.cpp b/r5dev/core/init.cpp
index 20351b89..56cc0f7a 100644
--- a/r5dev/core/init.cpp
+++ b/r5dev/core/init.cpp
@@ -440,6 +440,9 @@ void DetourRegister() // Register detour classes to be searched and hooked.
 	REGISTER(VMaterialGlue);
 	REGISTER(VShaderGlue);
 
+	// Studio
+	REGISTER(VStudioRenderContext);
+
 	// VGui
 	REGISTER(VEngineVGui); // REGISTER CLIENT ONLY!
 	REGISTER(VFPSPanel); // REGISTER CLIENT ONLY!
@@ -460,6 +463,13 @@ void DetourRegister() // Register detour classes to be searched and hooked.
 
 #endif // !CLIENT_DLL
 
+	// Engine/client
+	REGISTER(VClient);
+#ifndef DEDICATED
+	REGISTER(VClientState);
+	REGISTER(VCL_Main);
+#endif // !DEDICATED
+
 	// Squirrel
 	REGISTER(VSqInit);
 	REGISTER(VSqapi);
@@ -467,9 +477,6 @@ void DetourRegister() // Register detour classes to be searched and hooked.
 	REGISTER(VSquirrelVM);
 	REGISTER(VSqStdAux);
 
-	// Studio
-	REGISTER(VStudioRenderContext);
-
 	// RTech
 	REGISTER(V_RTechGame);
 	REGISTER(V_RTechUtils);
@@ -480,13 +487,6 @@ void DetourRegister() // Register detour classes to be searched and hooked.
 	REGISTER(V_CL_Ents_Parse); // REGISTER CLIENT ONLY!
 #endif // !DEDICATED
 
-	// Engine/client
-	REGISTER(VClient);
-#ifndef DEDICATED
-	REGISTER(VClientState);
-	REGISTER(VCL_Main);
-#endif // !DEDICATED
-
 	// Engine
 	REGISTER(VTraceInit);
 	REGISTER(VCommon);
diff --git a/r5dev/game/client/viewrender.h b/r5dev/game/client/viewrender.h
index 93da79e7..edebcaec 100644
--- a/r5dev/game/client/viewrender.h
+++ b/r5dev/game/client/viewrender.h
@@ -31,7 +31,7 @@ class V_ViewRender : public IDetour
 	{
 		LogConAdr("CViewRender::`vftable'", g_pViewRender_VFTable.GetPtr());
 		LogFunAdr("CViewRender::GetWorldMatrixForView", p_CViewRender_GetWorldMatrixForView.GetPtr());
-		LogVarAdr("g_pViewRender", reinterpret_cast<uintptr_t>(g_pViewRender));
+		LogVarAdr("g_ViewRender", reinterpret_cast<uintptr_t>(g_pViewRender));
 		LogVarAdr("g_vecRenderOrigin", reinterpret_cast<uintptr_t>(g_vecRenderOrigin));
 		LogVarAdr("g_vecRenderAngles", reinterpret_cast<uintptr_t>(g_vecRenderAngles));
 	}
diff --git a/r5dev/vproj/dedicated.vcxproj b/r5dev/vproj/dedicated.vcxproj
index 9e3a170e..f08d9f5e 100644
--- a/r5dev/vproj/dedicated.vcxproj
+++ b/r5dev/vproj/dedicated.vcxproj
@@ -299,7 +299,6 @@
     <ClInclude Include="..\squirrel\sqstdaux.h" />
     <ClInclude Include="..\squirrel\sqtype.h" />
     <ClInclude Include="..\squirrel\sqvm.h" />
-    <ClInclude Include="..\studiorender\studiorendercontext.h" />
     <ClInclude Include="..\thirdparty\detours\include\detours.h" />
     <ClInclude Include="..\thirdparty\detours\include\detver.h" />
     <ClInclude Include="..\thirdparty\detours\include\idetour.h" />
diff --git a/r5dev/vproj/dedicated.vcxproj.filters b/r5dev/vproj/dedicated.vcxproj.filters
index 57421e21..df44a92c 100644
--- a/r5dev/vproj/dedicated.vcxproj.filters
+++ b/r5dev/vproj/dedicated.vcxproj.filters
@@ -100,9 +100,6 @@
     <Filter Include="thirdparty\protobuf">
       <UniqueIdentifier>{9d1e327b-f385-4d84-82e0-918bc0bde704}</UniqueIdentifier>
     </Filter>
-    <Filter Include="sdk\studiorender">
-      <UniqueIdentifier>{4b7a81d6-0d85-4804-b2d7-88fe28a45844}</UniqueIdentifier>
-    </Filter>
     <Filter Include="sdk\game">
       <UniqueIdentifier>{3e25ba44-6480-463a-8380-0709bf885bc8}</UniqueIdentifier>
     </Filter>
@@ -666,9 +663,6 @@
     <ClInclude Include="..\client\cdll_engine_int.h">
       <Filter>sdk\client</Filter>
     </ClInclude>
-    <ClInclude Include="..\studiorender\studiorendercontext.h">
-      <Filter>sdk\studiorender</Filter>
-    </ClInclude>
     <ClInclude Include="..\game\server\fairfight_impl.h">
       <Filter>sdk\game\server</Filter>
     </ClInclude>