aboutsummaryrefslogtreecommitdiff
path: root/engines/agos/event.cpp
diff options
context:
space:
mode:
authorMax Horn2009-04-22 12:57:23 +0000
committerMax Horn2009-04-22 12:57:23 +0000
commitab05e797157890f4f33c9b9e98c84174bd9bec22 (patch)
treed528537910c31b8f5d0a8e164a2f0303ea0e4adb /engines/agos/event.cpp
parent3591548003bb3df122c7ed840fb0afe78b9c3bec (diff)
downloadscummvm-rg350-ab05e797157890f4f33c9b9e98c84174bd9bec22.tar.gz
scummvm-rg350-ab05e797157890f4f33c9b9e98c84174bd9bec22.tar.bz2
scummvm-rg350-ab05e797157890f4f33c9b9e98c84174bd9bec22.zip
AGOS: Merged timerCallback and timerProc; removed checkTimerCallback declaration without implementation
svn-id: r40076
Diffstat (limited to 'engines/agos/event.cpp')
-rw-r--r--engines/agos/event.cpp10
1 files changed, 3 insertions, 7 deletions
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;