diff -r bf93a1c52b0f -r b3db5c1dd016 sourcemm/metamod_plugins.cpp --- a/sourcemm/metamod_plugins.cpp Fri Sep 28 21:41:41 2007 +0000 +++ b/sourcemm/metamod_plugins.cpp Sat Sep 29 04:07:06 2007 +0000 @@ -489,6 +489,8 @@ //Make sure to detach it from sourcehook! g_SourceHook.UnloadPlugin(pl->m_Id); + pl->m_Events.clear(); + UnregAllConCmds(pl); //Clean up the DLL @@ -710,22 +712,19 @@ void CPluginManager::UnregAllConCmds(CPlugin *pl) { -#if 0 SourceHook::List::iterator i; /* :TODO: */ for (i=pl->m_Cvars.begin(); i!=pl->m_Cvars.end(); i++) { - g_SMConVarAccessor.Unregister(pl->m_Id, (*i) ); + g_Metamod.UnregisterConCommandBase(pl->m_Id, (*i) ); } - pl->m_Cvars.clear(); for (i=pl->m_Cmds.begin(); i!=pl->m_Cmds.end(); i++) { - g_SMConVarAccessor.Unregister(pl->m_Id, (*i) ); + g_Metamod.UnregisterConCommandBase(pl->m_Id, (*i) ); } + pl->m_Cmds.clear(); +} - pl->m_Cmds.clear(); -#endif -}