Switched to using IServerTools in SDKTools where possible. (bug 4899, r=fyren).

extensions/sdktools/Makefile

@@ -52,7 +52,7 @@ ifeq "$(ENGINE)" "orangebox"
 	HL2LIB = $(HL2SDK)/lib/linux
 	CFLAGS += -DSOURCE_ENGINE=3
 	METAMOD = $(MMSOURCE17)/core
-	INCLUDE += -I$(HL2SDK)/public/game/server -I$(HL2SDK)/common -I$(HL2SDK)/game/shared
+	INCLUDE += -I$(HL2SDK)/public/game/server -I$(HL2SDK)/common -I$(HL2SDK)/game/shared -I$(HL2SDK)/public/toolframework
 	SRCDS = $(SRCDS_BASE)/orangebox
 	GAMEFIX = 2.ep2
 	override ENGSET = true
@@ -63,7 +63,7 @@ ifeq "$(ENGINE)" "orangeboxvalve"
 	HL2LIB = $(HL2SDK)/lib/linux
 	CFLAGS += -DSOURCE_ENGINE=4
 	METAMOD = $(MMSOURCE17)/core
-	INCLUDE += -I$(HL2SDK)/public/game/server -I$(HL2SDK)/common -I$(HL2SDK)/game/shared
+	INCLUDE += -I$(HL2SDK)/public/game/server -I$(HL2SDK)/common -I$(HL2SDK)/game/shared -I$(HL2SDK)/public/toolframework
 	SRCDS = $(SRCDS_BASE)/orangebox
 	GAMEFIX = 2.ep2v
 	override ENGSET = true
@@ -74,7 +74,7 @@ ifeq "$(ENGINE)" "left4dead"
 	HL2LIB = $(HL2SDK)/lib/linux
 	CFLAGS += -DSOURCE_ENGINE=5
 	METAMOD = $(MMSOURCE17)/core
-	INCLUDE += -I$(HL2SDK)/public/game/server -I$(HL2SDK)/common -I$(HL2SDK)/game/shared
+	INCLUDE += -I$(HL2SDK)/public/game/server -I$(HL2SDK)/common -I$(HL2SDK)/game/shared -I$(HL2SDK)/public/toolframework
 	SRCDS = $(SRCDS_BASE)/l4d
 	GAMEFIX = 2.l4d
 	override ENGSET = true
@@ -85,7 +85,7 @@ ifeq "$(ENGINE)" "left4dead2"
 	HL2LIB = $(HL2SDK)/lib/linux
 	CFLAGS += -DSOURCE_ENGINE=6
 	METAMOD = $(MMSOURCE17)/core
-	INCLUDE += -I$(HL2SDK)/public/game/server -I$(HL2SDK)/common -I$(HL2SDK)/game/shared
+	INCLUDE += -I$(HL2SDK)/public/game/server -I$(HL2SDK)/common -I$(HL2SDK)/game/shared -I$(HL2SDK)/public/toolframework
 	SRCDS = $(SRCDS_BASE)/left4dead2
 	GAMEFIX = 2.l4d2
 	override ENGSET = true

extensions/sdktools/extension.cpp

@@ -64,6 +64,11 @@ IPlayerInfoManager *playerinfomngr = NULL;
 ICvar *icvar = NULL;
 IServer *iserver = NULL;
 CGlobalVars *gpGlobals;
+
+#if SOURCE_ENGINE >= SE_ORANGEBOX
+IServerTools *servertools = NULL;
+#endif
+
 SourceHook::CallClass<IVEngineServer> *enginePatch = NULL;
 SourceHook::CallClass<IEngineSound> *enginesoundPatch = NULL;
 HandleType_t g_CallHandle = 0;
