diff options
| -rw-r--r-- | scumm/intern.h | 2 | ||||
| -rw-r--r-- | scumm/script_v6he.cpp | 27 | ||||
| -rw-r--r-- | scumm/script_v7he.cpp | 27 |
3 files changed, 28 insertions, 28 deletions
diff --git a/scumm/intern.h b/scumm/intern.h index 0d18e0530b..1a2813e564 100644 --- a/scumm/intern.h +++ b/scumm/intern.h @@ -595,6 +595,7 @@ protected: void o6_readINI(); void o6_unknownF4(); void o6_unknownF9(); + void o6_unknownFB(); void o6_readFilePos(); }; @@ -621,7 +622,6 @@ protected: /* Version 7 script opcodes */ void o7_objectX(); void o7_objectY(); - void o7_unknownFB(); }; class ScummEngine_v7 : public ScummEngine_v6 { diff --git a/scumm/script_v6he.cpp b/scumm/script_v6he.cpp index ce53e47f80..9a853d072e 100644 --- a/scumm/script_v6he.cpp +++ b/scumm/script_v6he.cpp @@ -360,7 +360,7 @@ void ScummEngine_v6he::setupOpcodes() { OPCODE(o6_invalid), OPCODE(o6_unknownF9), OPCODE(o6_unknownFA), - OPCODE(o6_invalid), + OPCODE(o6_unknownFB), /* FC */ OPCODE(o6_invalid), OPCODE(o6_invalid), @@ -1393,6 +1393,31 @@ void ScummEngine_v6he::o6_unknownF9() { warning("stub o6_unknownF9(\"%s\")", filename + r); } +void ScummEngine_v6he::o6_unknownFB() { + byte b; + b = fetchScriptByte(); + + switch (b) { + case 246: + case 248: + pop(); + pop(); + pop(); + pop(); + pop(); + pop(); + pop(); + pop(); + pop(); + break; + case 247: + pop(); + pop(); + break; + } + warning("o6_unknownFB stub"); +} + void ScummEngine_v6he::decodeParseString(int m, int n) { byte b; int c; diff --git a/scumm/script_v7he.cpp b/scumm/script_v7he.cpp index f1f07ca4d1..732d100152 100644 --- a/scumm/script_v7he.cpp +++ b/scumm/script_v7he.cpp @@ -360,7 +360,7 @@ void ScummEngine_v7he::setupOpcodes() { OPCODE(o6_invalid), OPCODE(o6_unknownF9), OPCODE(o6_unknownFA), - OPCODE(o7_unknownFB), + OPCODE(o6_unknownFB), /* FC */ OPCODE(o6_invalid), OPCODE(o6_invalid), @@ -406,29 +406,4 @@ void ScummEngine_v7he::o7_objectY() { push(_objs[objnum].y_pos); } -void ScummEngine_v7he::o7_unknownFB() { - byte b; - b = fetchScriptByte(); - - switch (b) { - case 246: - case 248: - pop(); - pop(); - pop(); - pop(); - pop(); - pop(); - pop(); - pop(); - pop(); - break; - case 247: - pop(); - pop(); - break; - } - warning("o7_unknownFB stub"); -} - } // End of namespace Scumm |