[Scummvm-cvs-logs] SF.net SVN: scummvm:[40574] scummvm/trunk/engines/sci

[thebluegr at users.sourceforge.net]

Revision: 40574
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40574&view=rev
Author:   thebluegr
Date:     2009-05-14 21:51:36 +0000 (Thu, 14 May 2009)

Log Message:
-----------
Fixed the detection entry for SQ3 Amiga, and added a special case for cursor hiding in SQ5

Modified Paths:
--------------
    scummvm/trunk/engines/sci/detection.cpp
    scummvm/trunk/engines/sci/gfx/operations.cpp

Modified: scummvm/trunk/engines/sci/detection.cpp
===================================================================
--- scummvm/trunk/engines/sci/detection.cpp	2009-05-14 21:47:38 UTC (rev 40573)
+++ scummvm/trunk/engines/sci/detection.cpp	2009-05-14 21:51:36 UTC (rev 40574)
@@ -2554,9 +2554,9 @@
 		{"resource.003", 0, "ceeda7202b96e5c85ecaa88a40a540fc", 746496},
 		{"resource.004", 0, "ceeda7202b96e5c85ecaa88a40a540fc", 761984},
 		{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0},
-		0,
+		GF_FOR_SCI0_BEFORE_502,
 		SCI_VERSION_0,
-		SCI_VERSION(0, 000, 685) // TODO: best bet, exe seems packed
+		SCI_VERSION(0, 000, 453)
 	},
 
 	// Space Quest 3 - German Amiga

Modified: scummvm/trunk/engines/sci/gfx/operations.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/operations.cpp	2009-05-14 21:47:38 UTC (rev 40573)
+++ scummvm/trunk/engines/sci/gfx/operations.cpp	2009-05-14 21:51:36 UTC (rev 40574)
@@ -1214,7 +1214,7 @@
 	}
 
 	// Eco Quest 1 uses a 1x1 transparent cursor to hide the cursor from the user. Some scalers don't seem to support this.
-	if (new_pointer->width < 2 || new_pointer->height < 2)
+	if (new_pointer->width < 2 || new_pointer->height < 2 || new_pointer->data_size <= 0)
 		return _gfxop_set_pointer(state, NULL, NULL);
 
 	if (hotspot)


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