From ab05e797157890f4f33c9b9e98c84174bd9bec22 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 22 Apr 2009 12:57:23 +0000
Subject: AGOS: Merged timerCallback and timerProc; removed checkTimerCallback
 declaration without implementation

svn-id: r40076
---
 engines/agos/event.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'engines/agos/event.cpp')

diff --git a/engines/agos/event.cpp b/engines/agos/event.cpp
index 06322bfe07..ff3789c03f 100644
--- a/engines/agos/event.cpp
+++ b/engines/agos/event.cpp
@@ -451,7 +451,7 @@ void AGOSEngine::delay(uint amount) {
 				_lastVgaTick = cur;
 
 			_inCallBack = true;
-			timerCallback();
+			timerProc();
 			_inCallBack = false;
 		}
 
@@ -550,17 +550,13 @@ void AGOSEngine::delay(uint amount) {
 	} while (cur < start + amount && !shouldQuit());
 }
 
-void AGOSEngine_PuzzlePack::timerCallback() {
+void AGOSEngine_PuzzlePack::timerProc() {
 	_lastTickCount = _system->getMillis();
 
-	timerProc();
+	AGOSEngine_Feeble::timerProc();
 	dimpIdle();
 }
 
-void AGOSEngine::timerCallback() {
-	timerProc();
-}
-
 void AGOSEngine_Feeble::timerProc() {
 	if (_videoLockOut & 0x80E9 || _videoLockOut & 2)
 		return;
-- 
cgit v1.2.3