X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodmanager_static.cpp;h=321bf520dd7833ff7f5448a65e893ed2b94792c3;hb=67de413cad88194972d55a8ff88464370890c5a9;hp=23f30e1dffa46d795c6714b4fbbdd03dfe1225d5;hpb=645f7e18c64a6628ede880dc69bf8825ba93b375;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modmanager_static.cpp b/src/modmanager_static.cpp
index 23f30e1df..321bf520d 100644
--- a/src/modmanager_static.cpp
+++ b/src/modmanager_static.cpp
@@ -58,7 +58,7 @@ class AllModule : public Module
 			{
 				Command* c = (*i)(this);
 				cmds.push_back(c);
-				ServerInstance->AddCommand(c);
+				ServerInstance->Modules->AddService(*c);
 			}
 		}
 		catch (...)
@@ -93,14 +93,16 @@ bool ModuleManager::Load(const std::string& name, bool defer)
 		mod = (*it->second->init)();
 		mod->ModuleSourceFile = name;
 		mod->ModuleDLLManager = NULL;
+		mod->dying = false;
 		Modules[name] = mod;
 		if (defer)
 		{
-			ServerInstance->Logs->Log("MODULE", LOG_DEFAULT,"New module introduced: %s", name.c_str());
+			ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, "New module introduced: %s", name.c_str());
 			return true;
 		}
 		else
 		{
+			AttachAll(mod);
 			mod->init();
 		}
 	}
@@ -111,7 +113,7 @@ bool ModuleManager::Load(const std::string& name, bool defer)
 		ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, "Unable to load " + name + ": " + modexcept.GetReason());
 		return false;
 	}
-	FOREACH_MOD(I_OnLoadModule,OnLoadModule(mod));
+	FOREACH_MOD(OnLoadModule, (mod));
 	/* We give every module a chance to re-prioritize when we introduce a new one,
 	 * not just the one thats loading, as the new module could affect the preference
 	 * of others
@@ -183,6 +185,8 @@ void ModuleManager::LoadAll()
 {
 	Load("cmd_all", true);
 	Load("cmd_whowas.so", true);
+	Load("cmd_lusers.so", true);
+	Load("cmd_privmsg.so", true);
 
 	ConfigTagList tags = ServerInstance->Config->ConfTags("module");
 	for(ConfigIter i = tags.first; i != tags.second; ++i)
@@ -204,6 +208,7 @@ void ModuleManager::LoadAll()
 		Module* mod = i->second;
 		try
 		{
+			AttachAll(mod);
 			mod->init();
 		}
 		catch (CoreException& modexcept)