Moved all time() calls in AGOS to a single new method AGOSEngine::getTime(); also replaced an evil function-static variable by a member variable (lastMinute)

svn-id: r29908

1 files changed, 5 insertions, 8 deletions

diff --git a/engines/agos/event.cpp b/engines/agos/event.cpp
index ad80b72926..5303e6db45 100644
--- a/engines/agos/event.cpp
+++ b/engines/agos/event.cpp
@@ -42,9 +42,7 @@ namespace AGOS {
 
 void AGOSEngine::addTimeEvent(uint16 timeout, uint16 subroutine_id) {
 	TimeEvent *te = (TimeEvent *)malloc(sizeof(TimeEvent)), *first, *last = NULL;
-	time_t cur_time;
-
-	time(&cur_time);
+	uint32 cur_time = getTime();
 
 	if (getGameId() == GID_DIMP) {
 		timeout /= 2;
@@ -52,7 +50,7 @@ void AGOSEngine::addTimeEvent(uint16 timeout, uint16 subroutine_id) {
 
 	te->time = cur_time + timeout - _gameStoppedClock;
 	if (getGameType() == GType_FF && _clockStopped)
-		te->time -= ((uint32)time(NULL) - _clockStopped);
+		te->time -= (getTime() - _clockStopped);
 	te->subroutine_id = subroutine_id;
 
 	first = _firstTimeStruct;
@@ -135,17 +133,16 @@ void AGOSEngine::killAllTimers() {
 }
 
 bool AGOSEngine::kickoffTimeEvents() {
-	time_t cur_time;
+	uint32 cur_time;
 	TimeEvent *te;
 	bool result = false;
 
 	if (getGameType() == GType_FF && _clockStopped)
 		return result;
 
-	time(&cur_time);
-	cur_time -= _gameStoppedClock;
+	cur_time = getTime() - _gameStoppedClock;
 
-	while ((te = _firstTimeStruct) != NULL && te->time <= (uint32)cur_time) {
+	while ((te = _firstTimeStruct) != NULL && te->time <= cur_time) {
 		result = true;
 		_pendingDeleteTimeEvent = te;
 		invokeTimeEvent(te);