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

[waltervn at users.sourceforge.net]

Revision: 49470
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49470&view=rev
Author:   waltervn
Date:     2010-06-07 02:11:19 +0000 (Mon, 07 Jun 2010)

Log Message:
-----------
SCI: Relax signature of kCreateTextBitmap.

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

Modified: scummvm/trunk/engines/sci/engine/kernel.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.cpp	2010-06-07 02:11:01 UTC (rev 49469)
+++ scummvm/trunk/engines/sci/engine/kernel.cpp	2010-06-07 02:11:19 UTC (rev 49470)
@@ -363,7 +363,7 @@
 	DEFUN("ListIndexOf", kListIndexOf, "lZo"),
 	DEFUN("OnMe", kOnMe, "iio.*"),
 	DEFUN("InPolygon", kInPolygon, "iio"),
-	DEFUN("CreateTextBitmap", kCreateTextBitmap, "iiio"),
+	DEFUN("CreateTextBitmap", kCreateTextBitmap, "i.*"),
 
 	// SCI2.1 Kernel Functions
 	DEFUN("Save", kSave, ".*"),

Modified: scummvm/trunk/engines/sci/engine/kernel32.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel32.cpp	2010-06-07 02:11:01 UTC (rev 49469)
+++ scummvm/trunk/engines/sci/engine/kernel32.cpp	2010-06-07 02:11:19 UTC (rev 49470)
@@ -804,9 +804,16 @@
 
 reg_t kCreateTextBitmap(EngineState *s, int argc, reg_t *argv) {
 	// TODO: argument 0 is usually 0, and arguments 1 and 2 are usually 1
-	reg_t object = argv[3];
-	Common::String text = s->_segMan->getString(readSelector(s->_segMan, object, SELECTOR(text)));
-	debug("kCreateTextBitmap: %s", text.c_str());
+	switch (argv[0].toUint16()) {
+	case 0:
+		if (argc != 4) {
+			warning("kCreateTextBitmap(0): expected 4 arguments, got %i", argc);
+			return NULL_REG;
+		}
+		reg_t object = argv[3];
+		Common::String text = s->_segMan->getString(readSelector(s->_segMan, object, SELECTOR(text)));
+		debug("kCreateTextBitmap: %s", text.c_str());
+	}
 
 	return NULL_REG;
 }


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