make FCVAR_CLIENTCMD_CAN_EXECUTE checks not rely on concommand dispatch hooks that may be inconsistent across dlls

1 files changed, 9 insertions, 5 deletions

diff --git a/NorthstarDedicatedTest/convar.h b/NorthstarDedicatedTest/convar.h
index 40b8a5d8..3de8139b 100644
--- a/NorthstarDedicatedTest/convar.h
+++ b/NorthstarDedicatedTest/convar.h
@@ -1,4 +1,5 @@
 #pragma once
+#include "sourceinterface.h"
 #include <set>
 // taken directly from iconvar.h
 
@@ -90,10 +91,12 @@ class ICvar
 public:
     struct VTable
     {
-        void* unknown[10];
-        void(*UnregisterConCommand) (ICvar* cvar, ConCommand* pCommandBase);
-        void* unknown2[28];
-        ConVar*(*FindVar)(const char* var_name); // offset for this is currently very wrong
+        //void* unknown[10];
+        //void(*UnregisterConCommand) (ICvar* cvar, ConCommand* pCommandBase);
+        //void* unknown2[28];
+        //ConVar*(*FindVar)(const char* var_name); // offset for this is currently very wrong
+        char* unknown[112];
+        ConCommand*(*FindCommandBase)(ICvar* self, const char* varName);
     };
 
     VTable* m_vtable;
@@ -103,4 +106,5 @@ public:
 ConVar* RegisterConVar(const char* name, const char* defaultValue, int flags, const char* helpString);
 void InitialiseConVars(HMODULE baseAddress);
 
-extern std::unordered_map<std::string, ConVar*> g_CustomConvars;
\ No newline at end of file
+extern std::unordered_map<std::string, ConVar*> g_CustomConvars;
+extern SourceInterface<ICvar>* g_pCvar;
\ No newline at end of file