1.1 --- a/sourcemm/metamod.cpp Thu Sep 27 20:43:03 2007 +0000
1.2 +++ b/sourcemm/metamod.cpp Fri Sep 28 21:31:02 2007 +0000
1.3 @@ -33,7 +33,6 @@
1.4 * @brief Implementation of main SourceMM GameDLL functionality
1.5 * @file sourcemm.cpp
1.6 */
1.7 -IMetamodSourceProvider *provider = NULL;
1.8
1.9 SH_DECL_MANUALHOOK4(SGD_DLLInit, 0, 0, 0, bool, CreateInterfaceFn, CreateInterfaceFn, CreateInterfaceFn, CGlobalVars *);
1.10 SH_DECL_MANUALHOOK0(SGD_GameInit, 0, 0, 0, bool);
1.11 @@ -665,7 +664,7 @@
1.12
1.13 g_GameDllPatch = SH_GET_CALLCLASS(server);
1.14
1.15 - provider->Notify_DLLInit_Pre();
1.16 + provider->Notify_DLLInit_Pre(server, engineFactory, gamedll_info.factory);
1.17
1.18 metamod_version = provider->CreateConVar("metamod_version",
1.19 SOURCEMM_VERSION,
1.20 @@ -681,9 +680,6 @@
1.21 "Metamod:Source Plugins File",
1.22 ConVarFlag_SpOnly);
1.23
1.24 - provider->CreateCommand("meta", Command_Meta, "Metamod:Source Menu");
1.25 - provider->SetClientCommandHandler(Command_ClientMeta);
1.26 -
1.27 const char *pluginFile = provider->GetCommandLineValue("mm_pluginsfile", NULL);
1.28 if (!pluginFile)
1.29 {
1.30 @@ -1151,11 +1147,37 @@
1.31 {
1.32 if (provider->IsConCommandBaseACommand(pCommand))
1.33 {
1.34 - g_PluginMngr.AddPluginCmd(plugin, pCommand);
1.35 + g_PluginMngr.RemovePluginCmd(plugin, pCommand);
1.36 }
1.37 else
1.38 {
1.39 - g_PluginMngr.AddPluginCvar(plugin, pCommand);
1.40 + g_PluginMngr.RemovePluginCvar(plugin, pCommand);
1.41 + }
1.42 +
1.43 + PluginIter iter;
1.44 + CPluginManager::CPlugin *pPlugin;
1.45 + List<IMetamodListener *>::iterator event;
1.46 + IMetamodListener *pML;
1.47 + CPluginManager::CPlugin *pOrig = g_PluginMngr.FindByAPI(plugin);
1.48 + for (iter=g_PluginMngr._begin(); iter!=g_PluginMngr._end(); iter++)
1.49 + {
1.50 + pPlugin = (*iter);
1.51 + if (pPlugin->m_Status < Pl_Paused)
1.52 + {
1.53 + continue;
1.54 + }
1.55 + /* Only valid for plugins >= 12 (v1:6, SourceMM 1.5) */
1.56 + if (pPlugin->m_API->GetApiVersion() < 12)
1.57 + {
1.58 + continue;
1.59 + }
1.60 + for (event=pPlugin->m_Events.begin();
1.61 + event!=pPlugin->m_Events.end();
1.62 + event++)
1.63 + {
1.64 + pML = (*event);
1.65 + pML->OnUnlinkConCommandBase(pOrig ? pOrig->m_Id : 0, pCommand);
1.66 + }
1.67 }
1.68
1.69 return provider->UnregisterConCommandBase(pCommand);