[Scummvm-cvs-logs] SF.net SVN: scummvm:[45355] scummvm/branches/branch-1-0-0/engines/gob/util. cpp

[strangerke at users.sourceforge.net]

Revision: 45355
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45355&view=rev
Author:   strangerke
Date:     2009-10-23 22:11:41 +0000 (Fri, 23 Oct 2009)

Log Message:
-----------
Gob - Backport of r45353: Add a workaround for gob3 Sofa bug #2867294. It's now possible to exit the animation by clicking

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/engines/gob/util.cpp

Modified: scummvm/branches/branch-1-0-0/engines/gob/util.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/gob/util.cpp	2009-10-23 22:02:54 UTC (rev 45354)
+++ scummvm/branches/branch-1-0-0/engines/gob/util.cpp	2009-10-23 22:11:41 UTC (rev 45355)
@@ -141,8 +141,13 @@
 		y -= _vm->_video->_screenDeltaY;
 
 		_vm->_util->setMousePos(x, y);
+		_vm->_game->wantScroll(x, y);
 
-		_vm->_game->wantScroll(x, y);
+		// WORKAROUND:
+		// Force a check of the mouse in order to fix the sofa bug. This apply only for Gob3, and only 
+		// in the impacted TOT file so that the second screen animation is not broken.
+		if ((_vm->getGameType() == kGameTypeGob3) && !strncmp(_vm->_game->_curTotFile, "EMAP1008.TOT", 12))
+			_vm->_game->evaluateScroll();
 	}
 }
 


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