diff -r ddefc8bfb9fa -r 1753f7a9b2f2 sourcemm/CPlugin.cpp --- a/sourcemm/CPlugin.cpp Sun May 22 04:33:58 2005 +0000 +++ b/sourcemm/CPlugin.cpp Thu May 26 08:06:23 2005 +0000 @@ -11,6 +11,7 @@ #include "CPlugin.h" #include "CSmmAPI.h" #include "sourcemm.h" +#include "concommands.h" /** * @brief Implements functions from CPlugin.h @@ -184,6 +185,23 @@ return false; } +CPluginManager::CPlugin *CPluginManager::FindByAPI(ISmmPlugin *api) +{ + PluginIter i; + + //don't find bad plugins! + if (!api) + return NULL; + + for (i=m_Plugins.begin(); i!=m_Plugins.end(); i++) + { + if ( (*i)->m_API == api ) + return (*i); + } + + return NULL; +} + CPluginManager::CPlugin *CPluginManager::_Load(const char *file, PluginId source, char *error, size_t maxlen) { FILE *fp; @@ -278,6 +296,8 @@ //Make sure to detach it from sourcehook! g_SourceHook.UnloadPlugin(pl->m_Id); + UnregAllConCmds(pl); + //Clean up the DLL dlclose(pl->m_Lib); pl->m_Lib = NULL; @@ -374,6 +394,8 @@ if ( (*i)->m_API->Unload(NULL, 0) ) status = false; + UnregAllConCmds( (*i) ); + //Unlink from SourceHook g_SourceHook.UnloadPlugin( (*i)->m_Id ); @@ -382,9 +404,9 @@ } delete (*i); } + } - i = m_Plugins.erase(i); - } + m_Plugins.clear(); return status; } @@ -413,3 +435,58 @@ { return m_Plugins.end(); } + +void CPluginManager::AddPluginCvar(ISmmPlugin *api, ConCommandBase *pCvar) +{ + CPlugin *pl = FindByAPI(api); + + if (!pl) + return; + + pl->m_Cvars.push_back(pCvar); +} + +void CPluginManager::AddPluginCmd(ISmmPlugin *api, ConCommandBase *pCmd) +{ + CPlugin *pl = FindByAPI(api); + + if (!pl) + return; + + pl->m_Cmds.push_back(pCmd); +} + +void CPluginManager::RemovePluginCvar(ISmmPlugin *api, ConCommandBase *pCvar) +{ + CPlugin *pl = FindByAPI(api); + + if (!pl) + return; + + pl->m_Cvars.remove(pCvar); +} + +void CPluginManager::RemovePluginCmd(ISmmPlugin *api, ConCommandBase *pCmd) +{ + CPlugin *pl = FindByAPI(api); + + if (!pl) + return; + + pl->m_Cmds.remove(pCmd); +} + +void CPluginManager::UnregAllConCmds(CPlugin *pl) +{ + std::list::iterator i; + + for (i=pl->m_Cvars.begin(); i!=pl->m_Cvars.end(); i++) + g_SMConVarAccessor.Unregister( (*i) ); + + pl->m_Cvars.clear(); + + for (i=pl->m_Cmds.begin(); i!=pl->m_Cmds.end(); i++) + g_SMConVarAccessor.Unregister( (*i) ); + + pl->m_Cmds.clear(); +}