core-legacy/sourcemm.cpp
changeset 548 dd85920ecaaf
parent 545 07e5df11f9fc
child 577 80120bac7719
     1.1 --- a/core-legacy/sourcemm.cpp	Sat Nov 15 21:10:13 2008 -0600
     1.2 +++ b/core-legacy/sourcemm.cpp	Sat Nov 15 21:13:38 2008 -0600
     1.3 @@ -68,7 +68,7 @@
     1.4  const char GAMEINFO_PATH[] = "|gameinfo_path|";
     1.5  IFileSystem *baseFs = NULL;
     1.6  bool g_bLevelChanged = false;
     1.7 -
     1.8 +IServerPluginCallbacks *g_pRealVspCallbacks = &g_VspListener;
     1.9  
    1.10  void ClearGamedllList();
    1.11  
    1.12 @@ -309,20 +309,13 @@
    1.13  bool GameInit_handler()
    1.14  {
    1.15  	if (bGameInit)
    1.16 -	{
    1.17  		RETURN_META_VALUE(MRES_IGNORED, true);
    1.18 -	}
    1.19  
    1.20 -	if (g_SmmAPI.VSPEnabled() && !g_VspListener.IsRootLoadMethod())
    1.21 -	{
    1.22 +	if (g_SmmAPI.VSPEnabled() && !g_bIsBridgedAsVsp)
    1.23  		g_SmmAPI.LoadAsVSP();
    1.24 -	}
    1.25  
    1.26 -	if (g_VspListener.IsRootLoadMethod())
    1.27 -	{
    1.28 +	if (g_bIsBridgedAsVsp)
    1.29  		DoInitialPluginLoads();
    1.30 -		//gaben
    1.31 -	}
    1.32  
    1.33  	bGameInit = true;
    1.34  
    1.35 @@ -354,8 +347,9 @@
    1.36  	/* We check these separately because we can't reply
    1.37  	 * unless our interface version really matches.
    1.38  	 */
    1.39 -	if ((strcmp(iface, VSPIFACE_002) == 0)
    1.40 -		|| strcmp(iface, VSPIFACE_001) == 0)
    1.41 +	if (!g_bIsBridgedAsVsp &&
    1.42 +		(strcmp(iface, VSPIFACE_002) == 0 ||
    1.43 +		 strcmp(iface, VSPIFACE_001) == 0))
    1.44  	{
    1.45  		if (ret)
    1.46  		{
    1.47 @@ -365,7 +359,7 @@
    1.48  	}
    1.49  
    1.50  	/* If we're a VSP, bypass this by default */
    1.51 -	if (g_VspListener.IsRootLoadMethod())
    1.52 +	if (g_bIsBridgedAsVsp)
    1.53  	{
    1.54  		IFACE_MACRO(g_GameDll.factory, GameDLL);
    1.55  	}