X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Ftimer.cpp;h=f9abf8114bbbbaa90a5b9272e521753b9e317865;hb=5b80dc83fdb6b7952e452a8eb2355005fdb5366c;hp=63c7b58747b793f01b98dde036bc2c05066913e8;hpb=04e4d646ea2b779e098cd3546fdf56620b4f74a6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/timer.cpp b/src/timer.cpp
index 63c7b5874..f9abf8114 100644
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -11,10 +11,12 @@
  * ---------------------------------------------------
  */
 
+/* $Core: libIRCDtimer */
+
 #include "inspircd.h"
 #include "timer.h"
 
-TimerManager::TimerManager() : CantDeleteHere(false)
+TimerManager::TimerManager(InspIRCd* Instance) : CantDeleteHere(false), ServerInstance(Instance)
 {
 }
 
@@ -33,7 +35,7 @@ void TimerManager::TickTimers(time_t TIME)
 		 */
 		for (timergroup::iterator y = x->begin(); y != x->end(); y++)
 		{
-			InspTimer* n = *y;
+			Timer* n = *y;
 			n->Tick(TIME);
 			if (n->GetRepeat())
 			{
@@ -52,7 +54,7 @@ void TimerManager::TickTimers(time_t TIME)
 	this->CantDeleteHere = false;
 }
 
-void TimerManager::DelTimer(InspTimer* T)
+void TimerManager::DelTimer(Timer* T)
 {
 	if (this->CantDeleteHere)
 	{
@@ -79,7 +81,7 @@ void TimerManager::DelTimer(InspTimer* T)
 		timergroup* x = found->second;
 		for (timergroup::iterator y = x->begin(); y != x->end(); y++)
 		{
-			InspTimer* n = *y;
+			Timer* n = *y;
 			if (n == T)
 			{
 				DELETE(n);
@@ -108,7 +110,7 @@ void TimerManager::TickMissedTimers(time_t TIME)
 		this->TickTimers(TIME);
 }
 
-void TimerManager::AddTimer(InspTimer* T, long secs_from_now)
+void TimerManager::AddTimer(Timer* T, long secs_from_now)
 {
 	timergroup* x = NULL;
 
@@ -116,7 +118,7 @@ void TimerManager::AddTimer(InspTimer* T, long secs_from_now)
 	if (!secs_from_now)
 		time_to_trigger = T->GetTimer();
 	else
-		time_to_trigger = secs_from_now + time(NULL);
+		time_to_trigger = secs_from_now + ServerInstance->Time();
 
 	timerlist::iterator found = Timers.find(time_to_trigger);