[Scummvm-cvs-logs] SF.net SVN: scummvm: [23834] scummvm/trunk/engines/kyra/screen.cpp

[eriktorbjorn at users.sourceforge.net]

Revision: 23834
          http://svn.sourceforge.net/scummvm/?rev=23834&view=rev
Author:   eriktorbjorn
Date:     2006-09-08 19:02:45 -0700 (Fri, 08 Sep 2006)

Log Message:
-----------
Fixed bug #1554904 ("KYRA1: No mouse cursor in latest SVN build"). GI_KYRA1 is
not a bit flag...

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/screen.cpp

Modified: scummvm/trunk/engines/kyra/screen.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen.cpp	2006-09-07 16:13:41 UTC (rev 23833)
+++ scummvm/trunk/engines/kyra/screen.cpp	2006-09-09 02:02:45 UTC (rev 23834)
@@ -1905,10 +1905,10 @@
 	if (_vm->features() & GF_TALKIE)
 		shape += 2;
 
-	int mouseHeight = *(shape+2);
+	int mouseHeight = *(shape + 2);
 	int mouseWidth = (READ_LE_UINT16(shape + 3)) + 2;
 
-	if (_vm->game() & GI_KYRA1 && _vm->features() & GF_TALKIE)
+	if ((_vm->game() == GI_KYRA1) && (_vm->features() & GF_TALKIE))
 		shape -= 2;
 
 	uint8 *cursor = (uint8 *)malloc(mouseHeight * mouseWidth);


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