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

[waltervn at users.sourceforge.net]

Revision: 40396
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40396&view=rev
Author:   waltervn
Date:     2009-05-08 23:10:25 +0000 (Fri, 08 May 2009)

Log Message:
-----------
SCI: Set signature for GetMessage.

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

Modified: scummvm/trunk/engines/sci/engine/kernel.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.cpp	2009-05-08 22:52:47 UTC (rev 40395)
+++ scummvm/trunk/engines/sci/engine/kernel.cpp	2009-05-08 23:10:25 UTC (rev 40396)
@@ -201,7 +201,7 @@
 	/*(?)*/	DEFUN("TimesCot", kTimesCot, "ii"),
 	/*(?)*/	DEFUN("TimesTan", kTimesTan, "ii"),
 	DEFUN("Message", kMessage, ".*"),
-	DEFUN("GetMessage", kGetMessage, ".*"),
+	DEFUN("GetMessage", kGetMessage, "iiir"),
 	DEFUN("DoAudio", kDoAudio, ".*"),
 	DEFUN("DoSync", kDoSync, ".*"),
 

Modified: scummvm/trunk/engines/sci/engine/kstring.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kstring.cpp	2009-05-08 22:52:47 UTC (rev 40395)
+++ scummvm/trunk/engines/sci/engine/kstring.cpp	2009-05-08 23:10:25 UTC (rev 40396)
@@ -786,7 +786,7 @@
 	if (!state.initialized)
 		message_state_initialize(s->resmgr, &state);
 
-	char *buffer = argc == 4 ? kernel_dereference_char_pointer(s, argv[3], 0) : NULL;
+	char *buffer = kernel_dereference_char_pointer(s, argv[3], 0);
 
 	MessageTuple tuple;
 	tuple.noun = UKPV(0);
@@ -795,10 +795,8 @@
 	tuple.cond = 0;
 	tuple.seq = 0;
 
-	if (state.loadRes(module) && state.getSpecific(&tuple)) {
-		if (buffer)
-			state.getText(buffer, 255);
-
+	if (buffer && state.loadRes(module) && state.getSpecific(&tuple)) {
+		state.getText(buffer, 255);
 		return argv[3];
 	} else {
 		return NULL_REG;


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