1.1 --- a/core-legacy/CPlugin.cpp Wed Oct 28 23:24:21 2009 -0700
1.2 +++ b/core-legacy/CPlugin.cpp Thu Oct 29 00:44:31 2009 -0700
1.3 @@ -37,6 +37,26 @@
1.4
1.5 CPluginManager g_PluginMngr;
1.6
1.7 +void NotifyConCommandBaseDrop(PluginId id, ConCommandBase *base)
1.8 +{
1.9 + CPluginManager::CPlugin *pl;
1.10 + SourceHook::List<CPluginEventHandler>::iterator event;
1.11 + IMetamodListener *api;
1.12 + for (PluginIter iter = g_PluginMngr._begin(); iter != g_PluginMngr._end(); iter++)
1.13 + {
1.14 + pl = (*iter);
1.15 + if (pl->m_Status < Pl_Paused)
1.16 + continue;
1.17 + if (pl->m_API->GetApiVersion() < 11)
1.18 + continue;
1.19 + for (event = pl->m_Events.begin(); event != pl->m_Events.end(); event++)
1.20 + {
1.21 + api = (*event).event;
1.22 + api->OnUnlinkConCommandBase(id, base);
1.23 + }
1.24 + }
1.25 +}
1.26 +
1.27 CPluginManager::CPluginManager()
1.28 {
1.29 m_LastId = Pl_MinId;
1.30 @@ -653,13 +673,19 @@
1.31 {
1.32 SourceHook::List<ConCommandBase *>::iterator i;
1.33
1.34 - for (i=pl->m_Cvars.begin(); i!=pl->m_Cvars.end(); i++)
1.35 - g_SMConVarAccessor.Unregister( (*i) );
1.36 + for (i = pl->m_Cvars.begin(); i != pl->m_Cvars.end(); i++)
1.37 + {
1.38 + NotifyConCommandBaseDrop(pl->m_Id, (*i));
1.39 + g_SMConVarAccessor.Unregister((*i));
1.40 + }
1.41
1.42 pl->m_Cvars.clear();
1.43
1.44 - for (i=pl->m_Cmds.begin(); i!=pl->m_Cmds.end(); i++)
1.45 - g_SMConVarAccessor.Unregister( (*i) );
1.46 + for (i = pl->m_Cmds.begin(); i != pl->m_Cmds.end(); i++)
1.47 + {
1.48 + NotifyConCommandBaseDrop(pl->m_Id, (*i));
1.49 + g_SMConVarAccessor.Unregister((*i));
1.50 + }
1.51
1.52 pl->m_Cmds.clear();
1.53 }