diff -r d43e4c343426 -r dd85920ecaaf core-legacy/sourcemm.cpp --- a/core-legacy/sourcemm.cpp Sat Nov 15 21:10:13 2008 -0600 +++ b/core-legacy/sourcemm.cpp Sat Nov 15 21:13:38 2008 -0600 @@ -68,7 +68,7 @@ const char GAMEINFO_PATH[] = "|gameinfo_path|"; IFileSystem *baseFs = NULL; bool g_bLevelChanged = false; - +IServerPluginCallbacks *g_pRealVspCallbacks = &g_VspListener; void ClearGamedllList(); @@ -309,20 +309,13 @@ bool GameInit_handler() { if (bGameInit) - { RETURN_META_VALUE(MRES_IGNORED, true); - } - if (g_SmmAPI.VSPEnabled() && !g_VspListener.IsRootLoadMethod()) - { + if (g_SmmAPI.VSPEnabled() && !g_bIsBridgedAsVsp) g_SmmAPI.LoadAsVSP(); - } - if (g_VspListener.IsRootLoadMethod()) - { + if (g_bIsBridgedAsVsp) DoInitialPluginLoads(); - //gaben - } bGameInit = true; @@ -354,8 +347,9 @@ /* We check these separately because we can't reply * unless our interface version really matches. */ - if ((strcmp(iface, VSPIFACE_002) == 0) - || strcmp(iface, VSPIFACE_001) == 0) + if (!g_bIsBridgedAsVsp && + (strcmp(iface, VSPIFACE_002) == 0 || + strcmp(iface, VSPIFACE_001) == 0)) { if (ret) { @@ -365,7 +359,7 @@ } /* If we're a VSP, bypass this by default */ - if (g_VspListener.IsRootLoadMethod()) + if (g_bIsBridgedAsVsp) { IFACE_MACRO(g_GameDll.factory, GameDLL); }