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

[drmccoy at users.sourceforge.net]

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

Log Message:
-----------
GOB: Fix another another with continuing videos

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:49:38 UTC (rev 51882)
+++ scummvm/trunk/engines/gob/videoplayer.cpp	2010-08-08 00:50:12 UTC (rev 51883)
@@ -278,7 +278,7 @@
 				copyPalette(*video, properties.palStart, properties.palEnd);
 		}
 
-		if (modifiedPal && (properties.palCmd == 8) && (properties.sprite != Draw::kBackSurface))
+		if (modifiedPal && (properties.palCmd == 8) && (video->surface != _vm->_draw->_backSurface))
 			_vm->_video->setFullPalette(_vm->_global->_pPaletteDesc);
 
 		if (_needBlit)
@@ -305,7 +305,7 @@
 			_vm->_draw->forceBlit(true);
 
 		if (modifiedPal && (properties.palCmd == 16)) {
-			if (properties.sprite == Draw::kBackSurface)
+			if (video->surface == _vm->_draw->_backSurface)
 				_vm->_draw->forceBlit();
 			_vm->_palAnim->fade(_vm->_global->_pPaletteDesc, -2, 0);
 			_vm->_draw->_noInvalidated = true;
@@ -315,7 +315,7 @@
 		if (video->decoder->hasPalette() && (properties.palCmd > 1)) {
 			copyPalette(*video, properties.palStart, properties.palEnd);
 
-			if (properties.sprite != Draw::kBackSurface)
+			if (video->surface != _vm->_draw->_backSurface)
 				_vm->_video->setFullPalette(_vm->_global->_pPaletteDesc);
 			else
 				_vm->_draw->_applyPal = true;
@@ -323,10 +323,10 @@
 
 		const Common::List<Common::Rect> &dirtyRects = video->decoder->getDirtyRects();
 
-		if (modifiedPal && (properties.palCmd == 8) && (properties.sprite == Draw::kBackSurface))
+		if (modifiedPal && (properties.palCmd == 8) && (video->surface == _vm->_draw->_backSurface))
 			_vm->_video->setFullPalette(_vm->_global->_pPaletteDesc);
 
-		if (properties.sprite == Draw::kBackSurface) {
+		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);
@@ -335,7 +335,7 @@
 			// if (!noRetrace)
 				_vm->_video->retrace();
 
-		} else if (properties.sprite == Draw::kFrontSurface) {
+		} 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);
 


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