mirror of
https://github.com/alliedmodders/metamod-source.git
synced 2025-02-20 13:54:14 +01:00
Merge.
This commit is contained in:
commit
8fbb8ba7b1
@ -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;
|
||||
|
||||
|
@ -586,8 +586,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;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user