@@ -239,6 +244,10 @@ bool SDKTools::SDK_OnMetamodLoad(ISmmAPI *ismm, char *error, size_t maxlen, bool
 	GET_V_IFACE_ANY(GetServerFactory, playerinfomngr, IPlayerInfoManager, INTERFACEVERSION_PLAYERINFOMANAGER);
 	GET_V_IFACE_CURRENT(GetEngineFactory, icvar, ICvar, CVAR_INTERFACE_VERSION);
 
+#if SOURCE_ENGINE >= SE_ORANGEBOX
+	GET_V_IFACE_ANY(GetServerFactory, servertools, IServerTools, VSERVERTOOLS_INTERFACE_VERSION);
+#endif
+
 	gpGlobals = ismm->GetCGlobals();
 	enginePatch = SH_GET_CALLCLASS(engine);
 	enginesoundPatch = SH_GET_CALLCLASS(engsound);

extensions/sdktools/extension.h

@@ -51,6 +51,10 @@
 #include <iserver.h>
 #include <cdll_int.h>
 
+#if SOURCE_ENGINE >= SE_ORANGEBOX
+#include <itoolentity.h>
+#endif
+
 /**
  * @brief Implementation of the SDK Tools extension.
  * Note: Uncomment one of the pre-defined virtual functions in order to use it.
@@ -115,6 +119,9 @@ extern IPlayerInfoManager *playerinfomngr;
 extern ICvar *icvar;
 extern IServer *iserver;
 extern CGlobalVars *gpGlobals;
+#if SOURCE_ENGINE >= SE_ORANGEBOX
+extern IServerTools *servertools;
+#endif
 /* Interfaces from SourceMod */
 extern IBinTools *g_pBinTools;
 extern IGameConfig *g_pGameConf;

extensions/sdktools/msvc9/sdktools.vcproj

@@ -208,7 +208,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDKOB)\game\shared";"$(HL2SDKOB)\common";"$(HL2SDKOB)\public";"$(HL2SDKOB)\public\engine";"$(HL2SDKOB)\public\game\server";"$(HL2SDKOB)\public\mathlib";"$(HL2SDKOB)\public\tier0";"$(HL2SDKOB)\public\tier1";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
+				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDKOB)\game\shared";"$(HL2SDKOB)\common";"$(HL2SDKOB)\public";"$(HL2SDKOB)\public\engine";"$(HL2SDKOB)\public\game\server";"$(HL2SDKOB)\public\toolframework";"$(HL2SDKOB)\public\mathlib";"$(HL2SDKOB)\public\tier0";"$(HL2SDKOB)\public\tier1";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=3"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -291,7 +291,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDKOB)\game\shared";"$(HL2SDKOB)\common";"$(HL2SDKOB)\public";"$(HL2SDKOB)\public\engine";"$(HL2SDKOB)\public\game\server";"$(HL2SDKOB)\public\mathlib";"$(HL2SDKOB)\public\tier0";"$(HL2SDKOB)\public\tier1";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
+				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDKOB)\game\shared";"$(HL2SDKOB)\common";"$(HL2SDKOB)\public";"$(HL2SDKOB)\public\engine";"$(HL2SDKOB)\public\game\server";"$(HL2SDKOB)\public\toolframework";"$(HL2SDKOB)\public\mathlib";"$(HL2SDKOB)\public\tier0";"$(HL2SDKOB)\public\tier1";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=3"
 				RuntimeLibrary="0"
 				EnableEnhancedInstructionSet="0"
@@ -537,7 +537,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_ORANGEBOXVALVE=5 /D SE_LEFT4DEAD=6 /D SE_LEFT4DEAD2=7 /D SE_ALIENSWARM=8"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDKL4D)\game\shared";"$(HL2SDKL4D)\common";"$(HL2SDKL4D)\public";"$(HL2SDKL4D)\public\engine";"$(HL2SDKL4D)\public\game\server";"$(HL2SDKL4D)\public\mathlib";"$(HL2SDKL4D)\public\tier0";"$(HL2SDKL4D)\public\tier1";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
+				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDKL4D)\game\shared";"$(HL2SDKL4D)\common";"$(HL2SDKL4D)\public";"$(HL2SDKL4D)\public\engine";"$(HL2SDKL4D)\public\game\server";"$(HL2SDKL4D)\public\toolframework";"$(HL2SDKL4D)\public\mathlib";"$(HL2SDKL4D)\public\tier0";"$(HL2SDKL4D)\public\tier1";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=6"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -620,7 +620,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_ORANGEBOXVALVE=5 /D SE_LEFT4DEAD=6 /D SE_LEFT4DEAD2=7 /D SE_ALIENSWARM=8"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDKL4D)\game\shared";"$(HL2SDKL4D)\common";"$(HL2SDKL4D)\public";"$(HL2SDKL4D)\public\engine";"$(HL2SDKL4D)\public\game\server";"$(HL2SDKL4D)\public\mathlib";"$(HL2SDKL4D)\public\tier0";"$(HL2SDKL4D)\public\tier1";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
+				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDKL4D)\game\shared";"$(HL2SDKL4D)\common";"$(HL2SDKL4D)\public";"$(HL2SDKL4D)\public\engine";"$(HL2SDKL4D)\public\game\server";"$(HL2SDKL4D)\public\toolframework";"$(HL2SDKL4D)\public\mathlib";"$(HL2SDKL4D)\public\tier0";"$(HL2SDKL4D)\public\tier1";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=6"
 				RuntimeLibrary="0"
 				EnableEnhancedInstructionSet="0"
