1 files changed, 39 insertions, 15 deletions

diff --git a/src/plugin.h b/src/plugin.h
index 2af5f30..2d3d2d9 100644
--- a/src/plugin.h
+++ b/src/plugin.h
@@ -1,33 +1,57 @@
 #ifndef PLUGIN_H
 #define PLUGIN_H
 
-#include "ns_plugin.h"
+#include <vector>
 
-class jsonrpc_server;
+#include "ns_plugin.h"
+#include "internal/concommandproxy.h"
+#include "internal/convarproxy.h"
 
-struct EngineData
-{
-    ConCommandConstructorType ConCommandConstructor;
-    ConVarMallocType conVarMalloc;
-    ConVarRegisterType conVarRegister;
-    void* ConVar_Vtable;
-    void* IConVar_Vtable;
-};
+class rpc_server;
 
 class Plugin {
     private:
-        PluginInitFuncs* funcs = nullptr;
-        PluginNorthstarData* data = nullptr;
-        EngineData* engine_data = nullptr;
+        PluginInitFuncs funcs = { 0 };
+        PluginNorthstarData data = { 0 };
+        EngineData engine_data = { 0 };
+
+        SquirrelFunctions client_sqvm_funcs = { 0 };
+        SquirrelFunctions server_sqvm_funcs = { 0 };
+
+        CSquirrelVM client_vm = { 0 };
+        CSquirrelVM server_vm = { 0 };
+        CSquirrelVM ui_vm = { 0 }; // uses same functions as client
 
-        jsonrpc_server* server;
+        HMODULE engine = nullptr;
+        struct {
+            Cbuf_GetCurrentPlayerType Cbuf_GetCurrentPlayer;
+            Cbuf_AddTextType Cbuf_AddText;
+            Cbuf_ExecuteType Cbuf_Execute;
+        } engine_funcs = { 0 };
+
+        rpc_server* server = nullptr;
+
+        std::vector<ConCommandProxy*> commands;
+        std::vector<ConVarProxy*> variables;
+
+        HMODULE GetModuleByName(const char* name);
 
     public:
         Plugin(PluginInitFuncs* funcs, PluginNorthstarData* data);
         ~Plugin();
 
         void LoadEngineData(void* data);
-        void RegisterConCommand(const char* name, FnCommandCallback_t callback, const char* helpString, int flags);
+        void LoadSQVMFunctions(ScriptContext context, SquirrelFunctions* funcs);
+        void LoadSQVM(ScriptContext context, CSquirrelVM* sqvm);
+        void RemoveSQVM(ScriptContext context);
+
+        void StartServer();
+        void RunCommand(const char* cmd);
+        SQRESULT RunSquirrelCode(ScriptContext context, std::string code, SQObject* ret_val);
+
+        // Wraps around the internals we receive
+        ConCommandProxy* ConCommand(const char* name, FnCommandCallback_t callback, const char* helpString, int flags, void* parent = nullptr);
+        ConVarProxy* ConVar(const char* pszName, const char* pszDefaultValue, int nFlags, const char* pszHelpString, bool bMin = 0, float fMin = 0, bool bMax = 0, float fMax = 0, FnChangeCallback_t pCallback = nullptr);
 };
 
 #endif
\ No newline at end of file