From 07ef57536d8b026676e4151d361e6ad18acfa5e4 Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Sun, 22 Jan 2023 16:48:16 +0100
Subject: [PATCH] Add modelinfo vftable pointers

---
 r5dev/engine/modelinfo.cpp            | 17 +++++++
 r5dev/engine/modelinfo.h              | 71 +++++++++++++++++++++++++++
 r5dev/game/shared/animation.h         |  1 +
 r5dev/public/engine/IVModelInfo.h     | 29 +++++++++++
 r5dev/vproj/clientsdk.vcxproj         |  3 ++
 r5dev/vproj/clientsdk.vcxproj.filters |  9 ++++
 r5dev/vproj/dedicated.vcxproj         |  4 ++
 r5dev/vproj/dedicated.vcxproj.filters | 12 +++++
 r5dev/vproj/gamesdk.vcxproj           |  4 ++
 r5dev/vproj/gamesdk.vcxproj.filters   | 12 +++++
 10 files changed, 162 insertions(+)
 create mode 100644 r5dev/engine/modelinfo.cpp
 create mode 100644 r5dev/engine/modelinfo.h
 create mode 100644 r5dev/public/engine/IVModelInfo.h

diff --git a/r5dev/engine/modelinfo.cpp b/r5dev/engine/modelinfo.cpp
new file mode 100644
index 00000000..e60bb23f
--- /dev/null
+++ b/r5dev/engine/modelinfo.cpp
@@ -0,0 +1,17 @@
+//===== Copyright (c) 1996-2005, Valve Corporation, All rights reserved. =====//
+//
+// Purpose: 
+//
+// $Workfile:     $
+// $NoKeywords: $
+//===========================================================================//
+#include "core/stdafx.h"
+#include "modelinfo.h"
+
+#ifndef CLIENT_DLL
+CModelInfoServer* g_pModelInfoServer = nullptr;
+#endif // CLIENT_DLL
+
+#ifndef DEDICATED
+CModelInfoClient* g_pModelInfoClient = nullptr;
+#endif // DEDICATED
diff --git a/r5dev/engine/modelinfo.h b/r5dev/engine/modelinfo.h
new file mode 100644
index 00000000..b111c3de
--- /dev/null
+++ b/r5dev/engine/modelinfo.h
@@ -0,0 +1,71 @@
+//===== Copyright (c) 1996-2005, Valve Corporation, All rights reserved. =====//
+//
+// Purpose: 
+//
+// $Workfile:     $
+// $NoKeywords: $
+//===========================================================================//
+#ifndef ENGINE_MODELINFO_H
+#define ENGINE_MODELINFO_H
+#include "public/engine/IVModelInfo.h"
+
+//-----------------------------------------------------------------------------
+// shared implementation of IVModelInfo
+//-----------------------------------------------------------------------------
+class CModelInfo : public IVModelInfoClient
+{};
+
+#ifndef CLIENT_DLL
+//-----------------------------------------------------------------------------
+// implementation of IVModelInfo for server
+//-----------------------------------------------------------------------------
+class CModelInfoServer : public CModelInfo
+{};
+extern CModelInfoServer* g_pModelInfoServer;
+inline CModelInfoServer* g_pModelInfoServer_VFTable;
+#endif // CLIENT_DLL
+
+#ifndef DEDICATED
+//-----------------------------------------------------------------------------
+// implementation of IVModelInfo for client
+//-----------------------------------------------------------------------------
+class CModelInfoClient : public CModelInfo
+{};
+extern CModelInfoClient* g_pModelInfoClient;
+inline CModelInfoClient* g_pModelInfoClient_VFTable;
+#endif // DEDICATED
+
+///////////////////////////////////////////////////////////////////////////////
+class VModelInfo : public IDetour
+{
+	virtual void GetAdr(void) const
+	{
+#ifndef CLIENT_DLL
+		spdlog::debug("| FUN: g_pModelInfoServer                   : {:#18x} |\n", reinterpret_cast<uintptr_t>(g_pModelInfoServer));
+#endif // CLIENT_DLL
+#ifndef DEDICATED
+		spdlog::debug("| FUN: g_pModelInfoClient                   : {:#18x} |\n", reinterpret_cast<uintptr_t>(g_pModelInfoClient));
+#endif // DEDICATED
+		spdlog::debug("+----------------------------------------------------------------+\n");
+	}
+	virtual void GetFun(void) const { }
+	virtual void GetVar(void) const
+	{
+#ifndef CLIENT_DLL
+		g_pModelInfoServer_VFTable = g_GameDll.GetVirtualMethodTable(".?AVCModelInfoServer@@").RCast<CModelInfoServer*>();
+		g_pModelInfoServer = reinterpret_cast<CModelInfoServer*>(&g_pModelInfoServer_VFTable);
+#endif // CLIENT_DLL
+#ifndef DEDICATED
+		g_pModelInfoClient_VFTable = g_GameDll.GetVirtualMethodTable(".?AVCModelInfoClient@@").RCast<CModelInfoClient*>();
+		g_pModelInfoClient = reinterpret_cast<CModelInfoClient*>(&g_pModelInfoClient_VFTable);
+#endif // DEDICATED
+	}
+	virtual void GetCon(void) const { }
+	virtual void Attach(void) const { }
+	virtual void Detach(void) const { }
+};
+///////////////////////////////////////////////////////////////////////////////
+
+REGISTER(VModelInfo);
+
+#endif // ENGINE_MODELINFO_H
diff --git a/r5dev/game/shared/animation.h b/r5dev/game/shared/animation.h
index 249bbc9e..957e1c79 100644
--- a/r5dev/game/shared/animation.h
+++ b/r5dev/game/shared/animation.h
@@ -2,6 +2,7 @@
 #define ANIMATION_H
 #include "mathlib/vector.h"
 #include "public/baseentity.h"