@@ -867,7 +867,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_ORANGEBOXVALVE=5 /D SE_LEFT4DEAD=6 /D SE_LEFT4DEAD2=7 /D SE_ALIENSWARM=8"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDKOBVALVE)\common";"$(HL2SDKOBVALVE)\public";"$(HL2SDKOBVALVE)\public\engine";"$(HL2SDKOBVALVE)\public\game\server";"$(HL2SDKOBVALVE)\public\mathlib";"$(HL2SDKOBVALVE)\public\tier0";"$(HL2SDKOBVALVE)\public\tier1";"$(HL2SDKOBVALVE)\game\shared";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
+				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDKOBVALVE)\common";"$(HL2SDKOBVALVE)\public";"$(HL2SDKOBVALVE)\public\engine";"$(HL2SDKOBVALVE)\public\game\server";"$(HL2SDKOBVALVE)\public\toolframework";"$(HL2SDKOBVALVE)\public\mathlib";"$(HL2SDKOBVALVE)\public\tier0";"$(HL2SDKOBVALVE)\public\tier1";"$(HL2SDKOBVALVE)\game\shared";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=5"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -951,7 +951,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_ORANGEBOXVALVE=5 /D SE_LEFT4DEAD=6 /D SE_LEFT4DEAD2=7 /D SE_ALIENSWARM=8"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDKOBVALVE)\common";"$(HL2SDKOBVALVE)\public";"$(HL2SDKOBVALVE)\public\engine";"$(HL2SDKOBVALVE)\public\game\server";"$(HL2SDKOBVALVE)\public\mathlib";"$(HL2SDKOBVALVE)\public\tier0";"$(HL2SDKOBVALVE)\public\tier1";"$(HL2SDKOBVALVE)\game\shared";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
+				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDKOBVALVE)\common";"$(HL2SDKOBVALVE)\public";"$(HL2SDKOBVALVE)\public\engine";"$(HL2SDKOBVALVE)\public\game\server";"$(HL2SDKOBVALVE)\public\mathlib";"$(HL2SDKOBVALVE)\public\tier0";"$(HL2SDKOBVALVE)\public\tier1";"$(HL2SDKOBVALVE)\game\shared";"$(HL2SDKOBVALVE)\public\toolframework";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=5"
 				RuntimeLibrary="0"
 				EnableEnhancedInstructionSet="0"
