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

drmccoy at users.sourceforge.net drmccoy at users.sourceforge.net
Sun Aug 8 03:06:44 CEST 2010


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

Log Message:
-----------
GOB: Reactivate the Coh-Cott-workaround

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

Modified: scummvm/trunk/engines/gob/videoplayer.cpp
===================================================================
--- scummvm/trunk/engines/gob/videoplayer.cpp	2010-08-08 01:06:15 UTC (rev 51917)
+++ scummvm/trunk/engines/gob/videoplayer.cpp	2010-08-08 01:06:44 UTC (rev 51918)
@@ -330,10 +330,11 @@
 
 	WRITE_VAR(11, video->decoder->getCurFrame());
 
+	uint32 ignoreBorder = 0;
 	if (_woodruffCohCottWorkaround && (properties.startFrame == 31)) {
 		// WORKAROUND: This frame mistakenly masks Coh Cott, making her vanish
 		// To prevent that, we'll never draw that part
-		// state.left += 50;
+		ignoreBorder = 50;
 	}
 
 	if (surface && primary) {
@@ -367,12 +368,12 @@
 		if (video->surface == _vm->_draw->_backSurface) {
 
 			for (Common::List<Common::Rect>::const_iterator rect = dirtyRects.begin(); rect != dirtyRects.end(); ++rect)
-				_vm->_draw->invalidateRect(rect->left, rect->top, rect->right - 1, rect->bottom - 1);
+				_vm->_draw->invalidateRect(rect->left + ignoreBorder, rect->top, rect->right - 1, rect->bottom - 1);
 			_vm->_draw->blitInvalidated();
 
 		} 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);
+				_vm->_video->dirtyRectsAdd(rect->left + ignoreBorder, rect->top, rect->right - 1, rect->bottom - 1);
 
 		}
 


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