ported SM's core to Orange Box

build is broken now in purpose

--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%401547

core/systems/ExtensionSys.cpp

@@ -813,11 +813,12 @@ void CExtensionManager::AddDependency(IExtension *pSource, const char *file, boo
 	}
 }
 
-void CExtensionManager::OnRootConsoleCommand(const char *cmd, unsigned int argcount)
+void CExtensionManager::OnRootConsoleCommand(const char *cmdname, const CCommand &command)
 {
+	int argcount = command.ArgC();
 	if (argcount >= 3)
 	{
-		const char *cmd = g_RootMenu.GetArgument(2);
+		const char *cmd = command.Arg(2);
 		if (strcmp(cmd, "list") == 0)
 		{
 			List<CExtension *>::iterator iter;
@@ -869,7 +870,7 @@ void CExtensionManager::OnRootConsoleCommand(const char *cmd, unsigned int argco
 				return;
 			}
 
-			const char *sId = g_RootMenu.GetArgument(3);
+			const char *sId = command.Arg(3);
 			unsigned int id = atoi(sId);
 			if (id <= 0)
 			{
@@ -936,7 +937,7 @@ void CExtensionManager::OnRootConsoleCommand(const char *cmd, unsigned int argco
 				return;
 			}
 
-			const char *arg = g_RootMenu.GetArgument(3);
+			const char *arg = command.Arg(3);
 			unsigned int num = atoi(arg);
 			CExtension *pExt = FindByOrder(num);
 
@@ -948,7 +949,7 @@ void CExtensionManager::OnRootConsoleCommand(const char *cmd, unsigned int argco
 
 			if (argcount > 4 && pExt->unload_code)
 			{
-				const char *unload = g_RootMenu.GetArgument(4);
+				const char *unload = command.Arg(4);
 				if (pExt->unload_code == (unsigned)atoi(unload))
 				{
 					char filename[PLATFORM_MAX_PATH];

core/systems/ExtensionSys.h

@@ -121,7 +121,7 @@ public: //IExtensionManager
 public: //IPluginsListener
 	void OnPluginDestroyed(IPlugin *plugin);
 public: //IRootConsoleCommand
-	void OnRootConsoleCommand(const char *cmd, unsigned int argcount);
+	void OnRootConsoleCommand(const char *cmdname, const CCommand &command);
 public:
 	IExtension *LoadAutoExtension(const char *path);
 	void BindDependency(IExtension *pOwner, IfaceInfo *pInfo);

core/systems/PluginSys.cpp

@@ -1961,11 +1961,12 @@ const char *CPluginManager::GetStatusText(PluginStatus st)
 	}
 }
 
-void CPluginManager::OnRootConsoleCommand(const char *command, unsigned int argcount)
+void CPluginManager::OnRootConsoleCommand(const char *cmdname, const CCommand &command)
 {
+	int argcount = command.ArgC();
 	if (argcount >= 3)
 	{
-		const char *cmd = g_RootMenu.GetArgument(2);
+		const char *cmd = command.Arg(2);
 		if (strcmp(cmd, "list") == 0)
 		{
 			char buffer[256];
@@ -2016,7 +2017,7 @@ void CPluginManager::OnRootConsoleCommand(const char *command, unsigned int argc
 
 			char error[128];
 			bool wasloaded;
-			const char *filename = g_RootMenu.GetArgument(3);
+			const char *filename = command.Arg(3);
 
 			char pluginfile[256];
 			const char *ext = g_LibSys.GetFileExtension(filename) ? "" : ".smx";
@@ -2047,7 +2048,7 @@ void CPluginManager::OnRootConsoleCommand(const char *command, unsigned int argc
 
 			CPlugin *pl;
 			char *end;
-			const char *arg = g_RootMenu.GetArgument(3);
+			const char *arg = command.Arg(3);
 			int id = strtol(arg, &end, 10);
 
 			if (*end == '\0')
@@ -2089,7 +2090,7 @@ void CPluginManager::OnRootConsoleCommand(const char *command, unsigned int argc
 				return;
 			}
 
-			int num = atoi(g_RootMenu.GetArgument(3));
+			int num = atoi(command.Arg(3));
 			if (num < 1 || num > (int)GetPluginCount())
 			{
 				g_RootMenu.ConsolePrint("[SM] Plugin index not found.");
@@ -2166,7 +2167,7 @@ void CPluginManager::OnRootConsoleCommand(const char *command, unsigned int argc
 				return;
 			}
 
-			int num = atoi(g_RootMenu.GetArgument(3));
+			int num = atoi(command.Arg(3));
 			if (num < 1 || num > (int)GetPluginCount())
 			{
 				g_RootMenu.ConsolePrint("[SM] Plugin index not found.");
@@ -2174,7 +2175,7 @@ void CPluginManager::OnRootConsoleCommand(const char *command, unsigned int argc
 			}
 
 			int res;
-			const char *mode = g_RootMenu.GetArgument(4);
+			const char *mode = command.Arg(4);
 			if ((res=strcmp("on", mode)) && strcmp("off", mode))
 			{
 				g_RootMenu.ConsolePrint("[SM] The only possible options are \"on\" and \"off.\"");
@@ -2218,7 +2219,7 @@ void CPluginManager::OnRootConsoleCommand(const char *command, unsigned int argc
 
 			CPlugin *pl;
 			char *end;
-			const char *arg = g_RootMenu.GetArgument(3);
+			const char *arg = command.Arg(3);
 			int id = strtol(arg, &end, 10);
 
 			if (*end == '\0')

core/systems/PluginSys.h

@@ -48,7 +48,11 @@
 #include "sm_trie.h"
 #include "sourcemod.h"
 #include <IRootConsoleMenu.h>
+#if defined ORANGEBOX_BUILD
+#include "convar_sm_ob.h"
+#else
 #include "convar_sm.h"
+#endif
 
 using namespace SourceHook;
 
@@ -351,7 +355,7 @@ public: //SMGlobalClass
 public: //IHandleTypeDispatch
 	void OnHandleDestroy(HandleType_t type, void *object);
 public: //IRootConsoleCommand
-	void OnRootConsoleCommand(const char *command, unsigned int argcount);
+	void OnRootConsoleCommand(const char *cmdname, const CCommand &command);
 public:
 	/**
 	 * Loads all plugins not yet loaded