Some AddMode fixes

[user/henk/code/inspircd.git] / src / inspircd.cpp

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 54243e807fccab83acb95f796959b534484683ea..8e8556331c0532b70e6232522b29e7ff0a6e66c0 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -338,7 +338,6 @@ InspIRCd::InspIRCd(int argc, char** argv)
        this->SNO = new SnomaskManager(this);
        this->TIME = this->OLDTIME = this->startup_time = time(NULL);
        this->time_delta = 0;
-       this->next_call = this->TIME + 3;
        srand(this->TIME);
 
        *this->LogFileName = 0;
@@ -615,14 +614,18 @@ int InspIRCd::Run()
                if (TIME != OLDTIME)
                {
                        if (TIME < OLDTIME)
+                       {
                                WriteOpers("*** \002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %d secs.",abs(OLDTIME-TIME));
+                       }
+
                        if ((TIME % 3600) == 0)
                        {
                                this->RehashUsersAndChans();
                                FOREACH_MOD_I(this, I_OnGarbageCollect, OnGarbageCollect());
                        }
+
                        Timers->TickTimers(TIME);
-                       this->DoBackgroundUserStuff(TIME);
+                       this->DoBackgroundUserStuff();
 
                        if ((TIME % 5) == 0)
                        {
@@ -690,7 +693,7 @@ void InspIRCd::BufferedSocketCull()
 /**********************************************************************************/
 
 /**
- * An ircd in four lines! bwahahaha. ahahahahaha. ahahah *cough*.
+ * An ircd in five lines! bwahahaha. ahahahahaha. ahahah *cough*.
  */
 
 int ircd(int argc, char ** argv)
@@ -702,20 +705,19 @@ int ircd(int argc, char ** argv)
        return 0;
 }
 
-#ifdef WINDOWS
-
 int main(int argc, char ** argv)
 {
-       ircd(argc,argv);
-       return 0;
-}
+       int retval = 0;
 
-#else
-int main(int argc, char** argv)
-{
-       return ircd(argc,argv);
+       #ifndef WINDOWS
+       // XXX No idea why this is windows only..
+       retval =
+       #endif
+               ircd(argc,argv);
+
+       return retval;
 }
-#endif
+
 
 /* this returns true when all modules are satisfied that the user should be allowed onto the irc server
  * (until this returns true, a user will block in the waiting state, waiting to connect up to the