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

[strangerke at users.sourceforge.net]

Revision: 44785
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44785&view=rev
Author:   strangerke
Date:     2009-10-08 12:04:34 +0000 (Thu, 08 Oct 2009)

Log Message:
-----------
Add a hack that fixes bug #2858887 and #2859606

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

Modified: scummvm/trunk/engines/gob/hotspots.cpp
===================================================================
--- scummvm/trunk/engines/gob/hotspots.cpp	2009-10-08 11:57:17 UTC (rev 44784)
+++ scummvm/trunk/engines/gob/hotspots.cpp	2009-10-08 12:04:34 UTC (rev 44785)
@@ -155,13 +155,15 @@
 }
 
 bool Hotspots::Hotspot::isIn(uint16 x, uint16 y) const {
-	if (x < left)
+	// FIXME: the cast to int16 is a hack, to fix handling of Gob2 problems related to 
+	// hotspots with negative offset (to temporary disable them). 
+	if ((int16) x < (int16) left)
 		return false;
-	if (x > right)
+	if ((int16) x > (int16) right)
 		return false;
-	if (y < top)
+	if ((int16) y < (int16) top)
 		return false;
-	if (y > bottom)
+	if ((int16) y > (int16) bottom)
 		return false;
 
 	return true;


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