thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: Set signature for GetMessage.

Browse source 
svn-id: r40396
This commit is contained in:
Walter van Niftrik 2009-05-08 23:10:25 +00:00
parent 589d1dbd59
commit be7acea217
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/sci/engine/kernel.cpp
View file

@ -201,7 +201,7 @@ SciKernelFunction kfunct_mappers[] = {
/*(?)*/ DEFUN("TimesCot", kTimesCot, "ii"),
/*(?)*/ DEFUN("TimesTan", kTimesTan, "ii"),
DEFUN("Message", kMessage, ".*"),
DEFUN("GetMessage", kGetMessage, ".*"),
DEFUN("GetMessage", kGetMessage, "iiir"),
DEFUN("DoAudio", kDoAudio, ".*"),
DEFUN("DoSync", kDoSync, ".*"),

8
engines/sci/engine/kstring.cpp
View file

@ -786,7 +786,7 @@ reg_t kGetMessage(EngineState *s, int funct_nr, int argc, reg_t *argv) {
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 @@ reg_t kGetMessage(EngineState *s, int funct_nr, int argc, reg_t *argv) {
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;