ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

DIRECTOR: LINGO: Add version checks for more events

Browse Source
This commit is contained in:
djsrv
2020-06-29 12:50:37 -04:00
parent b43e1fdb13
commit dfc06bbe21
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/director/events.cpp
+1 -1
View File
@@ -161,7 +161,7 @@ void DirectorEngine::processEvents(bool bufferLingoEvents) {
g_system->updateScreen();
g_system->delayMillis(10);
if (sc->getCurrentFrame() > 0 && !sc->_stopPlay && _lingo->getEventCount() == 0)
if (getVersion() >= 3 && sc->getCurrentFrame() > 0 && !sc->_stopPlay && _lingo->getEventCount() == 0)
_lingo->registerEvent(kEventIdle);
if (!bufferLingoEvents)
engines/director/score.cpp
+8 -4
View File
@@ -385,7 +385,8 @@ void Score::startLoop() {
for (uint i = 0; i < _frames[1]->_sprites.size(); i++)
_channels.push_back(new Channel(_frames[1]->_sprites[i]));
_lingo->processEvent(kEventStartMovie);
if (_vm->getVersion() >= 3)
_lingo->processEvent(kEventStartMovie);
_maskSurface->clear(1);
while (!_stopPlay) {
@@ -416,7 +417,8 @@ void Score::startLoop() {
screenShot();
}
_lingo->processEvent(kEventStopMovie);
if (_vm->getVersion() >= 3)
_lingo->processEvent(kEventStopMovie);
_lingo->executePerFrameHook(-1, 0);
}
@@ -441,10 +443,12 @@ void Score::update() {
// of _nextFrame so it doesn't get wiped.
if (_vm->_skipFrameAdvance) {
uint16 nextFrameCache = _nextFrame;
_lingo->processEvent(kEventExitFrame);
if (_vm->getVersion() >= 4)
_lingo->processEvent(kEventExitFrame);
_nextFrame = nextFrameCache;
} else {
_lingo->processEvent(kEventExitFrame);
if (_vm->getVersion() >= 4)
_lingo->processEvent(kEventExitFrame);
}
// If there is a transition, the perFrameHook is called