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

[drmccoy at users.sourceforge.net]

Revision: 51887
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51887&view=rev
Author:   drmccoy
Date:     2010-08-08 00:52:01 +0000 (Sun, 08 Aug 2010)

Log Message:
-----------
GOB: Fix videos with the kNoVideo flag

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

Modified: scummvm/trunk/engines/gob/videoplayer.cpp
===================================================================
--- scummvm/trunk/engines/gob/videoplayer.cpp	2010-08-08 00:51:33 UTC (rev 51886)
+++ scummvm/trunk/engines/gob/videoplayer.cpp	2010-08-08 00:52:01 UTC (rev 51887)
@@ -81,6 +81,8 @@
 		properties.x      = 0;
 	} else if (properties.flags & kFlagScreenSurface) {
 		properties.sprite = 0;
+	} else if (properties.flags & kFlagNoVideo) {
+		properties.sprite = 0;
 	} else {
 		properties.sprite = Draw::kBackSurface;
 	}
@@ -341,17 +343,14 @@
 				_vm->_draw->invalidateRect(rect->left, rect->top, rect->right - 1, rect->bottom - 1);
 			_vm->_draw->blitInvalidated();
 
-			// if (!noRetrace)
-				_vm->_video->retrace();
-
 		} else if (video->surface == _vm->_draw->_frontSurface) {
 			for (Common::List<Common::Rect>::const_iterator rect = dirtyRects.begin(); rect != dirtyRects.end(); ++rect)
 				_vm->_video->dirtyRectsAdd(rect->left, rect->top, rect->right - 1, rect->bottom - 1);
 
-			// if (!noRetrace)
-				_vm->_video->retrace();
 		}
 
+		_vm->_video->retrace();
+
 		/*
 		// Subtitle
 		if (state.flags & Graphics::CoktelDecoder::kStateSpeech)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.