+#include "public/studio.h"
 
 class CAnimationLayer
 {
diff --git a/r5dev/public/engine/IVModelInfo.h b/r5dev/public/engine/IVModelInfo.h
new file mode 100644
index 00000000..0b340de3
--- /dev/null
+++ b/r5dev/public/engine/IVModelInfo.h
@@ -0,0 +1,29 @@
+//===== Copyright � 1996-2005, Valve Corporation, All rights reserved. ======//
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//===========================================================================//
+
+#ifndef IVMODELINFO_H
+#define IVMODELINFO_H
+
+#ifdef _WIN32
+#pragma once
+#endif
+
+struct model_t;
+
+class IVModelInfo
+{
+public:
+	virtual							~IVModelInfo(void) { }
+	virtual const model_t* GetModel(int modelindex) const = 0;
+
+	// !TODO: The rest if it ever becomes necessary.
+};
+
+class IVModelInfoClient : public IVModelInfo
+{};
+
+#endif // IVMODELINFO_H
diff --git a/r5dev/vproj/clientsdk.vcxproj b/r5dev/vproj/clientsdk.vcxproj
index 43b4c041..2ca84384 100644
--- a/r5dev/vproj/clientsdk.vcxproj
+++ b/r5dev/vproj/clientsdk.vcxproj
@@ -44,6 +44,7 @@
     <ClCompile Include="..\engine\host_cmd.cpp" />
     <ClCompile Include="..\engine\host_state.cpp" />
     <ClCompile Include="..\engine\matsys_interface.cpp" />
+    <ClCompile Include="..\engine\modelinfo.cpp" />
     <ClCompile Include="..\engine\modelloader.cpp" />
     <ClCompile Include="..\engine\net.cpp" />
     <ClCompile Include="..\engine\networkstringtable.cpp" />
@@ -212,6 +213,7 @@
     <ClInclude Include="..\engine\host_cmd.h" />
     <ClInclude Include="..\engine\host_state.h" />
     <ClInclude Include="..\engine\matsys_interface.h" />
+    <ClInclude Include="..\engine\modelinfo.h" />
     <ClInclude Include="..\engine\modelloader.h" />
     <ClInclude Include="..\engine\net.h" />
     <ClInclude Include="..\engine\networkstringtable.h" />
@@ -297,6 +299,7 @@
     <ClInclude Include="..\public\eiface.h" />
     <ClInclude Include="..\public\engine\ICollideable.h" />
     <ClInclude Include="..\public\engine\IEngineTrace.h" />
+    <ClInclude Include="..\public\engine\IVModelInfo.h" />
     <ClInclude Include="..\public\gametrace.h" />
     <ClInclude Include="..\public\iengine.h" />
     <ClInclude Include="..\public\client_class.h" />
diff --git a/r5dev/vproj/clientsdk.vcxproj.filters b/r5dev/vproj/clientsdk.vcxproj.filters
index f060bd5e..6d2179a4 100644
--- a/r5dev/vproj/clientsdk.vcxproj.filters
+++ b/r5dev/vproj/clientsdk.vcxproj.filters
@@ -666,6 +666,9 @@
     <ClCompile Include="..\game\shared\util_shared.cpp">
       <Filter>sdk\game\shared</Filter>
     </ClCompile>
+    <ClCompile Include="..\engine\modelinfo.cpp">
+      <Filter>sdk\engine</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\client\cdll_engine_int.h">
@@ -1967,6 +1970,12 @@
     <ClInclude Include="..\public\bspflags.h">
       <Filter>sdk\public</Filter>
     </ClInclude>
+    <ClInclude Include="..\public\engine\IVModelInfo.h">
+      <Filter>sdk\public\engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\engine\modelinfo.h">
+      <Filter>sdk\engine</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="..\shared\resource\lockedserver.png">
diff --git a/r5dev/vproj/dedicated.vcxproj b/r5dev/vproj/dedicated.vcxproj
index 551fe8a7..cd48fa43 100644
--- a/r5dev/vproj/dedicated.vcxproj
+++ b/r5dev/vproj/dedicated.vcxproj
@@ -158,6 +158,7 @@
     <ClInclude Include="..\engine\host.h" />
     <ClInclude Include="..\engine\host_cmd.h" />
     <ClInclude Include="..\engine\host_state.h" />
+    <ClInclude Include="..\engine\modelinfo.h" />
     <ClInclude Include="..\engine\modelloader.h" />
     <ClInclude Include="..\engine\net.h" />
     <ClInclude Include="..\engine\networkstringtable.h" />
@@ -247,6 +248,7 @@
     <ClInclude Include="..\public\eiface.h" />
     <ClInclude Include="..\public\engine\ICollideable.h" />
     <ClInclude Include="..\public\engine\IEngineTrace.h" />
+    <ClInclude Include="..\public\engine\IVModelInfo.h" />
     <ClInclude Include="..\public\gametrace.h" />
     <ClInclude Include="..\public\iengine.h" />
     <ClInclude Include="..\public\client_class.h" />
@@ -543,6 +545,7 @@
     <ClCompile Include="..\engine\host.cpp" />
     <ClCompile Include="..\engine\host_cmd.cpp" />
     <ClCompile Include="..\engine\host_state.cpp" />
+    <ClCompile Include="..\engine\modelinfo.cpp" />
     <ClCompile Include="..\engine\modelloader.cpp" />
     <ClCompile Include="..\engine\net.cpp" />
     <ClCompile Include="..\engine\networkstringtable.cpp" />
@@ -560,6 +563,7 @@
     <ClCompile Include="..\game\server\ai_network.cpp" />
     <ClCompile Include="..\game\server\ai_networkmanager.cpp" />
     <ClCompile Include="..\game\server\ai_utility.cpp" />
+    <ClCompile Include="..\game\server\baseanimating.cpp" />
     <ClCompile Include="..\game\server\gameinterface.cpp" />
     <ClCompile Include="..\game\server\movehelper_server.cpp" />
     <ClCompile Include="..\game\server\networkproperty.cpp" />
diff --git a/r5dev/vproj/dedicated.vcxproj.filters b/r5dev/vproj/dedicated.vcxproj.filters
index e7d5ce05..92e11910 100644
--- a/r5dev/vproj/dedicated.vcxproj.filters
+++ b/r5dev/vproj/dedicated.vcxproj.filters
@@ -1392,6 +1392,12 @@
     <ClInclude Include="..\public\bspflags.h">
       <Filter>sdk\public</Filter>
     </ClInclude>
+    <ClInclude Include="..\public\engine\IVModelInfo.h">
+      <Filter>sdk\public\engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\engine\modelinfo.h">
+      <Filter>sdk\engine</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\common\opcodes.cpp">
@@ -1757,6 +1763,12 @@
     <ClCompile Include="..\game\shared\util_shared.cpp">
       <Filter>sdk\game\shared</Filter>
     </ClCompile>
+    <ClCompile Include="..\game\server\baseanimating.cpp">
+      <Filter>sdk\game\server</Filter>
+    </ClCompile>
+    <ClCompile Include="..\engine\modelinfo.cpp">
+      <Filter>sdk\engine</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\Dedicated.def" />
diff --git a/r5dev/vproj/gamesdk.vcxproj b/r5dev/vproj/gamesdk.vcxproj
index 4db90316..44f20077 100644
--- a/r5dev/vproj/gamesdk.vcxproj
+++ b/r5dev/vproj/gamesdk.vcxproj
@@ -45,6 +45,7 @@
     <ClCompile Include="..\engine\host_cmd.cpp" />
     <ClCompile Include="..\engine\host_state.cpp" />
     <ClCompile Include="..\engine\matsys_interface.cpp" />
+    <ClCompile Include="..\engine\modelinfo.cpp" />
     <ClCompile Include="..\engine\modelloader.cpp" />
     <ClCompile Include="..\engine\net.cpp" />
     <ClCompile Include="..\engine\networkstringtable.cpp" />
@@ -69,6 +70,7 @@
     <ClCompile Include="..\game\server\ai_network.cpp" />
     <ClCompile Include="..\game\server\ai_networkmanager.cpp" />
     <ClCompile Include="..\game\server\ai_utility.cpp" />
+    <ClCompile Include="..\game\server\baseanimating.cpp" />
     <ClCompile Include="..\game\server\gameinterface.cpp" />
     <ClCompile Include="..\game\server\movehelper_server.cpp" />
     <ClCompile Include="..\game\server\networkproperty.cpp" />
@@ -230,6 +232,7 @@
     <ClInclude Include="..\engine\host_cmd.h" />
     <ClInclude Include="..\engine\host_state.h" />
     <ClInclude Include="..\engine\matsys_interface.h" />
+    <ClInclude Include="..\engine\modelinfo.h" />
     <ClInclude Include="..\engine\modelloader.h" />
     <ClInclude Include="..\engine\net.h" />
     <ClInclude Include="..\engine\networkstringtable.h" />
@@ -339,6 +342,7 @@
     <ClInclude Include="..\public\eiface.h" />
     <ClInclude Include="..\public\engine\ICollideable.h" />
     <ClInclude Include="..\public\engine\IEngineTrace.h" />
+    <ClInclude Include="..\public\engine\IVModelInfo.h" />
     <ClInclude Include="..\public\gametrace.h" />
     <ClInclude Include="..\public\iengine.h" />
     <ClInclude Include="..\public\client_class.h" />
diff --git a/r5dev/vproj/gamesdk.vcxproj.filters b/r5dev/vproj/gamesdk.vcxproj.filters
index 9c051bb5..eb7a8c8f 100644
--- a/r5dev/vproj/gamesdk.vcxproj.filters
+++ b/r5dev/vproj/gamesdk.vcxproj.filters
@@ -723,6 +723,12 @@
     <ClCompile Include="..\game\shared\util_shared.cpp">
       <Filter>sdk\game\shared</Filter>
     </ClCompile>
+    <ClCompile Include="..\game\server\baseanimating.cpp">
+      <Filter>sdk\game\server</Filter>
+    </ClCompile>
+    <ClCompile Include="..\engine\modelinfo.cpp">
+      <Filter>sdk\engine</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\client\cdll_engine_int.h">
@@ -2123,6 +2129,12 @@
     <ClInclude Include="..\public\bspflags.h">
       <Filter>sdk\public</Filter>
     </ClInclude>
+    <ClInclude Include="..\public\engine\IVModelInfo.h">
+      <Filter>sdk\public\engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\engine\modelinfo.h">
+      <Filter>sdk\engine</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="..\shared\resource\lockedserver.png">