@@ -1034,7 +1034,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_ORANGEBOXVALVE=5 /D SE_LEFT4DEAD=6 /D SE_LEFT4DEAD2=7 /D SE_ALIENSWARM=8"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDKL4D2)\common";"$(HL2SDKL4D2)\public";"$(HL2SDKL4D2)\public\engine";"$(HL2SDKL4D2)\public\game\server";"$(HL2SDKL4D2)\public\mathlib";"$(HL2SDKL4D2)\public\tier0";"$(HL2SDKL4D2)\game\shared";"$(HL2SDKL4D2)\public\tier1";"$(MMSOURCE18)\core";"$(MMSOURCE18)\core\sourcehook""
+				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDKL4D2)\common";"$(HL2SDKL4D2)\public";"$(HL2SDKL4D2)\public\engine";"$(HL2SDKL4D2)\public\game\server";"$(HL2SDKL4D2)\public\toolframework";"$(HL2SDKL4D2)\public\mathlib";"$(HL2SDKL4D2)\public\tier0";"$(HL2SDKL4D2)\game\shared";"$(HL2SDKL4D2)\public\tier1";"$(MMSOURCE18)\core";"$(MMSOURCE18)\core\sourcehook""
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=7"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -1118,7 +1118,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_ORANGEBOXVALVE=5 /D SE_LEFT4DEAD=6 /D SE_LEFT4DEAD2=7 /D SE_ALIENSWARM=8"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDKL4D2)\game\shared";"$(HL2SDKL4D2)\common";"$(HL2SDKL4D2)\public";"$(HL2SDKL4D2)\public\engine";"$(HL2SDKL4D2)\public\game\server";"$(HL2SDKL4D2)\public\mathlib";"$(HL2SDKL4D2)\public\tier0";"$(HL2SDKL4D2)\public\tier1";"$(MMSOURCE18)\core";"$(MMSOURCE18)\core\sourcehook""
+				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDKL4D2)\game\shared";"$(HL2SDKL4D2)\common";"$(HL2SDKL4D2)\public";"$(HL2SDKL4D2)\public\engine";"$(HL2SDKL4D2)\public\game\server";"$(HL2SDKL4D2)\public\toolframework";"$(HL2SDKL4D2)\public\mathlib";"$(HL2SDKL4D2)\public\tier0";"$(HL2SDKL4D2)\public\tier1";"$(MMSOURCE18)\core";"$(MMSOURCE18)\core\sourcehook""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=7"
 				RuntimeLibrary="0"
 				EnableEnhancedInstructionSet="0"
@@ -1200,7 +1200,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_ORANGEBOXVALVE=5 /D SE_LEFT4DEAD=6 /D SE_LEFT4DEAD2=7 /D SE_ALIENSWARM=8"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDK-BGT)\game\shared";"$(HL2SDK-BGT)\common";"$(HL2SDK-BGT)\public";"$(HL2SDK-BGT)\public\engine";"$(HL2SDK-BGT)\public\game\server";"$(HL2SDK-BGT)\public\mathlib";"$(HL2SDK-BGT)\public\tier0";"$(HL2SDK-BGT)\public\tier1";"$(MMSOURCE18)\core";"$(MMSOURCE18)\core\sourcehook""
+				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDK-BGT)\game\shared";"$(HL2SDK-BGT)\common";"$(HL2SDK-BGT)\public";"$(HL2SDK-BGT)\public\engine";"$(HL2SDK-BGT)\public\game\server";"$(HL2SDK-BGT)\public\toolframework";"$(HL2SDK-BGT)\public\mathlib";"$(HL2SDK-BGT)\public\tier0";"$(HL2SDK-BGT)\public\tier1";"$(MMSOURCE18)\core";"$(MMSOURCE18)\core\sourcehook""
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=4"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -1283,7 +1283,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_ORANGEBOXVALVE=5 /D SE_LEFT4DEAD=6 /D SE_LEFT4DEAD2=7 /D SE_ALIENSWARM=8"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDK-BGT)\game\shared";"$(HL2SDK-BGT)\common";"$(HL2SDK-BGT)\public";"$(HL2SDK-BGT)\public\engine";"$(HL2SDK-BGT)\public\game\server";"$(HL2SDK-BGT)\public\mathlib";"$(HL2SDK-BGT)\public\tier0";"$(HL2SDK-BGT)\public\tier1";"$(MMSOURCE18)\core";"$(MMSOURCE18)\core\sourcehook""
+				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDK-BGT)\game\shared";"$(HL2SDK-BGT)\common";"$(HL2SDK-BGT)\public";"$(HL2SDK-BGT)\public\engine";"$(HL2SDK-BGT)\public\game\server";"$(HL2SDK-BGT)\public\toolframework";"$(HL2SDK-BGT)\public\mathlib";"$(HL2SDK-BGT)\public\tier0";"$(HL2SDK-BGT)\public\tier1";"$(MMSOURCE18)\core";"$(MMSOURCE18)\core\sourcehook""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=4"
 				RuntimeLibrary="0"
 				EnableEnhancedInstructionSet="0"
