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

drmccoy at users.sourceforge.net drmccoy at users.sourceforge.net
Tue Jan 18 08:03:42 CET 2011


Revision: 55289
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55289&view=rev
Author:   drmccoy
Date:     2011-01-18 07:03:42 +0000 (Tue, 18 Jan 2011)

Log Message:
-----------
GOB: Fix Woodruff object videos

Modified Paths:
--------------
    scummvm/trunk/engines/gob/inter_v4.cpp
    scummvm/trunk/engines/gob/scenery.cpp

Modified: scummvm/trunk/engines/gob/inter_v4.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v4.cpp	2011-01-18 07:03:12 UTC (rev 55288)
+++ scummvm/trunk/engines/gob/inter_v4.cpp	2011-01-18 07:03:42 UTC (rev 55289)
@@ -184,16 +184,19 @@
 		if (_vm->_mult->_objects[props.startFrame].videoSlot > 0)
 			_vm->_vidPlayer->closeVideo(_vm->_mult->_objects[props.startFrame].videoSlot - 1);
 
+		uint32 x = props.x;
+		uint32 y = props.y;
+
 		int slot = _vm->_vidPlayer->openVideo(false, fileName, props);
 
 		_vm->_mult->_objects[props.startFrame].videoSlot = slot + 1;
 
-		if (props.x == -1) {
+		if (x == 0xFFFFFFFF) {
 			*_vm->_mult->_objects[props.startFrame].pPosX = _vm->_vidPlayer->getDefaultX(slot);
 			*_vm->_mult->_objects[props.startFrame].pPosY = _vm->_vidPlayer->getDefaultY(slot);
 		} else {
-			*_vm->_mult->_objects[props.startFrame].pPosX = props.x;
-			*_vm->_mult->_objects[props.startFrame].pPosY = props.y;
+			*_vm->_mult->_objects[props.startFrame].pPosX = x;
+			*_vm->_mult->_objects[props.startFrame].pPosY = y;
 		}
 
 		return;

Modified: scummvm/trunk/engines/gob/scenery.cpp
===================================================================
--- scummvm/trunk/engines/gob/scenery.cpp	2011-01-18 07:03:12 UTC (rev 55288)
+++ scummvm/trunk/engines/gob/scenery.cpp	2011-01-18 07:03:42 UTC (rev 55289)
@@ -737,7 +737,7 @@
 					_vm->_draw->_spriteLeft,  _vm->_draw->_spriteTop,
 					_vm->_draw->_spriteRight, _vm->_draw->_spriteBottom,
 					_vm->_draw->_destSpriteX, _vm->_draw->_destSpriteY,
-					_vm->_draw->_backSurface->getWidth(),
+					_vm->_draw->_backSurface->getWidth(), 1,
 					(_vm->_draw->_transparency != 0) ? 0 : -1);
 
 			_vm->_draw->invalidateRect(_vm->_draw->_destSpriteX, _vm->_draw->_destSpriteY,


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