[Scummvm-cvs-logs] SF.net SVN: scummvm:[40076] scummvm/trunk/engines/agos
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Wed Apr 22 14:57:23 CEST 2009
Revision: 40076
http://scummvm.svn.sourceforge.net/scummvm/?rev=40076&view=rev
Author: fingolfin
Date: 2009-04-22 12:57:23 +0000 (Wed, 22 Apr 2009)
Log Message:
-----------
AGOS: Merged timerCallback and timerProc; removed checkTimerCallback declaration without implementation
Modified Paths:
--------------
scummvm/trunk/engines/agos/agos.h
scummvm/trunk/engines/agos/event.cpp
Modified: scummvm/trunk/engines/agos/agos.h
===================================================================
--- scummvm/trunk/engines/agos/agos.h 2009-04-22 12:44:58 UTC (rev 40075)
+++ scummvm/trunk/engines/agos/agos.h 2009-04-22 12:57:23 UTC (rev 40076)
@@ -1192,7 +1192,6 @@
void openGameFile();
void readGameFile(void *dst, uint32 offs, uint32 size);
- virtual void timerCallback();
virtual void timerProc();
virtual void animateSprites();
@@ -1244,7 +1243,6 @@
virtual void playMusic(uint16 music, uint16 track);
void stopMusic();
- void checkTimerCallback();
void delay(uint delay);
void pause();
@@ -2051,7 +2049,7 @@
void loadMouseImage();
void dimpIdle();
- virtual void timerCallback();
+ virtual void timerProc();
void startOverlayAnims();
void startAnOverlayAnim();
Modified: scummvm/trunk/engines/agos/event.cpp
===================================================================
--- scummvm/trunk/engines/agos/event.cpp 2009-04-22 12:44:58 UTC (rev 40075)
+++ scummvm/trunk/engines/agos/event.cpp 2009-04-22 12:57:23 UTC (rev 40076)
@@ -451,7 +451,7 @@
_lastVgaTick = cur;
_inCallBack = true;
- timerCallback();
+ timerProc();
_inCallBack = false;
}
@@ -550,17 +550,13 @@
} 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;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list