diff -r 54ab41264c82 -r 5b906351da4d core-legacy/vsp_bridge.cpp --- a/core-legacy/vsp_bridge.cpp Mon Nov 24 03:30:52 2008 -0600 +++ b/core-legacy/vsp_bridge.cpp Mon Nov 24 03:50:12 2008 -0600 @@ -1,69 +1,69 @@ -#include -#include "sourcemm.h" -#include "concommands.h" -#include - -SH_DECL_HOOK0_void(ConCommand, Dispatch, SH_NOATTRIB, false); - -ConCommand *g_plugin_unload = NULL; -bool g_bIsTryingToUnload; -bool g_bIsBridgedAsVsp; - -void InterceptPluginUnloads() -{ - g_bIsTryingToUnload = true; -} - -void InterceptPluginUnloads_Post() -{ - g_bIsTryingToUnload = false; -} - -class VspBridge : public IVspBridge -{ - virtual bool Load(const vsp_bridge_info *info, char *error, size_t maxlength) - { - assert(!g_GameDll.loaded && !g_bIsBridgedAsVsp); - - CreateInterfaceFn engineFactory = (CreateInterfaceFn)info->engineFactory; - CreateInterfaceFn gsFactory = (CreateInterfaceFn)info->gsFactory; - - if (!AlternatelyLoadMetamod(engineFactory, gsFactory)) - return false; - - ConCommandBase *pBase = g_Engine.icvar->GetCommands(); - while (pBase != NULL) - { - if (pBase->IsCommand() && strcmp(pBase->GetName(), "plugin_unload") == 0) - { - g_plugin_unload = (ConCommand *)pBase; - break; - } - pBase = const_cast(pBase->GetNext()); - } - - if (g_plugin_unload != NULL) - { - SH_ADD_HOOK_STATICFUNC(ConCommand, Dispatch, g_plugin_unload, InterceptPluginUnloads, false); - SH_ADD_HOOK_STATICFUNC(ConCommand, Dispatch, g_plugin_unload, InterceptPluginUnloads_Post, true); - } - - extern ConVar metamod_version; - char buffer[255]; - - UTIL_Format(buffer, sizeof(buffer), "%sV", metamod_version.GetString()); - metamod_version.SetValue(buffer); - - g_bIsBridgedAsVsp = true; - g_pRealVspCallbacks = info->vsp_callbacks; - - g_PluginMngr.SetVSPAsLoaded(); - - return true; - } - - virtual void Unload() - { +#include +#include "sourcemm.h" +#include "concommands.h" +#include + +SH_DECL_HOOK0_void(ConCommand, Dispatch, SH_NOATTRIB, false); + +ConCommand *g_plugin_unload = NULL; +bool g_bIsTryingToUnload; +bool g_bIsBridgedAsVsp; + +void InterceptPluginUnloads() +{ + g_bIsTryingToUnload = true; +} + +void InterceptPluginUnloads_Post() +{ + g_bIsTryingToUnload = false; +} + +class VspBridge : public IVspBridge +{ + virtual bool Load(const vsp_bridge_info *info, char *error, size_t maxlength) + { + assert(!g_GameDll.loaded && !g_bIsBridgedAsVsp); + + CreateInterfaceFn engineFactory = (CreateInterfaceFn)info->engineFactory; + CreateInterfaceFn gsFactory = (CreateInterfaceFn)info->gsFactory; + + if (!AlternatelyLoadMetamod(engineFactory, gsFactory)) + return false; + + ConCommandBase *pBase = g_Engine.icvar->GetCommands(); + while (pBase != NULL) + { + if (pBase->IsCommand() && strcmp(pBase->GetName(), "plugin_unload") == 0) + { + g_plugin_unload = (ConCommand *)pBase; + break; + } + pBase = const_cast(pBase->GetNext()); + } + + if (g_plugin_unload != NULL) + { + SH_ADD_HOOK_STATICFUNC(ConCommand, Dispatch, g_plugin_unload, InterceptPluginUnloads, false); + SH_ADD_HOOK_STATICFUNC(ConCommand, Dispatch, g_plugin_unload, InterceptPluginUnloads_Post, true); + } + + extern ConVar metamod_version; + char buffer[255]; + + UTIL_Format(buffer, sizeof(buffer), "%sV", metamod_version.GetString()); + metamod_version.SetValue(buffer); + + g_bIsBridgedAsVsp = true; + g_pRealVspCallbacks = info->vsp_callbacks; + + g_PluginMngr.SetVSPAsLoaded(); + + return true; + } + + virtual void Unload() + { if (g_bIsTryingToUnload) { Error("Metamod:Source cannot be unloaded from VSP mode. Use \"meta unload\" to unload specific plugins.\n"); @@ -74,21 +74,21 @@ SH_REMOVE_HOOK_STATICFUNC(ConCommand, Dispatch, g_plugin_unload, InterceptPluginUnloads, false); SH_REMOVE_HOOK_STATICFUNC(ConCommand, Dispatch, g_plugin_unload, InterceptPluginUnloads_Post, true); g_plugin_unload = NULL; - } - g_SMConVarAccessor.UnloadMetamodCommands(); - UnloadMetamod(false); - } - - virtual const char *GetDescription() - { - return "Metamod:Source " SVN_FULL_VERSION; - } -}; - -VspBridge mm14_vsp_bridge; - -SMM_API IVspBridge * -GetVspBridge() -{ - return &mm14_vsp_bridge; -} + } + g_SMConVarAccessor.UnloadMetamodCommands(); + UnloadMetamod(false); + } + + virtual const char *GetDescription() + { + return "Metamod:Source " MMS_FULL_VERSION; + } +}; + +VspBridge mm14_vsp_bridge; + +SMM_API IVspBridge * +GetVspBridge() +{ + return &mm14_vsp_bridge; +}