1.1 --- a/extensions/sdktools/extension.cpp Sun Oct 14 21:51:30 2007 +0000
1.2 +++ b/extensions/sdktools/extension.cpp Sun Oct 14 22:12:46 2007 +0000
1.3 @@ -36,6 +36,12 @@
1.4 #include "vglobals.h"
1.5 #include "tempents.h"
1.6
1.7 +#if defined ORANGEBOX_BUILD
1.8 + #define SDKTOOLS_GAME_FILE "sdktools.games.ep2.txt"
1.9 +#else
1.10 + #define SDKTOOLS_GAME_FILE "sdktools.games"
1.11 +#endif
1.12 +
1.13 /**
1.14 * @file extension.cpp
1.15 * @brief Implements SDK Tools extension code.
1.16 @@ -55,6 +61,7 @@
1.17 IServerGameClients *serverClients = NULL;
1.18 IVoiceServer *voiceserver = NULL;
1.19 IPlayerInfoManager *playerinfomngr = NULL;
1.20 +ICvar *icvar = NULL;
1.21 HandleType_t g_CallHandle = 0;
1.22 HandleType_t g_TraceHandle = 0;
1.23
1.24 @@ -81,7 +88,7 @@
1.25
1.26 SM_GET_IFACE(GAMEHELPERS, g_pGameHelpers);
1.27
1.28 - if (!gameconfs->LoadGameConfigFile("sdktools.games", &g_pGameConf, error, maxlength))
1.29 + if (!gameconfs->LoadGameConfigFile(SDKTOOLS_GAME_FILE, &g_pGameConf, error, maxlength))
1.30 {
1.31 return false;
1.32 }
1.33 @@ -90,7 +97,10 @@
1.34 g_CallHandle = handlesys->CreateType("ValveCall", this, 0, NULL, NULL, myself->GetIdentity(), NULL);
1.35 g_TraceHandle = handlesys->CreateType("TraceRay", this, 0, NULL, NULL, myself->GetIdentity(), NULL);
1.36
1.37 - ConCommandBaseMgr::OneTimeInit(this);
1.38 +#if defined ORANGEBOX_BUILD
1.39 + g_pCVar = icvar;
1.40 +#endif
1.41 + CONVAR_REGISTER(this);
1.42
1.43 SH_ADD_HOOK_MEMFUNC(IServerGameDLL, LevelInit, gamedll, this, &SDKTools::LevelInit, true);
1.44
1.45 @@ -111,7 +121,7 @@
1.46
1.47 void SDKTools::SDK_OnUnload()
1.48 {
1.49 - List<ValveCall *>::iterator iter;
1.50 + SourceHook::List<ValveCall *>::iterator iter;
1.51 for (iter = g_RegCalls.begin();
1.52 iter != g_RegCalls.end();
1.53 iter++)
1.54 @@ -138,14 +148,15 @@
1.55
1.56 bool SDKTools::SDK_OnMetamodLoad(ISmmAPI *ismm, char *error, size_t maxlen, bool late)
1.57 {
1.58 - GET_V_IFACE_ANY(serverFactory, gameents, IServerGameEnts, INTERFACEVERSION_SERVERGAMEENTS);
1.59 - GET_V_IFACE_ANY(engineFactory, engsound, IEngineSound, IENGINESOUND_SERVER_INTERFACE_VERSION);
1.60 - GET_V_IFACE_ANY(engineFactory, enginetrace, IEngineTrace, INTERFACEVERSION_ENGINETRACE_SERVER);
1.61 - GET_V_IFACE_ANY(engineFactory, netstringtables, INetworkStringTableContainer, INTERFACENAME_NETWORKSTRINGTABLESERVER);
1.62 - GET_V_IFACE_ANY(engineFactory, pluginhelpers, IServerPluginHelpers, INTERFACEVERSION_ISERVERPLUGINHELPERS);
1.63 - GET_V_IFACE_ANY(serverFactory, serverClients, IServerGameClients, INTERFACEVERSION_SERVERGAMECLIENTS);
1.64 - GET_V_IFACE_ANY(engineFactory, voiceserver, IVoiceServer, INTERFACEVERSION_VOICESERVER);
1.65 - GET_V_IFACE_ANY(serverFactory, playerinfomngr, IPlayerInfoManager, INTERFACEVERSION_PLAYERINFOMANAGER);
1.66 + GET_V_IFACE_ANY(GetServerFactory, gameents, IServerGameEnts, INTERFACEVERSION_SERVERGAMEENTS);
1.67 + GET_V_IFACE_ANY(GetEngineFactory, engsound, IEngineSound, IENGINESOUND_SERVER_INTERFACE_VERSION);
1.68 + GET_V_IFACE_ANY(GetEngineFactory, enginetrace, IEngineTrace, INTERFACEVERSION_ENGINETRACE_SERVER);
1.69 + GET_V_IFACE_ANY(GetEngineFactory, netstringtables, INetworkStringTableContainer, INTERFACENAME_NETWORKSTRINGTABLESERVER);
1.70 + GET_V_IFACE_ANY(GetEngineFactory, pluginhelpers, IServerPluginHelpers, INTERFACEVERSION_ISERVERPLUGINHELPERS);
1.71 + GET_V_IFACE_ANY(GetServerFactory, serverClients, IServerGameClients, INTERFACEVERSION_SERVERGAMECLIENTS);
1.72 + GET_V_IFACE_ANY(GetEngineFactory, voiceserver, IVoiceServer, INTERFACEVERSION_VOICESERVER);
1.73 + GET_V_IFACE_ANY(GetServerFactory, playerinfomngr, IPlayerInfoManager, INTERFACEVERSION_PLAYERINFOMANAGER);
1.74 + GET_V_IFACE_CURRENT(GetEngineFactory, icvar, ICvar, CVAR_INTERFACE_VERSION);
1.75
1.76 return true;
1.77 }
1.78 @@ -178,7 +189,7 @@
1.79
1.80 void SDKTools::NotifyInterfaceDrop(SMInterface *pInterface)
1.81 {
1.82 - List<ValveCall *>::iterator iter;
1.83 + SourceHook::List<ValveCall *>::iterator iter;
1.84 for (iter = g_RegCalls.begin();
1.85 iter != g_RegCalls.end();
1.86 iter++)
1.87 @@ -200,7 +211,11 @@
1.88
1.89 bool SDKTools::RegisterConCommandBase(ConCommandBase *pVar)
1.90 {
1.91 +#if defined METAMOD_PLAPI_VERSION
1.92 + return g_SMAPI->RegisterConCommandBase(g_PLAPI, pVar);
1.93 +#else
1.94 return g_SMAPI->RegisterConCmdBase(g_PLAPI, pVar);
1.95 +#endif
1.96 }
1.97
1.98 bool SDKTools::LevelInit(char const *pMapName, char const *pMapEntities, char const *pOldLevel, char const *pLandmarkName, bool loadGame, bool background)
2.1 --- a/extensions/sdktools/extension.h Sun Oct 14 21:51:30 2007 +0000
2.2 +++ b/extensions/sdktools/extension.h Sun Oct 14 22:12:46 2007 +0000
2.3 @@ -46,6 +46,7 @@
2.4 #include <ivoiceserver.h>
2.5 #include <iplayerinfo.h>
2.6 #include <convar.h>
2.7 +#include <compat_wrappers.h>
2.8
2.9 /**
2.10 * @brief Implementation of the SDK Tools extension.
2.11 @@ -93,6 +94,7 @@
2.12 extern IServerGameClients *serverClients;
2.13 extern IVoiceServer *voiceserver;
2.14 extern IPlayerInfoManager *playerinfomngr;
2.15 +extern ICvar *icvar;
2.16 /* Interfaces from SourceMod */
2.17 extern IBinTools *g_pBinTools;
2.18 extern IGameConfig *g_pGameConf;
3.1 --- a/extensions/sdktools/msvc8/sdktools.vcproj Sun Oct 14 21:51:30 2007 +0000
3.2 +++ b/extensions/sdktools/msvc8/sdktools.vcproj Sun Oct 14 22:12:46 2007 +0000
3.3 @@ -202,8 +202,8 @@
3.4 <Tool
3.5 Name="VCCLCompilerTool"
3.6 Optimization="0"
3.7 - AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;$(HL2SDKOB)\public;$(HL2SDKOB)\public\dlls;$(HL2SDKOB)\public\engine;$(HL2SDKOB)\public\tier0;$(HL2SDKOB)\public\tier1;$(HL2SDKOB)\public\vstdlib;$(HL2SDKOB)\tier1;$(SOURCEMM);$(SOURCEMM)\sourcemm;$(SOURCEMM)\sourcehook"
3.8 - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD"
3.9 + AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;$(HL2SDKOB)\public;$(HL2SDKOB)\public\dlls;$(HL2SDKOB)\public\engine;$(HL2SDKOB)\public\tier0;$(HL2SDKOB)\public\tier1;$(HL2SDKOB)\public\vstdlib;$(HL2SDKOB)\tier1;$(SOURCEMM);$(SOURCEMM)\sourcemm;$(SOURCEMM)\sourcehook"
3.10 + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;ORANGEBOX_BUILD"
3.11 MinimalRebuild="true"
3.12 BasicRuntimeChecks="3"
3.13 RuntimeLibrary="1"
3.14 @@ -283,7 +283,7 @@
3.15 <Tool
3.16 Name="VCCLCompilerTool"
3.17 Optimization="0"
3.18 - AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;$(HL2SDK)\public;$(HL2SDK)\public\dlls;$(HL2SDK)\public\engine;$(HL2SDK)\public\tier0;$(HL2SDK)\public\tier1;$(HL2SDK)\public\vstdlib;$(HL2SDK)\tier1;$(SOURCEMM);$(SOURCEMM)\sourcemm;$(SOURCEMM)\sourcehook"
3.19 + AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;$(HL2SDK)\public;$(HL2SDK)\public\dlls;$(HL2SDK)\public\engine;$(HL2SDK)\public\tier0;$(HL2SDK)\public\tier1;$(HL2SDK)\public\vstdlib;$(HL2SDK)\tier1;$(SOURCEMM);$(SOURCEMM)\sourcemm;$(SOURCEMM)\sourcehook"
3.20 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD"
3.21 MinimalRebuild="true"
3.22 BasicRuntimeChecks="3"
3.23 @@ -364,7 +364,7 @@
3.24 <Tool
3.25 Name="VCCLCompilerTool"
3.26 Optimization="0"
3.27 - AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;$(HL2SDK)\public;$(HL2SDK)\public\dlls;$(HL2SDK)\public\engine;$(HL2SDK)\public\tier0;$(HL2SDK)\public\tier1;$(HL2SDK)\public\vstdlib;$(HL2SDK)\tier1;$(SOURCEMM142);$(SOURCEMM142)\sourcemm;$(SOURCEMM142)\sourcehook"
3.28 + AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;$(HL2SDK)\public;$(HL2SDK)\public\dlls;$(HL2SDK)\public\engine;$(HL2SDK)\public\tier0;$(HL2SDK)\public\tier1;$(HL2SDK)\public\vstdlib;$(HL2SDK)\tier1;$(SOURCEMM142);$(SOURCEMM142)\sourcemm;$(SOURCEMM142)\sourcehook"
3.29 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD"
3.30 MinimalRebuild="true"
3.31 BasicRuntimeChecks="3"
3.32 @@ -446,8 +446,8 @@
3.33 <Tool
3.34 Name="VCCLCompilerTool"
3.35 FavorSizeOrSpeed="1"
3.36 - AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;$(HL2SDKOB)\public;$(HL2SDKOB)\public\dlls;$(HL2SDKOB)\public\engine;$(HL2SDKOB)\public\tier0;$(HL2SDKOB)\public\tier1;$(HL2SDKOB)\public\vstdlib;$(HL2SDKOB)\tier1;$(SOURCEMM);$(SOURCEMM)\sourcemm;$(SOURCEMM)\sourcehook"
3.37 - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD"
3.38 + AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;$(HL2SDKOB)\public;$(HL2SDKOB)\public\dlls;$(HL2SDKOB)\public\engine;$(HL2SDKOB)\public\tier0;$(HL2SDKOB)\public\tier1;$(HL2SDKOB)\public\vstdlib;$(HL2SDKOB)\tier1;$(SOURCEMM);$(SOURCEMM)\sourcemm;$(SOURCEMM)\sourcehook"
3.39 + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;ORANGEBOX_BUILD"
3.40 RuntimeLibrary="0"
3.41 EnableEnhancedInstructionSet="1"
3.42 RuntimeTypeInfo="false"
3.43 @@ -527,7 +527,7 @@
3.44 <Tool
3.45 Name="VCCLCompilerTool"
3.46 FavorSizeOrSpeed="1"
3.47 - AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;$(HL2SDK)\public;$(HL2SDK)\public\dlls;$(HL2SDK)\public\engine;$(HL2SDK)\public\tier0;$(HL2SDK)\public\tier1;$(HL2SDK)\public\vstdlib;$(HL2SDK)\tier1;$(SOURCEMM);$(SOURCEMM)\sourcemm;$(SOURCEMM)\sourcehook"
3.48 + AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;$(HL2SDK)\public;$(HL2SDK)\public\dlls;$(HL2SDK)\public\engine;$(HL2SDK)\public\tier0;$(HL2SDK)\public\tier1;$(HL2SDK)\public\vstdlib;$(HL2SDK)\tier1;$(SOURCEMM);$(SOURCEMM)\sourcemm;$(SOURCEMM)\sourcehook"
3.49 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD"
3.50 RuntimeLibrary="0"
3.51 EnableEnhancedInstructionSet="1"
3.52 @@ -608,7 +608,7 @@
3.53 <Tool
3.54 Name="VCCLCompilerTool"
3.55 FavorSizeOrSpeed="1"
3.56 - AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;$(HL2SDK)\public;$(HL2SDK)\public\dlls;$(HL2SDK)\public\engine;$(HL2SDK)\public\tier0;$(HL2SDK)\public\tier1;$(HL2SDK)\public\vstdlib;$(HL2SDK)\tier1;$(SOURCEMM142);$(SOURCEMM142)\sourcemm;$(SOURCEMM142)\sourcehook"
3.57 + AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;$(HL2SDK)\public;$(HL2SDK)\public\dlls;$(HL2SDK)\public\engine;$(HL2SDK)\public\tier0;$(HL2SDK)\public\tier1;$(HL2SDK)\public\vstdlib;$(HL2SDK)\tier1;$(SOURCEMM142);$(SOURCEMM142)\sourcemm;$(SOURCEMM142)\sourcehook"
3.58 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD"
3.59 RuntimeLibrary="0"
3.60 EnableEnhancedInstructionSet="1"
4.1 --- a/extensions/sdktools/sdk/smsdk_ext.cpp Sun Oct 14 21:51:30 2007 +0000
4.2 +++ b/extensions/sdktools/sdk/smsdk_ext.cpp Sun Oct 14 22:12:46 2007 +0000
4.3 @@ -262,7 +262,7 @@
4.4 /** Exposes the extension to Metamod */
4.5 SMM_API void *PL_EXPOSURE(const char *name, int *code)
4.6 {
4.7 - if (name && !strcmp(name, PLAPI_NAME))
4.8 + if (name && !strcmp(name, METAMOD_PLAPI_NAME))
4.9 {
4.10 if (code)
4.11 {
4.12 @@ -283,8 +283,8 @@
4.13 {
4.14 PLUGIN_SAVEVARS();
4.15
4.16 - GET_V_IFACE_ANY(serverFactory, gamedll, IServerGameDLL, INTERFACEVERSION_SERVERGAMEDLL);
4.17 - GET_V_IFACE_CURRENT(engineFactory, engine, IVEngineServer, INTERFACEVERSION_VENGINESERVER);
4.18 + GET_V_IFACE_ANY(GetServerFactory, gamedll, IServerGameDLL, INTERFACEVERSION_SERVERGAMEDLL);
4.19 + GET_V_IFACE_CURRENT(GetEngineFactory, engine, IVEngineServer, INTERFACEVERSION_VENGINESERVER);
4.20
4.21 m_SourceMMLoaded = true;
4.22
5.1 --- a/extensions/sdktools/sdk/smsdk_ext.h Sun Oct 14 21:51:30 2007 +0000
5.2 +++ b/extensions/sdktools/sdk/smsdk_ext.h Sun Oct 14 22:12:46 2007 +0000
5.3 @@ -82,6 +82,10 @@
5.4 #include <eiface.h>
5.5 #endif
5.6
5.7 +#if !defined METAMOD_PLAPI_VERSION
5.8 +#include <metamod_wrappers.h>
5.9 +#endif
5.10 +
5.11 using namespace SourceMod;
5.12 using namespace SourcePawn;
5.13
6.1 --- a/extensions/sdktools/tempents.cpp Sun Oct 14 21:51:30 2007 +0000
6.2 +++ b/extensions/sdktools/tempents.cpp Sun Oct 14 22:12:46 2007 +0000
6.3 @@ -47,19 +47,22 @@
6.4
6.5 CON_COMMAND(sm_dump_teprops, "Dumps tempentity props to a file")
6.6 {
6.7 +#if !defined ORANGEBOX_BUILD
6.8 + CCommand args;
6.9 +#endif
6.10 if (!g_TEManager.IsAvailable())
6.11 {
6.12 META_CONPRINT("The tempent portion of SDKTools failed to load.\n");
6.13 META_CONPRINT("Check that you have the latest sdktools.games.txt file!\n");
6.14 return;
6.15 }
6.16 - int argc = engine->Cmd_Argc();
6.17 + int argc = args.ArgC();
6.18 if (argc < 2)
6.19 {
6.20 META_CONPRINT("Usage: sm_dump_teprops <file>\n");
6.21 return;
6.22 }
6.23 - const char *arg = engine->Cmd_Argv(1);
6.24 + const char *arg = args.Arg(1);
6.25 FILE *fp = NULL;
6.26 if (!arg || arg[0] == '\0' || ((fp = fopen(arg, "wt")) == NULL))
6.27 {
6.28 @@ -320,7 +323,7 @@
6.29 return;
6.30 }
6.31
6.32 - List<TempEntityInfo *>::iterator iter;
6.33 + SourceHook::List<TempEntityInfo *>::iterator iter;
6.34 for (iter=m_TEList.begin(); iter!=m_TEList.end(); iter++)
6.35 {
6.36 delete (*iter);
7.1 --- a/extensions/sdktools/tempents.h Sun Oct 14 21:51:30 2007 +0000
7.2 +++ b/extensions/sdktools/tempents.h Sun Oct 14 22:12:46 2007 +0000
7.3 @@ -38,8 +38,6 @@
7.4 #include <sh_string.h>
7.5 #include <stdio.h>
7.6
7.7 -using namespace SourceHook;
7.8 -
7.9 class TempEntityInfo
7.10 {
7.11 public:
7.12 @@ -61,7 +59,7 @@
7.13 private:
7.14 void *m_Me;
7.15 ServerClass *m_Sc;
7.16 - String m_Name;
7.17 + SourceHook::String m_Name;
7.18 };
7.19
7.20 class TempEntityManager
7.21 @@ -79,7 +77,7 @@
7.22 void DumpList();
7.23 void DumpProps(FILE *fp);
7.24 private:
7.25 - List<TempEntityInfo *> m_TEList;
7.26 + SourceHook::List<TempEntityInfo *> m_TEList;
7.27 IBasicTrie *m_TempEntInfo;
7.28 void *m_ListHead;
7.29 int m_NameOffs;
7.30 @@ -91,7 +89,7 @@
7.31 struct TEHookInfo
7.32 {
7.33 TempEntityInfo *te;
7.34 - List<IPluginFunction *> lst;
7.35 + SourceHook::List<IPluginFunction *> lst;
7.36 };
7.37
7.38 class TempEntHooks : public IPluginsListener
7.39 @@ -110,7 +108,7 @@
7.40 size_t _FillInPlayers(int *pl_array, IRecipientFilter *pFilter);
7.41 private:
7.42 IBasicTrie *m_TEHooks;
7.43 - List<TEHookInfo *> m_HookInfo;
7.44 + SourceHook::List<TEHookInfo *> m_HookInfo;
7.45 size_t m_HookCount;
7.46 };
7.47
8.1 --- a/extensions/sdktools/tenatives.cpp Sun Oct 14 21:51:30 2007 +0000
8.2 +++ b/extensions/sdktools/tenatives.cpp Sun Oct 14 22:12:46 2007 +0000
8.3 @@ -61,7 +61,7 @@
8.4 }
8.5
8.6 plsys->RemovePluginsListener(this);
8.7 - List<TEHookInfo *>::iterator iter;
8.8 + SourceHook::List<TEHookInfo *>::iterator iter;
8.9 for (iter=m_HookInfo.begin(); iter!=m_HookInfo.end(); iter++)
8.10 {
8.11 delete (*iter);
8.12 @@ -77,13 +77,13 @@
8.13
8.14 void TempEntHooks::OnPluginUnloaded(IPlugin *plugin)
8.15 {
8.16 - List<TEHookInfo *>::iterator iter = m_HookInfo.begin();
8.17 + SourceHook::List<TEHookInfo *>::iterator iter = m_HookInfo.begin();
8.18 IPluginContext *pContext = plugin->GetBaseContext();
8.19
8.20 /* For each hook list... */
8.21 while (iter != m_HookInfo.end())
8.22 {
8.23 - List<IPluginFunction *>::iterator f_iter = (*iter)->lst.begin();
8.24 + SourceHook::List<IPluginFunction *>::iterator f_iter = (*iter)->lst.begin();
8.25
8.26 /* Find the hooks on the given temp entity */
8.27 while (f_iter != (*iter)->lst.end())
8.28 @@ -177,7 +177,7 @@
8.29
8.30 if (m_TEHooks->Retrieve(name, reinterpret_cast<void **>(&pInfo)))
8.31 {
8.32 - List<IPluginFunction *>::iterator iter;
8.33 + SourceHook::List<IPluginFunction *>::iterator iter;
8.34 if ((iter=pInfo->lst.find(pFunc)) != pInfo->lst.end())
8.35 {
8.36 pInfo->lst.erase(iter);
8.37 @@ -205,7 +205,7 @@
8.38
8.39 if (m_TEHooks->Retrieve(name, reinterpret_cast<void **>(&pInfo)))
8.40 {
8.41 - List<IPluginFunction *>::iterator iter;
8.42 + SourceHook::List<IPluginFunction *>::iterator iter;
8.43 IPluginFunction *pFunc;
8.44 size_t size;
8.45 cell_t res = static_cast<ResultType>(Pl_Continue);
9.1 --- a/extensions/sdktools/vcallbuilder.h Sun Oct 14 21:51:30 2007 +0000
9.2 +++ b/extensions/sdktools/vcallbuilder.h Sun Oct 14 22:12:46 2007 +0000
9.3 @@ -37,22 +37,21 @@
9.4 #include "vdecoder.h"
9.5
9.6 using namespace SourceMod;
9.7 -using namespace SourceHook;
9.8
9.9 /**
9.10 * @brief Info necessary to call a Valve function
9.11 */
9.12 struct ValveCall
9.13 {
9.14 - ICallWrapper *call; /**< From IBinTools */
9.15 - ValveCallType type; /**< Call type */
9.16 - ValvePassInfo *vparams; /**< Valve parameter info */
9.17 - ValvePassInfo *retinfo; /**< Return buffer info */
9.18 - ValvePassInfo *thisinfo; /**< Thiscall info */
9.19 - size_t stackSize; /**< Stack size */
9.20 - size_t stackEnd; /**< End of the bintools stack */
9.21 - unsigned char *retbuf; /**< Return buffer */
9.22 - CStack<unsigned char *> stk; /**< Parameter stack */
9.23 + ICallWrapper *call; /**< From IBinTools */
9.24 + ValveCallType type; /**< Call type */
9.25 + ValvePassInfo *vparams; /**< Valve parameter info */
9.26 + ValvePassInfo *retinfo; /**< Return buffer info */
9.27 + ValvePassInfo *thisinfo; /**< Thiscall info */
9.28 + size_t stackSize; /**< Stack size */
9.29 + size_t stackEnd; /**< End of the bintools stack */
9.30 + unsigned char *retbuf; /**< Return buffer */
9.31 + SourceHook::CStack<unsigned char *> stk; /**< Parameter stack */
9.32
9.33 unsigned char *stk_get();
9.34 void stk_put(unsigned char *ptr);
10.1 --- a/extensions/sdktools/vcaller.cpp Sun Oct 14 21:51:30 2007 +0000
10.2 +++ b/extensions/sdktools/vcaller.cpp Sun Oct 14 22:12:46 2007 +0000
10.3 @@ -106,9 +106,9 @@
10.4 void *addrInBase = NULL;
10.5 if (params[1] == SDKLibrary_Server)
10.6 {
10.7 - addrInBase = (void *)g_SMAPI->serverFactory(false);
10.8 + addrInBase = (void *)g_SMAPI->GetServerFactory(false);
10.9 } else if (params[1] == SDKLibrary_Engine) {
10.10 - addrInBase = (void *)g_SMAPI->engineFactory(false);
10.11 + addrInBase = (void *)g_SMAPI->GetEngineFactory(false);
10.12 }
10.13 if (addrInBase == NULL)
10.14 {
11.1 --- a/extensions/sdktools/vnatives.cpp Sun Oct 14 21:51:30 2007 +0000
11.2 +++ b/extensions/sdktools/vnatives.cpp Sun Oct 14 22:12:46 2007 +0000
11.3 @@ -38,8 +38,8 @@
11.4 #include "vglobals.h"
11.5 #include "CellRecipientFilter.h"
11.6
11.7 -List<ValveCall *> g_RegCalls;
11.8 -List<ICallWrapper *> g_CallWraps;
11.9 +SourceHook::List<ValveCall *> g_RegCalls;
11.10 +SourceHook::List<ICallWrapper *> g_CallWraps;
11.11
11.12 inline void InitPass(ValvePassInfo &info, ValveType vtype, PassType type, unsigned int flags, unsigned int decflags=0)
11.13 {
11.14 @@ -331,7 +331,7 @@
11.15 return 1;
11.16 }
11.17
11.18 -static String *g_lightstyle[MAX_LIGHTSTYLES] = {NULL};
11.19 +static SourceHook::String *g_lightstyle[MAX_LIGHTSTYLES] = {NULL};
11.20 static cell_t SetLightStyle(IPluginContext *pContext, const cell_t *params)
11.21 {
11.22 int style = params[1];
11.23 @@ -347,7 +347,7 @@
11.24 * this or not on shutdown, but for ~4K of memory MAX, it doesn't seem worth it yet.
11.25 * So, it's a :TODO:!
11.26 */
11.27 - g_lightstyle[style] = new String();
11.28 + g_lightstyle[style] = new SourceHook::String();
11.29 }
11.30
11.31 char *str;
12.1 --- a/extensions/sdktools/vnatives.h Sun Oct 14 21:51:30 2007 +0000
12.2 +++ b/extensions/sdktools/vnatives.h Sun Oct 14 22:12:46 2007 +0000
12.3 @@ -34,7 +34,7 @@
12.4
12.5 #include <sh_list.h>
12.6
12.7 -extern List<ValveCall *> g_RegCalls;
12.8 +extern SourceHook::List<ValveCall *> g_RegCalls;
12.9 extern sp_nativeinfo_t g_Natives[];
12.10 extern sp_nativeinfo_t g_SoundNatives[];
12.11
13.1 --- a/extensions/sdktools/vstringtable.cpp Sun Oct 14 21:51:30 2007 +0000
13.2 +++ b/extensions/sdktools/vstringtable.cpp Sun Oct 14 22:12:46 2007 +0000
13.3 @@ -239,7 +239,11 @@
13.4 pContext->LocalToString(params[2], &str);
13.5 pContext->LocalToString(params[3], &userdata);
13.6
13.7 +#if defined ORANGEBOX_BUILD
13.8 + pTable->AddString(true, str, params[4], userdata);
13.9 +#else
13.10 pTable->AddString(str, params[4], userdata);
13.11 +#endif
13.12
13.13 return 1;
13.14 }
14.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
14.2 +++ b/gamedata/sdktools.games.ep2.txt Sun Oct 14 22:12:46 2007 +0000
14.3 @@ -0,0 +1,3 @@
14.4 +"Games"
14.5 +{
14.6 +}
14.7 \ No newline at end of file
