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

[drmccoy at users.sourceforge.net]

Revision: 32266
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32266&view=rev
Author:   drmccoy
Date:     2008-05-24 23:25:16 -0700 (Sat, 24 May 2008)

Log Message:
-----------
Fixing Bug #1970111 ("WOODRUFF: Close Up not erased")

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

Modified: scummvm/trunk/engines/gob/videoplayer.cpp
===================================================================
--- scummvm/trunk/engines/gob/videoplayer.cpp	2008-05-24 23:58:22 UTC (rev 32265)
+++ scummvm/trunk/engines/gob/videoplayer.cpp	2008-05-25 06:25:16 UTC (rev 32266)
@@ -602,20 +602,19 @@
 	if (primaryOpen(videoFile)) {
 		int16 x, y, width, height;
 
-		if ((VAR_OFFSET(varX) != 0xFFFFFFFF) ||
-		    !_primaryVideo->getVideo()->getAnchor(1, 2, x, y, width, height)) {
+		x = _primaryVideo->getVideo()->getX();
+		y = _primaryVideo->getVideo()->getY();
+		width = _primaryVideo->getVideo()->getWidth();
+		height = _primaryVideo->getVideo()->getHeight();
 
-			x = _primaryVideo->getVideo()->getX();
-			y = _primaryVideo->getVideo()->getY();
-			width = _primaryVideo->getVideo()->getWidth();
-			height = _primaryVideo->getVideo()->getHeight();
-		}
+		if (VAR_OFFSET(varX) == 0xFFFFFFFF)
+			_primaryVideo->getVideo()->getAnchor(1, 2, x, y, width, height);
 
 		WRITE_VAR_OFFSET(varX, x);
 		WRITE_VAR_OFFSET(varY, y);
 		WRITE_VAR_OFFSET(varFrames, _primaryVideo->getVideo()->getFramesCount());
 		WRITE_VAR_OFFSET(varWidth, width);
-		WRITE_VAR_OFFSET(varHeight, height);
+		WRITE_VARO_UINT16(varHeight & 0xFFFFFFFC, height);
 
 		primaryClose();
 	} else {


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