From 97df63bc21e53556f3cc31112f713d1ae63e691a Mon Sep 17 00:00:00 2001
From: pg9182 <96569817+pg9182@users.noreply.github.com>
Date: Fri, 5 May 2023 19:45:04 -0400
Subject: Revert "Plugin system v2 (#343)"

This reverts commit 450d0b1ed437cf37b4309af952af8904f3f07768.
---
 NorthstarDLL/core/convar/concommand.cpp | 4 ----
 NorthstarDLL/core/convar/convar.cpp     | 7 -------
 NorthstarDLL/core/hooks.cpp             | 2 ++
 NorthstarDLL/core/math/color.cpp        | 2 --
 NorthstarDLL/core/math/color.h          | 2 --
 5 files changed, 2 insertions(+), 15 deletions(-)

(limited to 'NorthstarDLL/core')

diff --git a/NorthstarDLL/core/convar/concommand.cpp b/NorthstarDLL/core/convar/concommand.cpp
index 82594f04..67c867f8 100644
--- a/NorthstarDLL/core/convar/concommand.cpp
+++ b/NorthstarDLL/core/convar/concommand.cpp
@@ -2,8 +2,6 @@
 #include "shared/misccommands.h"
 #include "engine/r2engine.h"
 
-#include "plugins/pluginbackend.h"
-
 #include <iostream>
 
 //-----------------------------------------------------------------------------
@@ -150,6 +148,4 @@ ON_DLL_LOAD("engine.dll", ConCommand, (CModule module))
 {
 	ConCommandConstructor = module.Offset(0x415F60).As<ConCommandConstructorType>();
 	AddMiscConCommands();
-
-	g_pPluginCommunicationhandler->m_sEngineData.ConCommandConstructor = ConCommandConstructor;
 }
diff --git a/NorthstarDLL/core/convar/convar.cpp b/NorthstarDLL/core/convar/convar.cpp
index d4efc1a0..1ea27fc0 100644
--- a/NorthstarDLL/core/convar/convar.cpp
+++ b/NorthstarDLL/core/convar/convar.cpp
@@ -3,8 +3,6 @@
 #include "convar.h"
 #include "core/sourceinterface.h"
 
-#include "plugins/pluginbackend.h"
-
 #include <float.h>
 
 typedef void (*ConVarRegisterType)(
@@ -39,11 +37,6 @@ ON_DLL_LOAD("engine.dll", ConVar, (CModule module))
 
 	R2::g_pCVarInterface = new SourceInterface<CCvar>("vstdlib.dll", "VEngineCvar007");
 	R2::g_pCVar = *R2::g_pCVarInterface;
-
-	g_pPluginCommunicationhandler->m_sEngineData.conVarMalloc = conVarMalloc;
-	g_pPluginCommunicationhandler->m_sEngineData.conVarRegister = conVarRegister;
-	g_pPluginCommunicationhandler->m_sEngineData.ConVar_Vtable = g_pConVar_Vtable;
-	g_pPluginCommunicationhandler->m_sEngineData.IConVar_Vtable = g_pIConVar_Vtable;
 }
 
 //-----------------------------------------------------------------------------
diff --git a/NorthstarDLL/core/hooks.cpp b/NorthstarDLL/core/hooks.cpp
index 9124d5af..7c70b0a5 100644
--- a/NorthstarDLL/core/hooks.cpp
+++ b/NorthstarDLL/core/hooks.cpp
@@ -274,6 +274,8 @@ AUTOHOOK_ABSOLUTEADDR(_GetCommandLineA, GetCommandLineA, LPSTR, WINAPI, ())
 			return cmdlineOrg;
 		}
 		memcpy(cmdlineModified, args.c_str(), len + 1);
+
+		spdlog::info("Command line: {}", cmdlineModified);
 	}
 
 	return cmdlineModified;
diff --git a/NorthstarDLL/core/math/color.cpp b/NorthstarDLL/core/math/color.cpp
index 7b98043a..9936cc5a 100644
--- a/NorthstarDLL/core/math/color.cpp
+++ b/NorthstarDLL/core/math/color.cpp
@@ -13,8 +13,6 @@ namespace NS::Colors
 	Color RPAK			(255, 190, 0  );
 	Color NORTHSTAR		(66 , 72 , 128);
 	Color ECHO			(150, 150, 159);
-	Color PLUGINSYS		(244, 60 , 14);
-	Color PLUGIN		(244, 106, 14);
 
 	Color TRACE		(0  , 255, 255);
 	Color DEBUG		(0  , 255, 255);
diff --git a/NorthstarDLL/core/math/color.h b/NorthstarDLL/core/math/color.h
index 76cf8a47..4dc9b36e 100644
--- a/NorthstarDLL/core/math/color.h
+++ b/NorthstarDLL/core/math/color.h
@@ -186,8 +186,6 @@ namespace NS::Colors
 	extern Color RPAK;
 	extern Color NORTHSTAR;
 	extern Color ECHO;
-	extern Color PLUGINSYS;
-	extern Color PLUGIN;
 
 	extern Color TRACE;
 	extern Color DEBUG;
-- 
cgit v1.2.3