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

[thebluegr at users.sourceforge.net]

Revision: 40096
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40096&view=rev
Author:   thebluegr
Date:     2009-04-23 21:06:34 +0000 (Thu, 23 Apr 2009)

Log Message:
-----------
Changed the "Intersections" opcode to "MoveCursor", after verifying it with Greg's SCI implementation and discussing it with waltervn. Also, the cursor hotspot is now fixed for Eco Quest 1 and probably SCI11 games as well (e.g. the game menu in KQ6 is now working)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kgraphics.cpp
    scummvm/trunk/engines/sci/scicore/vocab_debug.cpp

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-04-23 20:37:41 UTC (rev 40095)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-04-23 21:06:34 UTC (rev 40096)
@@ -311,12 +311,14 @@
 		GFX_ASSERT(gfxop_set_pointer_position(s->gfx_state, pt));
 		break;
 	}
-	case 3 :
-		GFX_ASSERT(gfxop_set_pointer_view(s->gfx_state, UKPV(0), UKPV(1), UKPV(2), NULL));
+	case 3 : {
+		Common::Point hotspot = Common::Point(0, 0);
+		GFX_ASSERT(gfxop_set_pointer_view(s->gfx_state, UKPV(0), UKPV(1), UKPV(2), &hotspot));
 		s->mouse_pointer_view = UKPV(0);
 		s->mouse_pointer_loop = UKPV(1);
 		s->mouse_pointer_cel = UKPV(2);
 		break;
+	}
 	case 9 : {
 		Common::Point hotspot = Common::Point(SKPV(3), SKPV(4));
 
@@ -334,8 +336,7 @@
 
 reg_t kSetCursor(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 	if (s->version >= SCI_VERSION(1, 001, 000) ||
-		s->_gameName.equalsIgnoreCase("eco") ||    // Eco Quest 1 needs kSetCursorNew
-	        has_kernel_function(s, "MoveCursor")) {
+		s->_gameName.equalsIgnoreCase("eco")) {    // Eco Quest 1 needs kSetCursorNew
 		return kSetCursorNew(s, funct_nr, argc, argv);
 	}
 

Modified: scummvm/trunk/engines/sci/scicore/vocab_debug.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/vocab_debug.cpp	2009-04-23 20:37:41 UTC (rev 40095)
+++ scummvm/trunk/engines/sci/scicore/vocab_debug.cpp	2009-04-23 21:06:34 UTC (rev 40096)
@@ -265,7 +265,7 @@
 	/*0x6e*/ "ShiftScreen",
 	/*0x6f*/ "Palette",
 	/*0x70*/ "MemorySegment",
-	/*0x71*/ "Intersections",
+	/*0x71*/ "MoveCursor",
 	/*0x72*/ "Memory",
 	/*0x73*/ "ListOps",
 	/*0x74*/ "FileIO",


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