1.1 --- a/sourcemm/concommands.cpp Fri Jul 20 22:21:14 2007 +0000
1.2 +++ b/sourcemm/concommands.cpp Mon Jul 23 18:19:02 2007 +0000
1.3 @@ -57,18 +57,44 @@
1.4 }
1.5 }
1.6
1.7 -void SMConVarAccessor::Unregister(ConCommandBase *pCommand)
1.8 +void SMConVarAccessor::Unregister(PluginId id, ConCommandBase *pCommand)
1.9 {
1.10 + /* Notify via IMetamodListener */
1.11 + PluginIter iter;
1.12 + SourceMM::CPluginManager::CPlugin *pPlugin;
1.13 + SourceHook::List<IMetamodListener *>::iterator event;
1.14 + IMetamodListener *pML;
1.15 + for (iter=g_PluginMngr._begin(); iter!=g_PluginMngr._end(); iter++)
1.16 + {
1.17 + pPlugin = (*iter);
1.18 + if (pPlugin->m_Status < Pl_Paused)
1.19 + {
1.20 + continue;
1.21 + }
1.22 + /* Only valid for plugins >= 12 (v1:6, SourceMM 1.5) */
1.23 + if (pPlugin->m_API->GetApiVersion() < 12)
1.24 + {
1.25 + continue;
1.26 + }
1.27 + for (event=pPlugin->m_Events.begin();
1.28 + event!=pPlugin->m_Events.end();
1.29 + event++)
1.30 + {
1.31 + pML = (*event);
1.32 + pML->OnUnlinkConCommandBase(id, pCommand);
1.33 + }
1.34 + }
1.35 +
1.36 ICvar *cv = g_Engine.icvar;
1.37 ConCommandBase *ptr = cv->GetCommands();
1.38
1.39 if (ptr == pCommand)
1.40 {
1.41 - //first in list
1.42 + /* First in list */
1.43 g_EternalCommand.BringToFront();
1.44 g_EternalCommand.SetNext(const_cast<ConCommandBase *>(pCommand->GetNext()));
1.45 } else {
1.46 - //find us and unregister us
1.47 + /* Find us and unregister us */
1.48 ConCommandBase *pPrev = NULL;
1.49 while (ptr)
1.50 {
1.51 @@ -91,10 +117,10 @@
1.52 ConCommandBase *prev = NULL;
1.53 while (iter)
1.54 {
1.55 - // watch out for the ETERNAL COMMAND!
1.56 + /* Watch out for the ETERNAL COMMAND! */
1.57 if (iter != &g_EternalCommand && iter->IsBitSet(FCVAR_GAMEDLL))
1.58 {
1.59 - // Remove it!
1.60 + /* Remove it! */
1.61 if (iter == begin)
1.62 {
1.63 g_EternalCommand.BringToFront();