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

[mthreepwood at users.sourceforge.net]

Revision: 46790
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46790&view=rev
Author:   mthreepwood
Date:     2009-12-31 05:30:25 +0000 (Thu, 31 Dec 2009)

Log Message:
-----------
kLocalToGlobal has a 'Plane' variant in SCI32 like its kGlobalToLocal sibling. The restore menu is now slightly navigatable.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kernel.cpp
    scummvm/trunk/engines/sci/engine/kevent.cpp

Modified: scummvm/trunk/engines/sci/engine/kernel.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.cpp	2009-12-31 05:11:58 UTC (rev 46789)
+++ scummvm/trunk/engines/sci/engine/kernel.cpp	2009-12-31 05:30:25 UTC (rev 46790)
@@ -218,7 +218,7 @@
 	/*1c*/	DEFUN("GetEvent", kGetEvent, ".*"),
 	///*1c*/	DEFUN("GetEvent", kGetEvent, "io"),
 	/*1d*/	DEFUN("GlobalToLocal", kGlobalToLocal, "oo*"),
-	/*1e*/	DEFUN("LocalToGlobal", kLocalToGlobal, "o"),
+	/*1e*/	DEFUN("LocalToGlobal", kLocalToGlobal, "oo*"),
 	/*1f*/	DEFUN("MapKeyToDir", kMapKeyToDir, "o"),
 	/*20*/	DEFUN("DrawMenuBar", kDrawMenuBar, "i"),
 	/*21*/	DEFUN("MenuSelect", kMenuSelect, "oi*"),

Modified: scummvm/trunk/engines/sci/engine/kevent.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kevent.cpp	2009-12-31 05:11:58 UTC (rev 46789)
+++ scummvm/trunk/engines/sci/engine/kevent.cpp	2009-12-31 05:30:25 UTC (rev 46790)
@@ -229,6 +229,12 @@
 }
 
 reg_t kLocalToGlobal(EngineState *s, int argc, reg_t *argv) {
+#ifdef ENABLE_SCI32
+	// SCI32 has an extra argument for a plane here
+	if (argc > 1)
+		warning("kLocalToGlobal Plane: %04x:%04x", PRINT_REG(argv[1]));
+#endif
+
 	reg_t obj = argc ? argv[0] : NULL_REG; // Can this really happen? Lars
 	SegManager *segMan = s->_segMan;
 


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