[Scummvm-cvs-logs] SF.net SVN: scummvm:[55429] scummvm/trunk/engines/gob/videoplayer.cpp

drmccoy at users.sourceforge.net drmccoy at users.sourceforge.net
Sat Jan 22 16:06:13 CET 2011


Revision: 55429
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55429&view=rev
Author:   drmccoy
Date:     2011-01-22 15:06:12 +0000 (Sat, 22 Jan 2011)

Log Message:
-----------
GOB: Force live videos onto the backSurface

Fixes some inventory list uglyness in live videos.
It still flickers when mousing over it though, and keeps popping
when mousing over the register during the hotel scene

Modified Paths:
--------------
    scummvm/trunk/engines/gob/videoplayer.cpp

Modified: scummvm/trunk/engines/gob/videoplayer.cpp
===================================================================
--- scummvm/trunk/engines/gob/videoplayer.cpp	2011-01-22 14:58:17 UTC (rev 55428)
+++ scummvm/trunk/engines/gob/videoplayer.cpp	2011-01-22 15:06:12 UTC (rev 55429)
@@ -87,6 +87,9 @@
 	} else {
 		properties.sprite = Draw::kBackSurface;
 	}
+
+	if (properties.noBlock && (properties.sprite == Draw::kFrontSurface))
+		properties.sprite = Draw::kBackSurface;
 }
 
 int VideoPlayer::openVideo(bool primary, const Common::String &file, Properties &properties) {
@@ -314,8 +317,6 @@
 
 		if (!_liveProperties.loop) {
 			WRITE_VAR_OFFSET(212, (uint32)-1);
-			if (video->surface == _vm->_draw->_frontSurface)
-				_vm->_draw->forceBlit(true);
 			_vm->_vidPlayer->closeVideo();
 			return;
 		} else {


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