libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-20 17:03:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
svn-id: r40076
This commit is contained in:
Max Horn 2009-04-22 12:57:23 +00:00
parent 3591548003
commit ab05e79715
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/agos/agos.h
View File

@ -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();

10
engines/agos/event.cpp
View File

@ -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;