AGOS: Merged timerCallback and timerProc; removed checkTimerCallback declaration without implementation

svn-id: r40076

2 files changed, 4 insertions, 10 deletions

diff --git a/engines/agos/agos.h b/engines/agos/agos.h
index ad46860f38..1f7cb9ba1f 100644
--- a/engines/agos/agos.h
+++ b/engines/agos/agos.h
@@ -1192,7 +1192,6 @@ protected:
 	void openGameFile();
 	void readGameFile(void *dst, uint32 offs, uint32 size);
 
-	virtual void timerCallback();
 	virtual void timerProc();
 
 	virtual void animateSprites();
@@ -1244,7 +1243,6 @@ protected:
 	virtual void playMusic(uint16 music, uint16 track);
 	void stopMusic();
 
-	void checkTimerCallback();
 	void delay(uint delay);
 	void pause();
 
@@ -2051,7 +2049,7 @@ protected:
 	void loadMouseImage();
 
 	void dimpIdle();
-	virtual void timerCallback();
+	virtual void timerProc();
 
 	void startOverlayAnims();
 	void startAnOverlayAnim();
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;