From 7527f441aeb0c347b89747d7422b787a200f25fc Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Wed, 25 May 2011 08:27:27 -0400 Subject: [PATCH] Switched to using IServerTools in SDKTools where possible. (bug 4899, r=fyren). --- AMBuildScript | 1 + extensions/sdktools/Makefile | 8 +- extensions/sdktools/extension.cpp | 9 + extensions/sdktools/extension.h | 7 + extensions/sdktools/msvc9/sdktools.vcproj | 24 +-- extensions/sdktools/vnatives.cpp | 176 +++++++++++++++----- gamedata/sdktools.games/engine.bgt.txt | 44 ----- gamedata/sdktools.games/engine.ep2.txt | 51 ------ gamedata/sdktools.games/engine.ep2valve.txt | 54 ------ gamedata/sdktools.games/engine.l4d.txt | 66 -------- gamedata/sdktools.games/engine.l4d2.txt | 66 -------- gamedata/sdktools.games/engine.swarm.txt | 44 ----- gamedata/sdktools.games/game.alienswarm.txt | 12 -- gamedata/sdktools.games/game.aoc.txt | 15 -- gamedata/sdktools.games/game.bg2.txt | 15 -- gamedata/sdktools.games/game.cspromod.txt | 21 +-- gamedata/sdktools.games/game.cstrike.txt | 18 -- gamedata/sdktools.games/game.dinodday.txt | 12 -- gamedata/sdktools.games/game.dod.txt | 18 -- gamedata/sdktools.games/game.dystopia.txt | 15 -- gamedata/sdktools.games/game.empires.txt | 33 ---- gamedata/sdktools.games/game.fas.txt | 33 ---- gamedata/sdktools.games/game.fof.txt | 15 -- gamedata/sdktools.games/game.garrysmod.txt | 39 ----- gamedata/sdktools.games/game.gesource.txt | 33 ---- gamedata/sdktools.games/game.hl2mp.txt | 18 -- gamedata/sdktools.games/game.obsidian.txt | 27 --- gamedata/sdktools.games/game.pvkii.txt | 15 -- gamedata/sdktools.games/game.rnlbeta.txt | 27 --- gamedata/sdktools.games/game.synergy.txt | 33 ---- gamedata/sdktools.games/game.tf.txt | 18 -- gamedata/sdktools.games/game.zpanic.txt | 33 ---- plugins/include/sdktools_functions.inc | 2 +- 33 files changed, 169 insertions(+), 833 deletions(-) diff --git a/AMBuildScript b/AMBuildScript index 74260bab..2a6b2863 100644 --- a/AMBuildScript +++ b/AMBuildScript @@ -299,6 +299,7 @@ class SM: paths.append(['game_shared']) else: paths.append(['public', 'game', 'server']) + paths.append(['public', 'toolframework']) paths.append(['game', 'shared']) paths.append(['common']) diff --git a/extensions/sdktools/Makefile b/extensions/sdktools/Makefile index a6c87085..3f86af0b 100644 --- a/extensions/sdktools/Makefile +++ b/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 diff --git a/extensions/sdktools/extension.cpp b/extensions/sdktools/extension.cpp index bf204a6f..1d89fb0e 100644 --- a/extensions/sdktools/extension.cpp +++ b/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 *enginePatch = NULL; SourceHook::CallClass *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); diff --git a/extensions/sdktools/extension.h b/extensions/sdktools/extension.h index a6e3036b..fb88331a 100644 --- a/extensions/sdktools/extension.h +++ b/extensions/sdktools/extension.h @@ -51,6 +51,10 @@ #include #include +#if SOURCE_ENGINE >= SE_ORANGEBOX +#include +#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; diff --git a/extensions/sdktools/msvc9/sdktools.vcproj b/extensions/sdktools/msvc9/sdktools.vcproj index cee2d5cf..e87d8df1 100644 --- a/extensions/sdktools/msvc9/sdktools.vcproj +++ b/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" diff --git a/extensions/sdktools/vnatives.cpp b/extensions/sdktools/vnatives.cpp index f626cf2f..34bf4ac7 100644 --- a/extensions/sdktools/vnatives.cpp +++ b/extensions/sdktools/vnatives.cpp @@ -40,6 +40,7 @@ #include #include #include "iserver.h" +#include SourceHook::List g_RegCalls; SourceHook::List 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) { diff --git a/gamedata/sdktools.games/engine.bgt.txt b/gamedata/sdktools.games/engine.bgt.txt index fbabe9f2..dd4d2fd8 100644 --- a/gamedata/sdktools.games/engine.bgt.txt +++ b/gamedata/sdktools.games/engine.bgt.txt @@ -45,38 +45,6 @@ } } - /* Create Entity Signatures */ - "#default" - { - "Signatures" - { - "DispatchSpawn" - { - "library" "server" - "windows" "\x53\x55\x56\x8B\x74\x24\x10\x85\xF6\x57\x0F\x84\x2A\x2A\x2A\x2A\x8B\x1D\x2A\x2A\x2A\x2A\x8B\x03\x8B\x50\x64\x8B\xCB" - } - "CreateEntityByName" - { - "library" "server" - "windows" "\x56\x8B\x74\x24\x0C\x83\xFE\xFF\x57\x8B\x7C\x24\x0C\x74\x27\x8B\x0D\x2A\x2A\x2A\x2A\x8B\x01\x8B\x50\x54\x56\xFF\xD2" - } - } - } - - /* CGlobalEntityList */ - "#default" - { - "Signatures" - { - /* Functions in CGlobalEntityList */ - "FindEntityByClassname" - { - "library" "server" - "windows" "\x53\x55\x56\x8B\xF1\x8B\x2A\x2A\x2A\x85\xC9\x57\x74\x2A\x8B\x01\x8B\x50\x2A\xFF\xD2\x8B\x00\x25\xFF\x0F\x00\x00\x83\xC0\x2A\xC1\xE0\x2A\x8B\x3C\x30\xEB\x2A\x8B\xBE\x2A\x2A\x2A\x2A\x85\xFF\x74\x2A\x8B\x2A\x2A\x2A\x8B\x2A\x2A\x2A\x2A\x2A\xEB\x2A\x8D\x2A\x2A\x8B\x37\x85\xF6\x75\x2A\x68\x2A\x2A\x2A\x2A\xFF\x2A\x83\xC4\x2A\xEB\x2A\x39" - } - } - } - /* General GameRules */ "#default" { @@ -231,18 +199,6 @@ { "windows" "42" } - "DispatchKeyValue" - { - "windows" "37" - } - "DispatchKeyValueFloat" - { - "windows" "36" - } - "DispatchKeyValueVector" - { - "windows" "35" - } "SetEntityModel" { "windows" "31" diff --git a/gamedata/sdktools.games/engine.ep2.txt b/gamedata/sdktools.games/engine.ep2.txt index 88e212a4..4511aebf 100644 --- a/gamedata/sdktools.games/engine.ep2.txt +++ b/gamedata/sdktools.games/engine.ep2.txt @@ -66,57 +66,6 @@ } } } - - /* Create Entity Signatures */ - "#default" - { - "#supported" - { - "game" "ageofchivalry" - "game" "pvkii" - "game" "fistful_of_frags" - "game" "cspromod" - } - - "Signatures" - { - "DispatchSpawn" - { - "library" "server" - "linux" "@_Z13DispatchSpawnP11CBaseEntity" - "windows" "\x53\x55\x56\x8B\x74\x24\x10\x85\xF6\x57\x0F\x84\x2A\x2A\x2A\x2A\x8B\x1D\x2A\x2A\x2A\x2A\x8B\x03\x8B\x50\x64\x8B\xCB" - } - "CreateEntityByName" - { - "library" "server" - "linux" "@_Z18CreateEntityByNamePKci" - "windows" "\x56\x8B\x74\x24\x0C\x83\xFE\xFF\x57\x8B\x7C\x24\x0C\x74\x27\x8B\x0D\x2A\x2A\x2A\x2A\x8B\x01\x8B\x50\x54\x56\xFF\xD2" - } - } - } - - /* CGlobalEntityList */ - "#default" - { - "#supported" - { - "game" "ageofchivalry" - "game" "pvkii" - "game" "fistful_of_frags" - "game" "cspromod" - } - - "Signatures" - { - /* Functions in CGlobalEntityList */ - "FindEntityByClassname" - { - "library" "server" - "windows" "\x53\x55\x56\x8B\xF1\x8B\x4C\x24\x10\x85\xC9\x57\x74\x19\x8B\x01\x8B\x50\x08\xFF\xD2\x8B\x00\x25\xFF\x0F\x00\x00\x83\xC0\x01\xC1\xE0\x04\x8B\x3C\x30\xEB\x06\x8B\xBE\x2A\x2A\x2A\x2A\x85\xFF\x74\x39\x8B\x5C\x24\x18\x8B\x2D\x2A\x2A\x2A\x2A\xEB\x03" - "linux" "@_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc" - } - } - } /* General GameRules */ "#default" diff --git a/gamedata/sdktools.games/engine.ep2valve.txt b/gamedata/sdktools.games/engine.ep2valve.txt index c183016e..f479df1e 100644 --- a/gamedata/sdktools.games/engine.ep2valve.txt +++ b/gamedata/sdktools.games/engine.ep2valve.txt @@ -65,60 +65,6 @@ } } } - - /* Create Entity Signatures */ - "#default" - { - "#supported" - { - "game" "dod" - "game" "tf" - "game" "cstrike" - "game" "hl2mp" - } - - "Signatures" - { - "DispatchSpawn" - { - "library" "server" - "linux" "@_Z13DispatchSpawnP11CBaseEntity" - "mac" "@_Z13DispatchSpawnP11CBaseEntity" - "windows" "\x53\x55\x56\x8B\x74\x24\x10\x85\xF6\x57\x0F\x84\x2A\x2A\x2A\x2A\x8B\x1D\x2A\x2A\x2A\x2A\x8B\x03\x8B\x50\x64\x8B\xCB" - } - "CreateEntityByName" - { - "library" "server" - "linux" "@_Z18CreateEntityByNamePKci" - "mac" "@_Z18CreateEntityByNamePKci" - "windows" "\x56\x8B\x74\x24\x0C\x83\xFE\xFF\x57\x8B\x7C\x24\x0C\x74\x27\x8B\x0D\x2A\x2A\x2A\x2A\x8B\x01\x8B\x50\x54\x56\xFF\xD2" - } - } - } - - /* CGlobalEntityList */ - "#default" - { - "#supported" - { - "game" "dod" - "game" "tf" - "game" "cstrike" - "game" "hl2mp" - } - - "Signatures" - { - /* Functions in CGlobalEntityList */ - "FindEntityByClassname" - { - "library" "server" - "windows" "\x53\x55\x56\x8B\xF1\x8B\x4C\x24\x10\x85\xC9\x57\x74\x19\x8B\x01\x8B\x50\x08\xFF\xD2\x8B\x00\x25\xFF\x0F\x00\x00\x83\xC0\x01\xC1\xE0\x04\x8B\x3C\x30\xEB\x06\x8B\xBE\x2A\x2A\x2A\x2A\x85\xFF\x74\x39\x8B\x5C\x24\x18\x8B\x2D\x2A\x2A\x2A\x2A\xEB\x03" - "linux" "@_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc" - "mac" "@_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc" - } - } - } /* General GameRules */ "#default" diff --git a/gamedata/sdktools.games/engine.l4d.txt b/gamedata/sdktools.games/engine.l4d.txt index dc9d31d4..362e1f70 100644 --- a/gamedata/sdktools.games/engine.l4d.txt +++ b/gamedata/sdktools.games/engine.l4d.txt @@ -72,54 +72,6 @@ } } } - - /* Create Entity Signatures */ - "#default" - { - "#supported" - { - "game" "left4dead" - } - - "Signatures" - { - "DispatchSpawn" - { - "library" "server" - "linux" "@_Z13DispatchSpawnP11CBaseEntity" - "mac" "@_Z13DispatchSpawnP11CBaseEntity" - "windows" "\x53\x55\x56\x8B\x74\x24\x10\x85\xF6\x57\x0F\x84\x2A\x2A\x2A\x2A\x8B\x1D\x2A\x2A\x2A\x2A\x8B\x03\x8B\x50\x64\x8B\xCB" - } - "CreateEntityByName" - { - "library" "server" - "linux" "@_Z18CreateEntityByNamePKcib" - "mac" "@_Z18CreateEntityByNamePKcib" - "windows" "\x56\x8B\x74\x24\x0C\x83\xFE\xFF\x57\x8B\x7C\x24\x0C\x74\x27\x8B\x0D\x2A\x2A\x2A\x2A\x8B\x01\x8B\x50\x54\x56\xFF\xD2" - } - } - } - - /* CGlobalEntityList */ - "#default" - { - "#supported" - { - "game" "left4dead" - } - - "Signatures" - { - /* Functions in CGlobalEntityList */ - "FindEntityByClassname" - { - "library" "server" - "windows" "\x53\x55\x56\x8B\xF1\x8B\x4C\x24\x10\x85\xC9\x57\x74\x19\x8B\x01\x8B\x50\x08\xFF\xD2\x8B\x00\x25\xFF\x0F\x00\x00\x83\xC0\x01\xC1\xE0\x04\x8B\x3C\x30\xEB\x06\x8B\xBE\x2A\x2A\x2A\x2A\x85\xFF\x74\x39\x8B\x5C\x24\x18\x8B\x2D\x2A\x2A\x2A\x2A\xEB\x03" - "linux" "@_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc" - "mac" "@_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc" - } - } - } /* General GameRules */ "#default" @@ -330,24 +282,6 @@ "linux" "38" "mac" "38" } - "DispatchKeyValue" - { - "windows" "29" - "linux" "28" - "mac" "28" - } - "DispatchKeyValueFloat" - { - "windows" "28" - "linux" "29" - "mac" "29" - } - "DispatchKeyValueVector" - { - "windows" "27" - "linux" "30" - "mac" "30" - } "SetEntityModel" { "windows" "23" diff --git a/gamedata/sdktools.games/engine.l4d2.txt b/gamedata/sdktools.games/engine.l4d2.txt index 681f690c..57388f5e 100644 --- a/gamedata/sdktools.games/engine.l4d2.txt +++ b/gamedata/sdktools.games/engine.l4d2.txt @@ -72,54 +72,6 @@ } } } - - /* Create Entity Signatures */ - "#default" - { - "#supported" - { - "game" "left4dead2" - } - - "Signatures" - { - "DispatchSpawn" - { - "library" "server" - "linux" "@_Z13DispatchSpawnP11CBaseEntityb" - "mac" "@_Z13DispatchSpawnP11CBaseEntityb" - "windows" "\x53\x55\x56\x8B\x74\x24\x10\x85\xF6\x57\x0F\x84\x2A\x2A\x2A\x2A\x8B\x1D\x2A\x2A\x2A\x2A\x8B\x03\x8B\x50\x2A\x8B\xCB" - } - "CreateEntityByName" - { - "library" "server" - "linux" "@_Z18CreateEntityByNamePKcib" - "mac" "@_Z18CreateEntityByNamePKcib" - "windows" "\x56\x8B\x74\x24\x0C\x83\xFE\xFF\x57\x8B\x7C\x24\x0C\x74\x27\x8B\x0D\x2A\x2A\x2A\x2A\x8B\x01\x8B\x50\x2A\x56\xFF\xD2" - } - } - } - - /* CGlobalEntityList */ - "#default" - { - "#supported" - { - "game" "left4dead2" - } - - "Signatures" - { - /* Functions in CGlobalEntityList */ - "FindEntityByClassname" - { - "library" "server" - "windows" "\x53\x55\x56\x8B\xF1\x8B\x4C\x24\x10\x85\xC9\x57\x74\x19\x8B\x01\x8B\x50\x08\xFF\xD2\x8B\x00\x25\xFF\x0F\x00\x00\x83\xC0\x01\xC1\xE0\x04\x8B\x3C\x30\xEB\x06\x8B\xBE\x2A\x2A\x2A\x2A\x85\xFF\x74\x39\x8B\x5C\x24\x18\x8B\x2D\x2A\x2A\x2A\x2A\xEB\x03" - "linux" "@_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc" - "mac" "@_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc" - } - } - } /* General GameRules */ "#default" @@ -333,24 +285,6 @@ "linux" "44" "mac" "44" } - "DispatchKeyValue" - { - "windows" "33" - "linux" "32" - "mac" "32" - } - "DispatchKeyValueFloat" - { - "windows" "32" - "linux" "33" - "mac" "33" - } - "DispatchKeyValueVector" - { - "windows" "31" - "linux" "34" - "mac" "34" - } "SetEntityModel" { "windows" "26" diff --git a/gamedata/sdktools.games/engine.swarm.txt b/gamedata/sdktools.games/engine.swarm.txt index 0afc823b..c28f8d97 100644 --- a/gamedata/sdktools.games/engine.swarm.txt +++ b/gamedata/sdktools.games/engine.swarm.txt @@ -50,50 +50,6 @@ } } } - - /* Create Entity Signatures */ - "#default" - { - "#supported" - { - "game" "swarm" - "game" "dinodday" - } - - "Signatures" - { - "DispatchSpawn" - { - "library" "server" - "windows" "\x53\x55\x56\x8B\x74\x24\x10\x85\xF6\x57\x0F\x84\x2A\x2A\x2A\x2A\x8B\x1D\x2A\x2A\x2A\x2A\x8B\x03\x8B\x50\x2A\x8B\xCB" - } - "CreateEntityByName" - { - "library" "server" - "windows" "\x56\x8B\x74\x24\x0C\x83\xFE\xFF\x57\x8B\x7C\x24\x0C\x74\x27\x8B\x0D\x2A\x2A\x2A\x2A\x8B\x01\x8B\x50\x2A\x56\xFF\xD2" - } - } - } - - /* CGlobalEntityList */ - "#default" - { - "#supported" - { - "game" "swarm" - "game" "dinodday" - } - - "Signatures" - { - /* Functions in CGlobalEntityList */ - "FindEntityByClassname" - { - "library" "server" - "windows" "\x53\x55\x56\x8B\xF1\x8B\x4C\x24\x10\x85\xC9\x57\x74\x2E\x8B\x01\x8B\x50\x08\xFF\xD2\x8B\x00\x83\xF8\xFF\x75\x10\xB8\xFF\x1F\x00\x00\x83\xC0\x01\xC1\xE0\x04\x8B\x3C\x30\xEB\x16\x25\xFF\xFF\x00\x00\x83\xC0\x01\xC1\xE0\x04\x8B\x3C\x30\xEB\x06\x8B\xBE\x2A\x2A\x2A\x2A\x85\xFF\x74\x34\x8B" - } - } - } /* General GameRules */ "#default" diff --git a/gamedata/sdktools.games/game.alienswarm.txt b/gamedata/sdktools.games/game.alienswarm.txt index 86369b47..fdc32667 100644 --- a/gamedata/sdktools.games/game.alienswarm.txt +++ b/gamedata/sdktools.games/game.alienswarm.txt @@ -29,18 +29,6 @@ { "windows" "39" } - "DispatchKeyValue" - { - "windows" "34" - } - "DispatchKeyValueFloat" - { - "windows" "33" - } - "DispatchKeyValueVector" - { - "windows" "31" - } "SetEntityModel" { "windows" "26" diff --git a/gamedata/sdktools.games/game.aoc.txt b/gamedata/sdktools.games/game.aoc.txt index f50eaea9..0c42b64a 100644 --- a/gamedata/sdktools.games/game.aoc.txt +++ b/gamedata/sdktools.games/game.aoc.txt @@ -66,21 +66,6 @@ "windows" "34" "linux" "35" } - "DispatchKeyValue" - { - "windows" "29" - "linux" "28" - } - "DispatchKeyValueFloat" - { - "windows" "28" - "linux" "29" - } - "DispatchKeyValueVector" - { - "windows" "27" - "linux" "30" - } "SetEntityModel" { "windows" "23" diff --git a/gamedata/sdktools.games/game.bg2.txt b/gamedata/sdktools.games/game.bg2.txt index b2bdca33..44018928 100644 --- a/gamedata/sdktools.games/game.bg2.txt +++ b/gamedata/sdktools.games/game.bg2.txt @@ -66,21 +66,6 @@ "windows" "34" "linux" "35" } - "DispatchKeyValue" - { - "windows" "29" - "linux" "28" - } - "DispatchKeyValueFloat" - { - "windows" "28" - "linux" "29" - } - "DispatchKeyValueVector" - { - "windows" "27" - "linux" "30" - } "SetEntityModel" { "windows" "23" diff --git a/gamedata/sdktools.games/game.cspromod.txt b/gamedata/sdktools.games/game.cspromod.txt index 70ce2bf7..fabdcfb1 100644 --- a/gamedata/sdktools.games/game.cspromod.txt +++ b/gamedata/sdktools.games/game.cspromod.txt @@ -55,31 +55,16 @@ "windows" "34" "linux" "35" } - "DispatchKeyValue" + "WeaponEquip" { - "windows" "29" - "linux" "28" - } - "DispatchKeyValueFloat" - { - "windows" "28" - "linux" "29" - } - "DispatchKeyValueVector" - { - "windows" "27" - "linux" "30" + "windows" "230" + "linux" "231" } "SetEntityModel" { "windows" "23" "linux" "24" } - "WeaponEquip" - { - "windows" "230" - "linux" "231" - } "Activate" { "windows" "31" diff --git a/gamedata/sdktools.games/game.cstrike.txt b/gamedata/sdktools.games/game.cstrike.txt index 398165f0..0c4a8ba5 100644 --- a/gamedata/sdktools.games/game.cstrike.txt +++ b/gamedata/sdktools.games/game.cstrike.txt @@ -84,24 +84,6 @@ "linux" "36" "mac" "36" } - "DispatchKeyValue" - { - "windows" "30" - "linux" "29" - "mac" "29" - } - "DispatchKeyValueFloat" - { - "windows" "29" - "linux" "30" - "mac" "30" - } - "DispatchKeyValueVector" - { - "windows" "28" - "linux" "31" - "mac" "31" - } "SetEntityModel" { "windows" "23" diff --git a/gamedata/sdktools.games/game.dinodday.txt b/gamedata/sdktools.games/game.dinodday.txt index 5e12ff8e..62bd5c18 100644 --- a/gamedata/sdktools.games/game.dinodday.txt +++ b/gamedata/sdktools.games/game.dinodday.txt @@ -45,18 +45,6 @@ { "windows" "39" } - "DispatchKeyValue" - { - "windows" "34" - } - "DispatchKeyValueFloat" - { - "windows" "33" - } - "DispatchKeyValueVector" - { - "windows" "31" - } "SetEntityModel" { "windows" "26" diff --git a/gamedata/sdktools.games/game.dod.txt b/gamedata/sdktools.games/game.dod.txt index 36e65751..edbc1e99 100644 --- a/gamedata/sdktools.games/game.dod.txt +++ b/gamedata/sdktools.games/game.dod.txt @@ -76,24 +76,6 @@ "linux" "36" "mac" "36" } - "DispatchKeyValue" - { - "windows" "30" - "linux" "29" - "mac" "29" - } - "DispatchKeyValueFloat" - { - "windows" "29" - "linux" "30" - "mac" "30" - } - "DispatchKeyValueVector" - { - "windows" "28" - "linux" "31" - "mac" "31" - } "SetEntityModel" { "windows" "23" diff --git a/gamedata/sdktools.games/game.dystopia.txt b/gamedata/sdktools.games/game.dystopia.txt index 12a6dc13..e078674c 100644 --- a/gamedata/sdktools.games/game.dystopia.txt +++ b/gamedata/sdktools.games/game.dystopia.txt @@ -68,21 +68,6 @@ "windows" "35" "linux" "36" } - "DispatchKeyValue" - { - "windows" "31" - "linux" "30" - } - "DispatchKeyValueFloat" - { - "windows" "30" - "linux" "31" - } - "DispatchKeyValueVector" - { - "windows" "29" - "linux" "32" - } "SetEntityModel" { "windows" "25" diff --git a/gamedata/sdktools.games/game.empires.txt b/gamedata/sdktools.games/game.empires.txt index cdfda3f8..667db44b 100644 --- a/gamedata/sdktools.games/game.empires.txt +++ b/gamedata/sdktools.games/game.empires.txt @@ -62,21 +62,6 @@ "windows" "128" "linux" "129" } - "DispatchKeyValue" - { - "windows" "29" - "linux" "28" - } - "DispatchKeyValueFloat" - { - "windows" "28" - "linux" "29" - } - "DispatchKeyValueVector" - { - "windows" "27" - "linux" "30" - } "AcceptInput" { "windows" "34" @@ -116,24 +101,6 @@ "library" "server" "windows" "\x55\x8B\xEC\x8B\xC1\x8B\x2A\x2A\xC7\x2A\x2A\x2A\x2A\x2A\x89\x2A\x2A\x8B\x15\x2A\x2A\x2A\x2A\x89" } - "DispatchSpawn" - { - "library" "server" - "windows" "\x55\x8B\xEC\x51\x53\x56\x8B\x75\x2A\x57\x85\xF6\x0F\x2A\x2A\x2A\x2A\x2A\x8B\x2A\x2A\x2A\x2A\x2A\x8B\x2A\x8B" - "linux" "@_Z13DispatchSpawnP11CBaseEntity" - } - "CreateEntityByName" - { - "library" "server" - "windows" "\x55\x8B\xEC\x56\x8B\x2A\x2A\x57\x8B\x2A\x2A\x83\x2A\x2A\x74\x2A\x8B\x2A\x2A\x2A\x2A\x2A\x8B\x01\x8B\x50\x2A\x56\xFF\xD2" - "linux" "@_Z18CreateEntityByNamePKci" - } - "FindEntityByClassname" - { - "library" "server" - "windows" "\x55\x8B\xEC\x53\x56\x8B\xF1\x8B\x2A\x2A\x57\x85\xC9\x74\x2A\x8B\x01\x8B\x50\x2A\xFF\xD2\x8B\x00\x25\x2A\x2A\x2A\x2A\x40\x03\xC0\x8B\x3C\xC6\xEB\x2A\x8B\xBE\x2A\x2A\x2A\x2A\x85\xFF\x74\x2A\x8B\x5D\x2A\x8B\x37\x85\xF6\x75\x2A\x68\x2A\x2A\x2A\x2A\xFF\x2A\x2A\x2A\x2A\x2A\x83\xC4\x2A\xEB\x11\x39" - "linux" "@_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc" - } "FireOutput" { "library" "server" diff --git a/gamedata/sdktools.games/game.fas.txt b/gamedata/sdktools.games/game.fas.txt index ecea16b9..e8b21e83 100644 --- a/gamedata/sdktools.games/game.fas.txt +++ b/gamedata/sdktools.games/game.fas.txt @@ -62,21 +62,6 @@ "windows" "122" "linux" "123" } - "DispatchKeyValue" - { - "windows" "29" - "linux" "28" - } - "DispatchKeyValueFloat" - { - "windows" "28" - "linux" "29" - } - "DispatchKeyValueVector" - { - "windows" "27" - "linux" "30" - } "AcceptInput" { "windows" "34" @@ -105,24 +90,6 @@ } "Signatures" { - "DispatchSpawn" - { - "library" "server" - "windows" "\x53\x55\x56\x8B\x74\x24\x10\x57\x85\xF6\x0F\x84\x2A\x2A\x2A\x2A\x8B\x1D\x2A\x2A\x2A\x2A\x8B\x03\x8B\x50\x64\x8B\xCB" - "linux" "@_Z13DispatchSpawnP11CBaseEntity" - } - "CreateEntityByName" - { - "library" "server" - "windows" "\x56\x8B\x74\x24\x0C\x57\x8B\x7C\x24\x0C\x83\xFE\xFF\x74\x27\x8B\x0D\x2A\x2A\x2A\x2A\x8B\x01\x8B\x50\x54\x56\xFF\xD2" - "linux" "@_Z18CreateEntityByNamePKci" - } - "FindEntityByClassname" - { - "library" "server" - "windows" "\x53\x55\x56\x8B\xF1\x8B\x4C\x24\x10\x57\x85\xC9\x74\x2A\x8B\x01\x8B\x50\x08\xFF\xD2\x8B\x00\x25\xFF\x0F\x00\x00\x40\xC1\xE0\x04\x8B\x3C\x30\xEB\x06\x8B\xBE\x2A\x2A\x2A\x2A\x85\xFF\x74\x2A\x8B\x5C\x24\x18\x8B\x2D\x2A\x2A\x2A\x2A\x8D\xA4\x24\x00\x00\x00\x00\x8B\x37\x85\xF6\x75\x2A\x68\x2A\x2A\x2A\x2A\xFF\x2A\x83\xC4\x04\xEB\x2A\x39\x2A\x2A\x74\x2A\x53" - "linux" "@_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc" - } "FireOutput" { "library" "server" diff --git a/gamedata/sdktools.games/game.fof.txt b/gamedata/sdktools.games/game.fof.txt index 9a57be05..3317f218 100644 --- a/gamedata/sdktools.games/game.fof.txt +++ b/gamedata/sdktools.games/game.fof.txt @@ -61,21 +61,6 @@ "windows" "34" "linux" "35" } - "DispatchKeyValue" - { - "windows" "29" - "linux" "28" - } - "DispatchKeyValueFloat" - { - "windows" "28" - "linux" "29" - } - "DispatchKeyValueVector" - { - "windows" "27" - "linux" "30" - } "SetEntityModel" { "windows" "23" diff --git a/gamedata/sdktools.games/game.garrysmod.txt b/gamedata/sdktools.games/game.garrysmod.txt index 223f797a..1d072da3 100644 --- a/gamedata/sdktools.games/game.garrysmod.txt +++ b/gamedata/sdktools.games/game.garrysmod.txt @@ -76,24 +76,6 @@ "linux" "36" "mac" "36" } - "DispatchKeyValue" - { - "windows" "30" - "linux" "29" - "mac" "29" - } - "DispatchKeyValueFloat" - { - "windows" "29" - "linux" "30" - "mac" "30" - } - "DispatchKeyValueVector" - { - "windows" "28" - "linux" "31" - "mac" "31" - } "SetEntityModel" { "windows" "23" @@ -121,27 +103,6 @@ } "Signatures" { - "DispatchSpawn" - { - "library" "server" - "windows" "\x53\x55\x56\x8B\x74\x24\x10\x57\x85\xF6\x0F\x84\x2A\x2A\x2A\x2A\x8B\x1D\x2A\x2A\x2A\x2A\x8B\x03\x8B\x50\x64\x8B\xCB" - "linux" "@_Z13DispatchSpawnP11CBaseEntity" - "mac" "@_Z13DispatchSpawnP11CBaseEntity" - } - "CreateEntityByName" - { - "library" "server" - "windows" "\x53\x8B\x2A\x2A\x2A\x56\x8B\x2A\x2A\x2A\x57\x83\xFE\xFF\x74\x2A\x8B\x0D\x2A\x2A\x2A\x2A\x8B" - "linux" "@_Z18CreateEntityByNamePKci" - "mac" "@_Z18CreateEntityByNamePKci" - } - "FindEntityByClassname" - { - "library" "server" - "windows" "\x53\x55\x56\x8B\xF1\x8B\x4C\x24\x10\x57\x85\xC9\x74\x2A\x8B\x01\x8B\x50\x08\xFF\xD2\x8B\x00\x25\xFF\x0F\x00\x00\x40\xC1\xE0\x04\x8B\x3C\x30\xEB\x06\x8B\xBE\x2A\x2A\x2A\x2A\x85\xFF\x74\x2A\x8B\x5C\x24\x18\x8B\x2D\x2A\x2A\x2A\x2A\x8D\xA4\x24\x00\x00\x00\x00\x8B\x37\x85\xF6\x75\x2A\x68\x2A\x2A\x2A\x2A\xFF\x2A\x83\xC4\x04\xEB\x2A\x39\x2A\x2A\x74\x2A\x53" - "linux" "@_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc" - "mac" "@_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc" - } "FireOutput" { "library" "server" diff --git a/gamedata/sdktools.games/game.gesource.txt b/gamedata/sdktools.games/game.gesource.txt index bde66fae..2434e105 100644 --- a/gamedata/sdktools.games/game.gesource.txt +++ b/gamedata/sdktools.games/game.gesource.txt @@ -54,21 +54,6 @@ "windows" "34" "linux" "35" } - "DispatchKeyValue" - { - "windows" "29" - "linux" "28" - } - "DispatchKeyValueFloat" - { - "windows" "28" - "linux" "29" - } - "DispatchKeyValueVector" - { - "windows" "27" - "linux" "30" - } "SetEntityModel" { "windows" "23" @@ -101,24 +86,6 @@ "library" "server" "windows" "\x55\x8B\xEC\x8B\xC1\x8B\x2A\x2A\xC7\x2A\x2A\x2A\x2A\x2A\x89\x2A\x2A\x8B\x15\x2A\x2A\x2A\x2A\x89" } - "FindEntityByClassname" - { - "library" "server" - "windows" "\x55\x8B\xEC\x53\x56\x8B\xF1\x8B\x2A\x2A\x57\x85\xC9\x74\x2A\x8B\x01\x8B\x50\x2A\xFF\xD2\x8B\x00\x25\xFF\x0F\x00\x00\x40\xC1\xE0\x2A\x8B\x3C\x30\xEB\x2A\x8B\xBE\x2A\x2A\x2A\x2A\x85\xFF\x74\x2A\x8B\x5D\x2A\x8B\x37\x85\xF6\x75\x2A\x68\x2A\x2A\x2A\x2A\xFF\x2A\x2A\x2A\x2A\x2A\x83\xC4\x2A\xEB\x2A\x39" - "linux" "@_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc" - } - "CreateEntityByName" - { - "library" "server" - "linux" "@_Z18CreateEntityByNamePKci" - "windows" "\x55\x8B\xEC\x56\x8B\x2A\x2A\x57\x8B\x2A\x2A\x83\x2A\x2A\x74\x2A\x8B\x2A\x2A\x2A\x2A\x2A\x8B\x01\x8B\x50\x2A\x56\xFF\xD2" - } - "DispatchSpawn" - { - "library" "server" - "linux" "@_Z13DispatchSpawnP11CBaseEntity" - "windows" "\x55\x8B\xEC\x51\x53\x56\x8B\x75\x2A\x57\x85\xF6\x0F\x2A\x2A\x2A\x2A\x2A\x8B\x2A\x2A\x2A\x2A\x2A\x8B\x2A\x8B" - } "FireOutput" { "library" "server" diff --git a/gamedata/sdktools.games/game.hl2mp.txt b/gamedata/sdktools.games/game.hl2mp.txt index 944d4664..8d9fe51d 100644 --- a/gamedata/sdktools.games/game.hl2mp.txt +++ b/gamedata/sdktools.games/game.hl2mp.txt @@ -76,24 +76,6 @@ "linux" "36" "mac" "36" } - "DispatchKeyValue" - { - "windows" "30" - "linux" "29" - "mac" "29" - } - "DispatchKeyValueFloat" - { - "windows" "29" - "linux" "30" - "mac" "30" - } - "DispatchKeyValueVector" - { - "windows" "28" - "linux" "31" - "mac" "31" - } "SetEntityModel" { "windows" "23" diff --git a/gamedata/sdktools.games/game.obsidian.txt b/gamedata/sdktools.games/game.obsidian.txt index 80f098c0..f4121c7f 100644 --- a/gamedata/sdktools.games/game.obsidian.txt +++ b/gamedata/sdktools.games/game.obsidian.txt @@ -56,18 +56,6 @@ { "windows" "34" } - "DispatchKeyValue" - { - "windows" "29" - } - "DispatchKeyValueFloat" - { - "windows" "28" - } - "DispatchKeyValueVector" - { - "windows" "27" - } "SetEntityModel" { "windows" "23" @@ -114,21 +102,6 @@ "library" "server" "windows" "\x55\x8B\xEC\x8B\xC1\x8B\x2A\x2A\xC7\x2A\x2A\x2A\x2A\x2A\x89\x2A\x2A\x8B\x15\x2A\x2A\x2A\x2A\x89" } - "DispatchSpawn" - { - "library" "server" - "windows" "\x55\x8B\xEC\x51\x53\x56\x8B\x75\x2A\x57\x85\xF6\x0F\x2A\x2A\x2A\x2A\x2A\x8B\x2A\x2A\x2A\x2A\x2A\x8B\x2A\x8B" - } - "CreateEntityByName" - { - "library" "server" - "windows" "\x55\x8B\xEC\x56\x8B\x2A\x2A\x57\x8B\x2A\x2A\x83\x2A\x2A\x74\x2A\x8B\x2A\x2A\x2A\x2A\x2A\x8B\x01\x8B\x50\x2A\x56\xFF\xD2" - } - "FindEntityByClassname" - { - "library" "server" - "windows" "\x55\x8B\xEC\x53\x56\x8B\xF1\x8B\x2A\x2A\x57\x85\xC9\x74\x2A\x8B\x01\x8B\x50\x2A\xFF\xD2\x8B\x00\x25\x2A\x2A\x2A\x2A\x40\x03\xC0\x8B\x3C\xC6\xEB\x2A\x8B\xBE\x2A\x2A\x2A\x2A\x85\xFF\x74" - } "FireOutput" { "library" "server" diff --git a/gamedata/sdktools.games/game.pvkii.txt b/gamedata/sdktools.games/game.pvkii.txt index bae14852..cb2ad1b5 100644 --- a/gamedata/sdktools.games/game.pvkii.txt +++ b/gamedata/sdktools.games/game.pvkii.txt @@ -67,21 +67,6 @@ "windows" "35" "linux" "36" } - "DispatchKeyValue" - { - "windows" "29" - "linux" "28" - } - "DispatchKeyValueFloat" - { - "windows" "28" - "linux" "29" - } - "DispatchKeyValueVector" - { - "windows" "27" - "linux" "30" - } "SetEntityModel" { "windows" "24" diff --git a/gamedata/sdktools.games/game.rnlbeta.txt b/gamedata/sdktools.games/game.rnlbeta.txt index 565a36f4..c285d99d 100644 --- a/gamedata/sdktools.games/game.rnlbeta.txt +++ b/gamedata/sdktools.games/game.rnlbeta.txt @@ -45,18 +45,6 @@ { "windows" "34" } - "DispatchKeyValue" - { - "windows" "29" - } - "DispatchKeyValueFloat" - { - "windows" "28" - } - "DispatchKeyValueVector" - { - "windows" "27" - } "SetEntityModel" { "windows" "23" @@ -103,21 +91,6 @@ "library" "server" "windows" "\x55\x8B\xEC\x8B\xC1\x8B\x2A\x2A\xC7\x2A\x2A\x2A\x2A\x2A\x89\x2A\x2A\x8B\x15\x2A\x2A\x2A\x2A\x89" } - "DispatchSpawn" - { - "library" "server" - "windows" "\x55\x8B\xEC\x51\x53\x56\x8B\x75\x2A\x57\x85\xF6\x0F\x2A\x2A\x2A\x2A\x2A\x8B\x2A\x2A\x2A\x2A\x2A\x8B\x2A\x8B" - } - "CreateEntityByName" - { - "library" "server" - "windows" "\x55\x8B\xEC\x56\x8B\x2A\x2A\x57\x8B\x2A\x2A\x83\x2A\x2A\x74\x2A\x8B\x2A\x2A\x2A\x2A\x2A\x8B\x01\x8B\x50\x2A\x56\xFF\xD2" - } - "FindEntityByClassname" - { - "library" "server" - "windows" "\x55\x8B\xEC\x53\x56\x8B\xF1\x8B\x2A\x2A\x57\x85\xC9\x74\x2A\x8B\x01\x8B\x50\x2A\xFF\xD2\x8B\x00\x25\x2A\x2A\x2A\x2A\x40\x03\xC0\x8B\x3C\xC6\xEB\x2A\x8B\xBE\x2A\x2A\x2A\x2A\x85\xFF\x74" - } "FireOutput" { "library" "server" diff --git a/gamedata/sdktools.games/game.synergy.txt b/gamedata/sdktools.games/game.synergy.txt index 48662081..bb56289c 100644 --- a/gamedata/sdktools.games/game.synergy.txt +++ b/gamedata/sdktools.games/game.synergy.txt @@ -62,21 +62,6 @@ "windows" "122" "linux" "123" } - "DispatchKeyValue" - { - "windows" "29" - "linux" "28" - } - "DispatchKeyValueFloat" - { - "windows" "28" - "linux" "29" - } - "DispatchKeyValueVector" - { - "windows" "27" - "linux" "30" - } "AcceptInput" { "windows" "34" @@ -115,24 +100,6 @@ } "Signatures" { - "FindEntityByClassname" - { - "library" "server" - "windows" "\x53\x55\x56\x8B\xF1\x8B\x4C\x24\x10\x57\x85\xC9\x74\x2A\x8B\x01\x8B\x50\x08\xFF\xD2\x8B\x00\x25\xFF\x0F\x00\x00\x40\xC1\xE0\x04\x8B\x3C\x30\xEB\x06\x8B\xBE\x2A\x2A\x2A\x2A\x85\xFF\x74\x2A\x8B\x5C\x24\x18\x8B\x2D\x2A\x2A\x2A\x2A\x8D\xA4\x24\x00\x00\x00\x00\x8B\x37\x85\xF6\x75\x2A\x68\x2A\x2A\x2A\x2A\xFF\x2A\x83\xC4\x04\xEB\x2A\x39\x2A\x2A\x74\x2A\x53" - "linux" "@_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc" - } - "DispatchSpawn" - { - "library" "server" - "windows" "\x53\x55\x56\x8B\x74\x24\x10\x57\x85\xF6\x0F\x84\x2A\x2A\x2A\x2A\x8B\x1D\x2A\x2A\x2A\x2A\x8B\x03\x8B\x50\x64\x8B\xCB" - "linux" "@_Z13DispatchSpawnP11CBaseEntity" - } - "CreateEntityByName" - { - "library" "server" - "windows" "\x56\x8B\x74\x24\x0C\x57\x8B\x7C\x24\x0C\x83\xFE\xFF\x74\x27\x8B\x0D\x2A\x2A\x2A\x2A\x8B\x01\x8B\x50\x54\x56\xFF\xD2" - "linux" "@_Z18CreateEntityByNamePKci" - } "FireOutput" { "library" "server" diff --git a/gamedata/sdktools.games/game.tf.txt b/gamedata/sdktools.games/game.tf.txt index e8b2143e..2f604be0 100644 --- a/gamedata/sdktools.games/game.tf.txt +++ b/gamedata/sdktools.games/game.tf.txt @@ -70,24 +70,6 @@ "linux" "130" "mac" "130" } - "DispatchKeyValue" - { - "windows" "30" - "linux" "29" - "mac" "29" - } - "DispatchKeyValueFloat" - { - "windows" "29" - "linux" "30" - "mac" "30" - } - "DispatchKeyValueVector" - { - "windows" "28" - "linux" "31" - "mac" "31" - } "SetEntityModel" { "windows" "23" diff --git a/gamedata/sdktools.games/game.zpanic.txt b/gamedata/sdktools.games/game.zpanic.txt index 734e591f..9eddc6de 100644 --- a/gamedata/sdktools.games/game.zpanic.txt +++ b/gamedata/sdktools.games/game.zpanic.txt @@ -66,21 +66,6 @@ "windows" "35" "linux" "36" } - "DispatchKeyValue" - { - "windows" "30" - "linux" "29" - } - "DispatchKeyValueFloat" - { - "windows" "29" - "linux" "30" - } - "DispatchKeyValueVector" - { - "windows" "28" - "linux" "31" - } "SetEntityModel" { "windows" "24" @@ -104,24 +89,6 @@ } "Signatures" { - "FindEntityByClassname" - { - "library" "server" - "windows" "\x53\x55\x56\x8B\xF1\x8B\x2A\x2A\x2A\x57\x85\xC9\x74\x2A\x8B\x01\x8B\x50\x2A\xFF\xD2\x8B\x00\x25\xFF\x0F\x00\x00\x40\xC1\xE0\x2A\x8B\x3C\x30\xEB\x2A\x8B\xBE\x2A\x2A\x2A\x2A\x85\xFF\x74\x2A\x8B\x2A\x2A\x2A\x8B\x2A\x2A\x2A\x2A\x2A\x8D\x2A\x2A\x2A\x2A\x2A\x2A\x8B\x37\x85\xF6\x75\x2A\x68\x2A\x2A\x2A\x2A\xFF\x2A\x83\xC4\x2A\xEB\x2A\x39" - "linux" "@_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc" - } - "CreateEntityByName" - { - "library" "server" - "linux" "@_Z18CreateEntityByNamePKci" - "windows" "\x56\x8B\x74\x24\x2A\x57\x8B\x7C\x24\x2A\x83\xFE\xFF\x74\x2A\x8B\x0D\x2A\x2A\x2A\x2A\x8B\x01\x8B\x50\x2A\x56\xFF\xD2" - } - "DispatchSpawn" - { - "library" "server" - "linux" "@_Z13DispatchSpawnP11CBaseEntity" - "windows" "\x53\x55\x56\x8B\x74\x2A\x2A\x57\x85\xF6\x0F\x2A\x2A\x2A\x2A\x2A\x8B\x2A\x2A\x2A\x2A\x2A\x8B\x03\x8B\x50\x2A\x8B\xCB" - } "FireOutput" { "library" "server" diff --git a/plugins/include/sdktools_functions.inc b/plugins/include/sdktools_functions.inc index f3d5f8fa..dd0a6ab2 100644 --- a/plugins/include/sdktools_functions.inc +++ b/plugins/include/sdktools_functions.inc @@ -148,7 +148,7 @@ native bool:GetClientEyeAngles(client, Float:ang[3]); * invalid or there is already an edict using that index, it will error out. * * @param classname Entity classname. - * @param ForceEdictIndex Edict index used by the created entity. + * @param ForceEdictIndex Edict index used by the created entity (ignored on Orangebox and above). * @return Entity index on success, or -1 on failure. * @error Invalid edict index, or no mod support. */