core-legacy/CPlugin.cpp
changeset 548 dd85920ecaaf
parent 545 07e5df11f9fc
child 663 e07fd1dc5290
child 664 a62858ce7114
     1.1 --- a/core-legacy/CPlugin.cpp	Sat Nov 15 21:10:13 2008 -0600
     1.2 +++ b/core-legacy/CPlugin.cpp	Sat Nov 15 21:13:38 2008 -0600
     1.3 @@ -210,7 +210,7 @@
     1.4  				continue;
     1.5  			}
     1.6  			(*event).got_vsp = true;
     1.7 -			(*event).event->OnVSPListening(&g_VspListener);
     1.8 +			(*event).event->OnVSPListening(g_pRealVspCallbacks);
     1.9  		}
    1.10  	}
    1.11  }
    1.12 @@ -406,8 +406,8 @@
    1.13  								//if (pl->m_API->GetApiVersion() >= 4)
    1.14  								pl->m_API->AllPluginsLoaded();
    1.15  							}
    1.16 -							if (g_VspListener.IsRootLoadMethod()
    1.17 -								|| (g_VspListener.IsLoaded() && g_SmmAPI.VSPEnabled()))
    1.18 +							if (g_bIsBridgedAsVsp ||
    1.19 +								(g_VspListener.IsLoaded() && g_SmmAPI.VSPEnabled()))
    1.20  							{
    1.21  								SourceHook::List<CPluginEventHandler>::iterator event;
    1.22  								for (event = pl->m_Events.begin();
    1.23 @@ -415,11 +415,9 @@
    1.24  									 event++)
    1.25  								{
    1.26  									if (pl->m_API->GetApiVersion() < 10 || (*event).got_vsp)
    1.27 -									{
    1.28  										continue;
    1.29 -									}
    1.30  									(*event).got_vsp = true;
    1.31 -									(*event).event->OnVSPListening(&g_VspListener);
    1.32 +									(*event).event->OnVSPListening(g_pRealVspCallbacks);
    1.33  								}
    1.34  							}
    1.35  						} else {