[Scummvm-cvs-logs] SF.net SVN: scummvm: [21942] scummvm/trunk/engines/simon/cursor.cpp

[kirben at users.sourceforge.net]

Revision: 21942
Author:   kirben
Date:     2006-04-16 06:37:48 -0700 (Sun, 16 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21942&view=rev

Log Message:
-----------
Add missing mouse pointer checks for oracle and SAM in FF

Modified Paths:
--------------
    scummvm/trunk/engines/simon/cursor.cpp
Modified: scummvm/trunk/engines/simon/cursor.cpp
===================================================================
--- scummvm/trunk/engines/simon/cursor.cpp	2006-04-16 13:26:10 UTC (rev 21941)
+++ scummvm/trunk/engines/simon/cursor.cpp	2006-04-16 13:37:48 UTC (rev 21942)
@@ -229,6 +229,7 @@
 	if (getGameType() == GType_FF) {
 		byte *src, *dst;
 		VgaPointersEntry *vpe = &_vgaBufferPointers[7];
+		uint cursor, image, width, height;
 
 		if (_animatePointer) {
 			_mouseAnim++;
@@ -236,11 +237,19 @@
 				_mouseAnim = 1;
 		}
 
-		uint cursor = _mouseCursor * 16 + 1 + _mouseAnim;
-		src = vpe->vgaFile2 + cursor * 8;
+		cursor = _mouseCursor;
+		if (_animatePointer == 0 && getBitFlag(99)) {
+			cursor = 6;
+			_mouseAnim = 1;
+		} else 	if (getBitFlag(72)) {
+			cursor += 7;
+		}
 
-		uint width = READ_LE_UINT16(src + 6);
-		uint height = READ_LE_UINT16(src + 4) & 0x7FFF;
+		image = cursor * 16 + 1 + _mouseAnim;
+		src = vpe->vgaFile2 + image * 8;
+
+		width = READ_LE_UINT16(src + 6);
+		height = READ_LE_UINT16(src + 4) & 0x7FFF;
 		src = vpe->vgaFile2 + readUint32Wrapper(src);
 
 		dst = (byte *)malloc(width * height);


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