X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=c94f0884222aaf7b7b9e764ef4dcedc50e614023;hb=67de413cad88194972d55a8ff88464370890c5a9;hp=48746cb527498b338de692eaf4abb672f9f71340;hpb=54d10d53c730ab81ca6464fe2f0e0ecbcd435672;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 48746cb52..c94f08842 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -207,7 +207,7 @@ void InspIRCd::WritePID(const std::string &filename)
 #ifndef _WIN32
 	std::string fname(filename);
 	if (fname.empty())
-		fname = DATA_PATH "/inspircd.pid";
+		fname = ServerInstance->Config->Paths.PrependData("inspircd.pid");
 	std::ofstream outfile(fname.c_str());
 	if (outfile.is_open())
 	{
@@ -231,7 +231,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 	  * THIS MUST MATCH THE ORDER OF DECLARATION OF THE FUNCTORS, e.g. the methods
 	  * themselves within the class.
 	  */
-	 OperQuit("OperQuit", NULL),
+	 OperQuit("operquit", NULL),
 	 GenRandom(&HandleGenRandom),
 	 IsChannel(&HandleIsChannel),
 	 Rehash(&HandleRehash),
@@ -358,7 +358,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 
 	if (do_version)
 	{
-		std::cout << std::endl << VERSION << " r" << REVISION << std::endl;
+		std::cout << std::endl << VERSION << " " << REVISION << std::endl;
 		Exit(EXIT_STATUS_NOERROR);
 	}
 
@@ -701,7 +701,7 @@ void InspIRCd::Run()
 			if ((TIME.tv_sec % 3600) == 0)
 			{
 				Users->GarbageCollect();
-				FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect());
+				FOREACH_MOD(OnGarbageCollect, ());
 			}
 
 			Timers->TickTimers(TIME.tv_sec);
@@ -709,7 +709,7 @@ void InspIRCd::Run()
 
 			if ((TIME.tv_sec % 5) == 0)
 			{
-				FOREACH_MOD(I_OnBackgroundTimer,OnBackgroundTimer(TIME.tv_sec));
+				FOREACH_MOD(OnBackgroundTimer, (TIME.tv_sec));
 				SNO->FlushSnotices();
 			}
 		}