[Scummvm-cvs-logs] scummvm master -> c9a60233d587fd67ec00aeb494e8a7c1df4d2a3f

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
c9a60233d5 GROOVIE: More bugfixes for V2 puzzle overlay videos


Commit: c9a60233d587fd67ec00aeb494e8a7c1df4d2a3f
    https://github.com/scummvm/scummvm/commit/c9a60233d587fd67ec00aeb494e8a7c1df4d2a3f
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-11-04T12:40:08+02:00

Commit Message:
GROOVIE: More bugfixes for V2 puzzle overlay videos

Changed paths:
    engines/groovie/roq.cpp



diff --git a/engines/groovie/roq.cpp b/engines/groovie/roq.cpp
index 1996181..49d6158 100644
--- a/engines/groovie/roq.cpp
+++ b/engines/groovie/roq.cpp
@@ -169,7 +169,9 @@ bool ROQPlayer::playFrameInternal() {
 	}
 
 	// Wait until the current frame can be shown
-	waitFrame();
+	// Don't wait if we're just showing one frame
+	if (!(_alpha && !_flagTwo))
+		waitFrame();
 
 	if (_dirty) {
 		// Update the screen
@@ -177,6 +179,10 @@ bool ROQPlayer::playFrameInternal() {
 		_syst->copyRectToScreen(src, _bg->pitch, 0, (_syst->getHeight() - _bg->h) / 2, _bg->w, _bg->h);
 		_syst->updateScreen();
 
+		// For overlay videos, set the background buffer when the video ends
+		if (_alpha && (!_flagTwo || (_flagTwo && _file->eos())))
+			_bg->copyFrom(*_fg);
+
 		// Clear the dirty flag
 		_dirty = false;
 	}