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

[waltervn at users.sourceforge.net]

Revision: 44927
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44927&view=rev
Author:   waltervn
Date:     2009-10-11 14:58:58 +0000 (Sun, 11 Oct 2009)

Log Message:
-----------
SCI: Implement CoordPri() with two args.

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

Modified: scummvm/trunk/engines/sci/engine/kernel.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.cpp	2009-10-11 14:30:55 UTC (rev 44926)
+++ scummvm/trunk/engines/sci/engine/kernel.cpp	2009-10-11 14:58:58 UTC (rev 44927)
@@ -288,7 +288,7 @@
 	/*62*/	DEFUN("GetCWD", kGetCWD, "r"),
 	/*63*/	DEFUN("CheckFreeSpace", kCheckFreeSpace, "r"),
 	/*64*/	DEFUN("ValidPath", kValidPath, "r"),
-	/*65*/	DEFUN("CoordPri", kCoordPri, "i"),
+	/*65*/	DEFUN("CoordPri", kCoordPri, "ii*"),
 	/*66*/	DEFUN("StrAt", kStrAt, "rii*"),
 	/*67*/	DEFUN("DeviceInfo", kDeviceInfo, "i.*"),
 	// FIXME: signature check removed (set to .*), as this function accepts a parameter in SCI32 games

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-10-11 14:30:55 UTC (rev 44926)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-10-11 14:58:58 UTC (rev 44927)
@@ -753,7 +753,12 @@
 reg_t kCoordPri(EngineState *s, int argc, reg_t *argv) {
 	int16 y = argv[0].toSint16();
 
-	return make_reg(0, s->_gui->coordinateToPriority(y));
+	if ((argc < 2) || (y != 1)) {
+		return make_reg(0, s->_gui->coordinateToPriority(y));
+	} else {
+		int16 priority = argv[1].toSint16();
+		return make_reg(0, s->_gui->priorityToCoordinate(priority));
+	}
 }
 
 reg_t kPriCoord(EngineState *s, int argc, reg_t *argv) {


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