From 8a669bc96ffdb9d0f6f54e464da11e3375c80a55 Mon Sep 17 00:00:00 2001
From: Michael Smith <mikesmiffy128@gmail.com>
Date: Thu, 17 Apr 2025 01:39:10 +0100
Subject: Add type-safety to virtual calls and accessors

This probably should have been the design from the start.

It's still possible to use void pointers, and this is done in a couple
of places for simplicity, but wherever possible, we have actual structs
for things now.

Additionally, in places where vtables are fiddled with, e.g. vtable
hooks, we have actual struct definitions with vtable pointers so there's
need for pointer-casting horror.
---
 src/engineapi.h | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/engineapi.h')

diff --git a/src/engineapi.h b/src/engineapi.h
index c7a7e1f..ef716a9 100644
--- a/src/engineapi.h
+++ b/src/engineapi.h
@@ -38,15 +38,14 @@ extern ifacefactory factory_client, factory_server, factory_engine,
 
 // various engine types {{{
 
-struct VEngineClient {
-	void **vtable;
-	/* opaque fields */
-};
-
-struct VEngineServer {
-	void **vtable;
-	/* opaque fields */
-};
+// Virtual classes with opaque members; vtables exposed for ease of hooking etc.
+struct ICvar { void **vtable; };
+struct VEngineClient { void **vtable; };
+struct VClient { void **vtable; };
+struct VEngineServer { void **vtable; };
+struct IServerGameDLL { void **vtable; };
+struct IInputSystem { void **vtable; };
+struct CEngineVGui { void **vtable; };
 
 struct CUtlMemory {
 	void *mem;
@@ -124,9 +123,10 @@ struct ServerClass {
 
 extern struct VEngineClient *engclient;
 extern struct VEngineServer *engserver;
-extern void *srvdll;
-extern void *globalvars;
-extern void *inputsystem, *vgui;
+extern struct IServerGameDLL *srvdll;
+extern struct CGlobalVars *globalvars;
+extern struct IInputSystem *inputsystem;
+extern struct CEngineVGui *vgui;
 
 // XXX: not exactly engine *API* but not curently clear where else to put this
 struct CPlugin_common {
-- 
cgit v1.2.3-54-g00ecf