From 705813599c35a62de64a7ad99ea3437d52d7d874 Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Tue, 30 Jul 2024 01:52:03 +0200
Subject: [PATCH] Game: move interface version identifiers to interface file

Small cleanup and deduplication.
---
 src/public/eiface.h              | 7 +++++++
 src/public/engine/IEngineTrace.h | 2 ++
 src/public/icliententitylist.h   | 1 +
 src/vpc/interfaces.h             | 7 -------
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/public/eiface.h b/src/public/eiface.h
index d6b9222d..e3a43019 100644
--- a/src/public/eiface.h
+++ b/src/public/eiface.h
@@ -35,6 +35,9 @@ public:
 	virtual void ClientFullyConnect(edict_t nEntity, bool bRestore) = 0;
 };
 
+#define INTERFACEVERSION_SERVERGAMECLIENTS_NEW    "ServerGameClients004"
+#define INTERFACEVERSION_SERVERGAMECLIENTS        "ServerGameClients003"
+
 //-----------------------------------------------------------------------------
 // Purpose: Interface to get at server entities
 //-----------------------------------------------------------------------------
@@ -45,6 +48,8 @@ public:
 	// !TODO
 };
 
+#define INTERFACEVERSION_SERVERGAMEENTS           "ServerGameEnts002"
+
 //-----------------------------------------------------------------------------
 // Purpose: Interface the engine exposes to the game DLL
 //-----------------------------------------------------------------------------
@@ -166,4 +171,6 @@ public:
 	// !TODO: the rest..
 };
 
+#define INTERFACEVERSION_SERVERGAMEDLL             "ServerGameDLL005"
+
 #endif // EIFACE_H
diff --git a/src/public/engine/IEngineTrace.h b/src/public/engine/IEngineTrace.h
index ffd55747..10e4c5d9 100644
--- a/src/public/engine/IEngineTrace.h
+++ b/src/public/engine/IEngineTrace.h
@@ -60,5 +60,7 @@ public:
 	virtual void TraceRay(const Ray_t& ray, unsigned int fMask, trace_t* pTrace) = 0;
 };
 
+#define INTERFACEVERSION_ENGINETRACE_SERVER	"EngineTraceServer004"
+#define INTERFACEVERSION_ENGINETRACE_CLIENT	"EngineTraceClient004"
 
 #endif // ENGINE_IENGINETRACE_H
diff --git a/src/public/icliententitylist.h b/src/public/icliententitylist.h
index e241622b..2d1198db 100644
--- a/src/public/icliententitylist.h
+++ b/src/public/icliententitylist.h
@@ -37,3 +37,4 @@ public:
 	virtual int                 GetMaxEntities() = 0;
 };
 
+#define VCLIENTENTITYLIST_INTERFACE_VERSION "VClientEntityList003"
diff --git a/src/vpc/interfaces.h b/src/vpc/interfaces.h
index 92f0e281..cdd79bca 100644
--- a/src/vpc/interfaces.h
+++ b/src/vpc/interfaces.h
@@ -15,16 +15,10 @@
 #define MATERIALSYSTEM_CONFIG_VERSION             "VMaterialSystemConfig004"
 
 #define SERVER_DLL_SHARED_APPSYSTEMS              "VServerDllSharedAppSystems001"
-#define INTERFACEVERSION_SERVERGAMECLIENTS_NEW    "ServerGameClients004"
-#define INTERFACEVERSION_SERVERGAMECLIENTS        "ServerGameClients003"
-#define INTERFACEVERSION_SERVERGAMEENTS           "ServerGameEnts002"
-#define INTERFACEVERSION_SERVERGAMEDLL            "ServerGameDLL005"
 
 #define VCLIENT_PREDICTION_INTERFACE_VERSION      "VClientPrediction001"
-#define VCLIENTENTITYLIST_INTERFACE_VERSION       "VClientEntityList003"
 #define CLIENT_DLL_INTERFACE_VERSION              "VClient018"
 #define CLIENTRENDERTARGETS_INTERFACE_VERSION     "ClientRenderTargets001"
-#define INTERFACEVERSION_ENGINETRACE_CLIENT       "EngineTraceClient004"
 #define INTERFACEVERSION_ENGINETRACEDECALS_CLIENT "EngineTraceClientDecals004"
 
 #define VGUI_SYSTEM_INTERFACE_VERSION             "VGUI_System010"
@@ -33,7 +27,6 @@
 #define RUNGAMEENGINE_INTERFACE_VERSION           "RunGameEngine005"
 #define EVENTSYSTEM_INTERFACE_VERSION             "EventSystem001"
 
-#define CVAR_QUERY_INTERFACE_VERSION              "VCvarQuery001"
 #define VPHYSICS_DEBUG_OVERLAY_INTERFACE_VERSION  "VPhysicsDebugOverlay001"
 #define VDEBUG_OVERLAY_INTERFACE_VERSION          "VDebugOverlay004"
 #define SOUNDCARD_INTERFACE_VERSION               "ISoundC002"