@@ -1365,7 +1365,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_ORANGEBOXVALVE=5 /D SE_LEFT4DEAD=6 /D SE_LEFT4DEAD2=7 /D SE_ALIENSWARM=8 /D COMPILER_MSVC /D COMPILER_MSVC32"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDK-SWARM)\common";"$(HL2SDK-SWARM)\public";"$(HL2SDK-SWARM)\public\engine";"$(HL2SDK-SWARM)\public\game\server";"$(HL2SDK-SWARM)\public\mathlib";"$(HL2SDK-SWARM)\public\tier0";"$(HL2SDK-SWARM)\game\shared";"$(HL2SDK-SWARM)\public\tier1";"$(MMSOURCE18)\core";"$(MMSOURCE18)\core\sourcehook""
+				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDK-SWARM)\common";"$(HL2SDK-SWARM)\public";"$(HL2SDK-SWARM)\public\engine";"$(HL2SDK-SWARM)\public\game\server";"$(HL2SDK-SWARM)\public\toolframework";"$(HL2SDK-SWARM)\public\mathlib";"$(HL2SDK-SWARM)\public\tier0";"$(HL2SDK-SWARM)\game\shared";"$(HL2SDK-SWARM)\public\tier1";"$(MMSOURCE18)\core";"$(MMSOURCE18)\core\sourcehook""
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=8"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -1449,7 +1449,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_ORANGEBOXVALVE=5 /D SE_LEFT4DEAD=6 /D SE_LEFT4DEAD2=7 /D SE_ALIENSWARM=8 /D COMPILER_MSVC /D COMPILER_MSVC32"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDK-SWARM)\common";"$(HL2SDK-SWARM)\public";"$(HL2SDK-SWARM)\public\engine";"$(HL2SDK-SWARM)\public\game\server";"$(HL2SDK-SWARM)\public\mathlib";"$(HL2SDK-SWARM)\public\tier0";"$(HL2SDK-SWARM)\public\tier1";"$(HL2SDK-SWARM)\game\shared";"$(MMSOURCE18)\core";"$(MMSOURCE18)\core\sourcehook""
+				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDK-SWARM)\common";"$(HL2SDK-SWARM)\public";"$(HL2SDK-SWARM)\public\engine";"$(HL2SDK-SWARM)\public\game\server";"$(HL2SDK-SWARM)\public\toolframework";"$(HL2SDK-SWARM)\public\mathlib";"$(HL2SDK-SWARM)\public\tier0";"$(HL2SDK-SWARM)\public\tier1";"$(HL2SDK-SWARM)\game\shared";"$(MMSOURCE18)\core";"$(MMSOURCE18)\core\sourcehook""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=7"
 				RuntimeLibrary="0"
 				EnableEnhancedInstructionSet="0"

extensions/sdktools/vnatives.cpp

@@ -40,6 +40,7 @@
 #include <inetchannel.h>
 #include <iclient.h>
 #include "iserver.h"
+#include <iserverentity.h>
 
 SourceHook::List<ValveCall *> g_RegCalls;
 SourceHook::List<ICallWrapper *> g_CallWraps;
@@ -630,6 +631,66 @@ static cell_t GetClientEyeAngles(IPluginContext *pContext, const cell_t *params)
 	return got_angles ? 1 : 0;
 }
 
