From cc2234ba88da7dd290c1b240970e275397a706c4 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 17 Feb 2009 13:58:25 -0500 Subject: [PATCH] Fixed "late" load parameter always being true in VSP mode (bug 3532, r=ds). --- core-legacy/sourcemm.cpp | 5 +++-- core/metamod.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core-legacy/sourcemm.cpp b/core-legacy/sourcemm.cpp index 8f8b5f8..5675da7 100644 --- a/core-legacy/sourcemm.cpp +++ b/core-legacy/sourcemm.cpp @@ -303,8 +303,6 @@ bool AlternatelyLoadMetamod(CreateInterfaceFn ifaceFactory, CreateInterfaceFn se return false; } - g_PluginMngr.SetAllLoaded(); - return true; } @@ -317,7 +315,10 @@ bool GameInit_handler() g_SmmAPI.LoadAsVSP(); if (g_bIsBridgedAsVsp) + { DoInitialPluginLoads(); + g_PluginMngr.SetAllLoaded(); + } g_bGameInit = true; diff --git a/core/metamod.cpp b/core/metamod.cpp index 2733e56..38c2eb5 100644 --- a/core/metamod.cpp +++ b/core/metamod.cpp @@ -577,8 +577,8 @@ Handler_LevelShutdown(void) { if (g_bIsVspBridged && !were_plugins_loaded) { - g_PluginMngr.SetAllLoaded(); DoInitialPluginLoads(); + g_PluginMngr.SetAllLoaded(); were_plugins_loaded = true; in_first_level = true; }