diff --git a/scumm/intern.h b/scumm/intern.h index d28876db6a4..930fb7c3951 100644 --- a/scumm/intern.h +++ b/scumm/intern.h @@ -898,7 +898,6 @@ protected: void o90_unknown9E(); void o90_unknownA5(); void o90_getActorAnimProgress(); - void o90_unknownCF(); }; class ScummEngine_v7 : public ScummEngine_v6 { diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp index 6671786dbcd..46990d3b0b3 100644 --- a/scumm/script_v72he.cpp +++ b/scumm/script_v72he.cpp @@ -1826,19 +1826,14 @@ void ScummEngine_v72he::o72_drawWizImage() { } void ScummEngine_v72he::o72_unknownCF() { - //ArrayHeader *ah; byte string[255]; copyScriptString(string); - int len = resStrLen(string) + 1; - writeVar(0, 0); - //ah = defineArray(0, kStringArray, 0, 0, 0, len); - defineArray(0, kStringArray, 0, 0, 0, len); + defineArray(0, kStringArray, 0, 0, 0, 0); writeArray(0, 0, 0, 0); - //memcpy(ah->data, string, len); - push(readVar(0)); + debug(1,"o72_unknownCF: String %s", string); } void ScummEngine_v72he::o72_jumpToScript() { diff --git a/scumm/script_v80he.cpp b/scumm/script_v80he.cpp index 53751ca6759..11ad121930e 100644 --- a/scumm/script_v80he.cpp +++ b/scumm/script_v80he.cpp @@ -302,7 +302,7 @@ void ScummEngine_v80he::setupOpcodes() { OPCODE(o6_pickOneOfDefault), OPCODE(o6_stampObject), OPCODE(o72_drawWizImage), - OPCODE(o6_invalid), + OPCODE(o72_unknownCF), /* D0 */ OPCODE(o6_getDateTime), OPCODE(o6_stopTalking), diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp index 2d3c703d484..38a8f77a2db 100644 --- a/scumm/script_v90he.cpp +++ b/scumm/script_v90he.cpp @@ -302,7 +302,7 @@ void ScummEngine_v90he::setupOpcodes() { OPCODE(o6_pickOneOfDefault), OPCODE(o6_stampObject), OPCODE(o72_drawWizImage), - OPCODE(o90_unknownCF), + OPCODE(o72_unknownCF), /* D0 */ OPCODE(o6_getDateTime), OPCODE(o6_stopTalking), @@ -1187,14 +1187,4 @@ void ScummEngine_v90he::o90_getActorAnimProgress() { push(a->getAnimProgress()); } -void ScummEngine_v90he::o90_unknownCF() { - byte name[255]; - - copyScriptString(name); - writeVar(0, 0); - defineArray(0, kStringArray, 0, 0, 0, 0); - writeArray(0, 0, 0, 0); - push(readVar(0)); -} - } // End of namespace Scumm