+#if SOURCE_ENGINE >= SE_ORANGEBOX
+static cell_t FindEntityByClassname(IPluginContext *pContext, const cell_t *params)
+{
+	char *searchname;
+	CBaseEntity *pEntity;
+
+	if (params[1] == -1)
+	{
+		pEntity = (CBaseEntity *)servertools->FirstEntity();
+	}
+	else
+	{
+		pEntity = gamehelpers->ReferenceToEntity(params[1]);
+		if (!pEntity)
+		{
+			return pContext->ThrowNativeError("Entity %d (%d) is invalid",
+				gamehelpers->ReferenceToIndex(params[1]),
+				params[1]);
+		}
+	}
+
+	pContext->LocalToString(params[2], &searchname);
+
+	char buffer[128];
+	const char *classname = buffer;
+	int lastcharpos;
+	bool ismatch = false;
+
+	while (pEntity)
+	{
+		if (!servertools->GetKeyValue(pEntity, "classname", buffer, sizeof(buffer)))
+		{
+			pEntity = (CBaseEntity *)servertools->NextEntity(pEntity);
+			continue;
+		}
+
+		lastcharpos = strlen(searchname);
+		if (searchname[lastcharpos-1] == '*')
+		{
+			if (strncasecmp(searchname, classname, lastcharpos-1) == 0)
+			{
+				ismatch = true;
+			}
+		}
+		else if (strcasecmp(searchname, classname) == 0)
+		{
+			ismatch = true;
+		}
+
+		if (ismatch)
+		{
+			return gamehelpers->EntityToBCompatRef(pEntity);
+		}
+
+		pEntity = (CBaseEntity *)servertools->NextEntity(pEntity);
+	}
+
+	return -1;
+}
+#else
 static cell_t FindEntityByClassname(IPluginContext *pContext, const cell_t *params)
 {
 	static ValveCall *pCall = NULL;
@@ -656,33 +717,14 @@ static cell_t FindEntityByClassname(IPluginContext *pContext, const cell_t *para
 
 	return gamehelpers->EntityToBCompatRef(pEntity);
 }
+#endif
 
-#if SOURCE_ENGINE >= SE_LEFT4DEAD
+#if SOURCE_ENGINE >= SE_ORANGEBOX
 static cell_t CreateEntityByName(IPluginContext *pContext, const cell_t *params)
 {
-	static ValveCall *pCall = NULL;
-	if (!pCall)
-	{
-		ValvePassInfo pass[4];
-		InitPass(pass[0], Valve_String, PassType_Basic, PASSFLAG_BYVAL);
-		InitPass(pass[1], Valve_POD, PassType_Basic, PASSFLAG_BYVAL);
-		InitPass(pass[2], Valve_Bool, PassType_Basic, PASSFLAG_BYVAL);
-		InitPass(pass[3], Valve_CBaseEntity, PassType_Basic, PASSFLAG_BYVAL);
-		if (!CreateBaseCall("CreateEntityByName", ValveCall_Static, &pass[3], pass, 3, &pCall))
-		{
-			return pContext->ThrowNativeError("\"CreateEntityByName\" not supported by this mod");
-		} else if (!pCall) {
-			return pContext->ThrowNativeError("\"CreateEntityByName\" wrapper failed to initialize");
-		}
-	}
-
-	CBaseEntity *pEntity = NULL;
-	START_CALL();
-	DECODE_VALVE_PARAM(1, vparams, 0);
-	DECODE_VALVE_PARAM(2, vparams, 1);
-	*(bool *)(vptr + 8) = true;
-	FINISH_CALL_SIMPLE(&pEntity);
-
+	char *classname;
+	pContext->LocalToString(params[1], &classname);
+	CBaseEntity *pEntity = (CBaseEntity *)servertools->CreateEntityByName(classname);
 	return gamehelpers->EntityToBCompatRef(pEntity);
 }
 #else
@@ -713,32 +755,18 @@ static cell_t CreateEntityByName(IPluginContext *pContext, const cell_t *params)
 }
 #endif
 
-#if SOURCE_ENGINE >= SE_LEFT4DEAD2
+#if SOURCE_ENGINE >= SE_ORANGEBOX
 static cell_t DispatchSpawn(IPluginContext *pContext, const cell_t *params)
 {
-	static ValveCall *pCall = NULL;
-	if (!pCall)
+	CBaseEntity *pEntity = gamehelpers->ReferenceToEntity(params[1]);
+	if (!pEntity)
 	{
-		ValvePassInfo pass[3];
-		InitPass(pass[0], Valve_CBaseEntity, PassType_Basic, PASSFLAG_BYVAL);
-		InitPass(pass[1], Valve_Bool, PassType_Basic, PASSFLAG_BYVAL);
-		InitPass(pass[2], Valve_POD, PassType_Basic, PASSFLAG_BYVAL);
-		if (!CreateBaseCall("DispatchSpawn", ValveCall_Static, &pass[2], pass, 2, &pCall))
-		{
-			return pContext->ThrowNativeError("\"DispatchSpawn\" not supported by this mod");
-		} else if (!pCall) {
-			return pContext->ThrowNativeError("\"DispatchSpawn\" wrapper failed to initialize");
-		}
+		return pContext->ThrowNativeError("Entity %d (%d) is invalid", gamehelpers->ReferenceToIndex(params[1]), params[1]);
 	}
 
-	int ret;
-	START_CALL();
-	DECODE_VALVE_PARAM(1, vparams, 0);
-	/* All X-refs to DispatchSpawn I checked use true - Unsure of what it does */
-	*(bool *)(vptr + 4) = true;
-	FINISH_CALL_SIMPLE(&ret);
+	servertools->DispatchSpawn(pEntity);
 
-	return (ret == -1) ? 0 : 1;
+	return 1;
 }
 #else
 static cell_t DispatchSpawn(IPluginContext *pContext, const cell_t *params)
