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

[kirben at users.sourceforge.net]

Revision: 21930
Author:   kirben
Date:     2006-04-15 23:49:13 -0700 (Sat, 15 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21930&view=rev

Log Message:
-----------
Improve cursor support in FF

Modified Paths:
--------------
    scummvm/trunk/engines/simon/cursor.cpp
    scummvm/trunk/engines/simon/verb.cpp
Modified: scummvm/trunk/engines/simon/cursor.cpp
===================================================================
--- scummvm/trunk/engines/simon/cursor.cpp	2006-04-16 05:37:16 UTC (rev 21929)
+++ scummvm/trunk/engines/simon/cursor.cpp	2006-04-16 06:49:13 UTC (rev 21930)
@@ -230,7 +230,15 @@
 		byte *src, *dst;
 		VgaPointersEntry *vpe = &_vgaBufferPointers[7];
 
-		src = vpe->vgaFile2 + 98 * 8;
+		if (_animatePointer) {
+			_mouseAnim++;
+			if (_mouseAnim == _mouseAnimMax)
+				_mouseAnim = 1;
+		}
+
+		uint cursor = _mouseCursor * 16 + 1 + _mouseAnim;
+		src = vpe->vgaFile2 + cursor * 8;
+
 		uint width = READ_LE_UINT16(src + 6);
 		uint height = READ_LE_UINT16(src + 4) & 0x7FFF;
 		src = vpe->vgaFile2 + readUint32Wrapper(src);

Modified: scummvm/trunk/engines/simon/verb.cpp
===================================================================
--- scummvm/trunk/engines/simon/verb.cpp	2006-04-16 05:37:16 UTC (rev 21929)
+++ scummvm/trunk/engines/simon/verb.cpp	2006-04-16 06:49:13 UTC (rev 21930)
@@ -715,7 +715,7 @@
 			return;
 
 		if (getBitFlag(99))
-			_animatePointer = ((ha->flags & kBFTextBox) != 0);
+			_animatePointer = ((ha->flags & kBFTextBox) == 0);
 		else
 			_animatePointer = 1;
 
@@ -755,7 +755,6 @@
 			_oldMouseAnimMax = _mouseAnimMax;
 			_mouseAnimMax = 2;
 			_mouseCursor = 18;
-
 		}
 	} else {
 		if (getBitFlag(207)) {


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