1.1 --- a/sourcemm/CPlugin.cpp Sun May 22 04:33:58 2005 +0000
1.2 +++ b/sourcemm/CPlugin.cpp Thu May 26 08:06:23 2005 +0000
1.3 @@ -11,6 +11,7 @@
1.4 #include "CPlugin.h"
1.5 #include "CSmmAPI.h"
1.6 #include "sourcemm.h"
1.7 +#include "concommands.h"
1.8
1.9 /**
1.10 * @brief Implements functions from CPlugin.h
1.11 @@ -184,6 +185,23 @@
1.12 return false;
1.13 }
1.14
1.15 +CPluginManager::CPlugin *CPluginManager::FindByAPI(ISmmPlugin *api)
1.16 +{
1.17 + PluginIter i;
1.18 +
1.19 + //don't find bad plugins!
1.20 + if (!api)
1.21 + return NULL;
1.22 +
1.23 + for (i=m_Plugins.begin(); i!=m_Plugins.end(); i++)
1.24 + {
1.25 + if ( (*i)->m_API == api )
1.26 + return (*i);
1.27 + }
1.28 +
1.29 + return NULL;
1.30 +}
1.31 +
1.32 CPluginManager::CPlugin *CPluginManager::_Load(const char *file, PluginId source, char *error, size_t maxlen)
1.33 {
1.34 FILE *fp;
1.35 @@ -278,6 +296,8 @@
1.36 //Make sure to detach it from sourcehook!
1.37 g_SourceHook.UnloadPlugin(pl->m_Id);
1.38
1.39 + UnregAllConCmds(pl);
1.40 +
1.41 //Clean up the DLL
1.42 dlclose(pl->m_Lib);
1.43 pl->m_Lib = NULL;
1.44 @@ -374,6 +394,8 @@
1.45 if ( (*i)->m_API->Unload(NULL, 0) )
1.46 status = false;
1.47
1.48 + UnregAllConCmds( (*i) );
1.49 +
1.50 //Unlink from SourceHook
1.51 g_SourceHook.UnloadPlugin( (*i)->m_Id );
1.52
1.53 @@ -382,9 +404,9 @@
1.54 }
1.55 delete (*i);
1.56 }
1.57 + }
1.58
1.59 - i = m_Plugins.erase(i);
1.60 - }
1.61 + m_Plugins.clear();
1.62
1.63 return status;
1.64 }
1.65 @@ -413,3 +435,58 @@
1.66 {
1.67 return m_Plugins.end();
1.68 }
1.69 +
1.70 +void CPluginManager::AddPluginCvar(ISmmPlugin *api, ConCommandBase *pCvar)
1.71 +{
1.72 + CPlugin *pl = FindByAPI(api);
1.73 +
1.74 + if (!pl)
1.75 + return;
1.76 +
1.77 + pl->m_Cvars.push_back(pCvar);
1.78 +}
1.79 +
1.80 +void CPluginManager::AddPluginCmd(ISmmPlugin *api, ConCommandBase *pCmd)
1.81 +{
1.82 + CPlugin *pl = FindByAPI(api);
1.83 +
1.84 + if (!pl)
1.85 + return;
1.86 +
1.87 + pl->m_Cmds.push_back(pCmd);
1.88 +}
1.89 +
1.90 +void CPluginManager::RemovePluginCvar(ISmmPlugin *api, ConCommandBase *pCvar)
1.91 +{
1.92 + CPlugin *pl = FindByAPI(api);
1.93 +
1.94 + if (!pl)
1.95 + return;
1.96 +
1.97 + pl->m_Cvars.remove(pCvar);
1.98 +}
1.99 +
1.100 +void CPluginManager::RemovePluginCmd(ISmmPlugin *api, ConCommandBase *pCmd)
1.101 +{
1.102 + CPlugin *pl = FindByAPI(api);
1.103 +
1.104 + if (!pl)
1.105 + return;
1.106 +
1.107 + pl->m_Cmds.remove(pCmd);
1.108 +}
1.109 +
1.110 +void CPluginManager::UnregAllConCmds(CPlugin *pl)
1.111 +{
1.112 + std::list<ConCommandBase *>::iterator i;
1.113 +
1.114 + for (i=pl->m_Cvars.begin(); i!=pl->m_Cvars.end(); i++)
1.115 + g_SMConVarAccessor.Unregister( (*i) );
1.116 +
1.117 + pl->m_Cvars.clear();
1.118 +
1.119 + for (i=pl->m_Cmds.begin(); i!=pl->m_Cmds.end(); i++)
1.120 + g_SMConVarAccessor.Unregister( (*i) );
1.121 +
1.122 + pl->m_Cmds.clear();
1.123 +}