@@ -766,6 +794,23 @@ static cell_t DispatchSpawn(IPluginContext *pContext, const cell_t *params)
 }
 #endif
 
+#if SOURCE_ENGINE >= SE_ORANGEBOX
+static cell_t DispatchKeyValue(IPluginContext *pContext, const cell_t *params)
+{
+	CBaseEntity *pEntity = gamehelpers->ReferenceToEntity(params[1]);
+	if (!pEntity)
+	{
+		return pContext->ThrowNativeError("Entity %d (%d) is invalid", gamehelpers->ReferenceToIndex(params[1]), params[1]);
+	}
+
+	char *key;
+	char *value;
+	pContext->LocalToString(params[2], &key);
+	pContext->LocalToString(params[3], &value);
+
+	return (servertools->SetKeyValue(pEntity, key, value) ? 1 : 0);
+}
+#else
 static cell_t DispatchKeyValue(IPluginContext *pContext, const cell_t *params)
 {
 	static ValveCall *pCall = NULL;
@@ -792,7 +837,25 @@ static cell_t DispatchKeyValue(IPluginContext *pContext, const cell_t *params)
 
 	return ret ? 1 : 0;
 }
+#endif
 
+#if SOURCE_ENGINE >= SE_ORANGEBOX
+static cell_t DispatchKeyValueFloat(IPluginContext *pContext, const cell_t *params)
+{
+	CBaseEntity *pEntity = gamehelpers->ReferenceToEntity(params[1]);
+	if (!pEntity)
+	{
+		return pContext->ThrowNativeError("Entity %d (%d) is invalid", gamehelpers->ReferenceToIndex(params[1]), params[1]);
+	}
+
+	char *key;
+	pContext->LocalToString(params[2], &key);
+	
+	float value = sp_ctof(params[3]);
+
+	return (servertools->SetKeyValue(pEntity, key, value) ? 1 : 0);
+}
+#else
 static cell_t DispatchKeyValueFloat(IPluginContext *pContext, const cell_t *params)
 {
 	static ValveCall *pCall = NULL;
@@ -819,7 +882,31 @@ static cell_t DispatchKeyValueFloat(IPluginContext *pContext, const cell_t *para
 
 	return ret ? 1 : 0;
 }
+#endif
 
+#if SOURCE_ENGINE >= SE_ORANGEBOX
+static cell_t DispatchKeyValueVector(IPluginContext *pContext, const cell_t *params)
+{
+	CBaseEntity *pEntity = gamehelpers->ReferenceToEntity(params[1]);
+	if (!pEntity)
+	{
+		return pContext->ThrowNativeError("Entity %d (%d) is invalid", gamehelpers->ReferenceToIndex(params[1]), params[1]);
+	}
+
+	char *key;
+	pContext->LocalToString(params[2], &key);
+	
+	cell_t *vec;
+	pContext->LocalToPhysAddr(params[3], &vec);
+
+	const Vector *v = new Vector(
+		sp_ctof(vec[0]),
+		sp_ctof(vec[1]),
+		sp_ctof(vec[2]));
+
+	return (servertools->SetKeyValue(pEntity, key, *v) ? 1 : 0);
+}
+#else
 static cell_t DispatchKeyValueVector(IPluginContext *pContext, const cell_t *params)
 {
 	static ValveCall *pCall = NULL;
@@ -850,6 +937,7 @@ static cell_t DispatchKeyValueVector(IPluginContext *pContext, const cell_t *par
 
 	return ret ? 1 : 0;
 }
+#endif
 
 static cell_t sm_GetClientAimTarget(IPluginContext *pContext, const cell_t *params)
 {