diff options
| author | Travis Howell | 2006-03-10 23:09:27 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-03-10 23:09:27 +0000 |
| commit | f52e1709bf88e69cae5bab8f00ad30021f4a5743 (patch) | |
| tree | a154a97d947c3619d114c4c8995b9aa71c890c43 /engines/scumm | |
| parent | 3521d3508518166c7f710b69bfb35c9a6049d7b8 (diff) | |
| download | scummvm-rg350-f52e1709bf88e69cae5bab8f00ad30021f4a5743.tar.gz scummvm-rg350-f52e1709bf88e69cae5bab8f00ad30021f4a5743.tar.bz2 scummvm-rg350-f52e1709bf88e69cae5bab8f00ad30021f4a5743.zip | |
o6_setObjectName is never used by HE72+ games
svn-id: r21211
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/he/script_v100he.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/he/script_v72he.cpp | 5 | ||||
| -rw-r--r-- | engines/scumm/he/script_v80he.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/he/script_v90he.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/script_v6.cpp | 3 |
5 files changed, 4 insertions, 10 deletions
diff --git a/engines/scumm/he/script_v100he.cpp b/engines/scumm/he/script_v100he.cpp index aaae0691f7..7f38ef5423 100644 --- a/engines/scumm/he/script_v100he.cpp +++ b/engines/scumm/he/script_v100he.cpp @@ -133,7 +133,7 @@ void ScummEngine_v100he::setupOpcodes() { OPCODE(o6_neq), OPCODE(o100_dim2dim2Array), /* 48 */ - OPCODE(o6_setObjectName), + OPCODE(o6_invalid), OPCODE(o100_redim2dimArray), OPCODE(o6_not), OPCODE(o6_invalid), diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp index 2948b0fdfa..3639c1c85a 100644 --- a/engines/scumm/he/script_v72he.cpp +++ b/engines/scumm/he/script_v72he.cpp @@ -234,7 +234,7 @@ void ScummEngine_v72he::setupOpcodes() { OPCODE(o6_getVerbFromXY), OPCODE(o6_beginOverride), OPCODE(o6_endOverride), - OPCODE(o6_setObjectName), + OPCODE(o6_invalid), /* 98 */ OPCODE(o6_isSoundRunning), OPCODE(o6_setBoxFlags), @@ -2324,9 +2324,6 @@ void ScummEngine_v72he::decodeParseString(int m, int n) { _string[m].overhead = true; _string[m].no_talk_anim = false; break; - case 73: // SO_SAY_VOICE - error("decodeParseString: case 73"); - break; case 74: // SO_MUMBLE _string[m].no_talk_anim = true; break; diff --git a/engines/scumm/he/script_v80he.cpp b/engines/scumm/he/script_v80he.cpp index fa7c17f810..6bb48c7ab1 100644 --- a/engines/scumm/he/script_v80he.cpp +++ b/engines/scumm/he/script_v80he.cpp @@ -231,7 +231,7 @@ void ScummEngine_v80he::setupOpcodes() { OPCODE(o6_invalid), OPCODE(o6_beginOverride), OPCODE(o6_endOverride), - OPCODE(o6_setObjectName), + OPCODE(o6_invalid), /* 98 */ OPCODE(o6_isSoundRunning), OPCODE(o6_setBoxFlags), diff --git a/engines/scumm/he/script_v90he.cpp b/engines/scumm/he/script_v90he.cpp index a77373790e..a5d45422dd 100644 --- a/engines/scumm/he/script_v90he.cpp +++ b/engines/scumm/he/script_v90he.cpp @@ -230,7 +230,7 @@ void ScummEngine_v90he::setupOpcodes() { OPCODE(o90_getPaletteData), OPCODE(o6_beginOverride), OPCODE(o6_endOverride), - OPCODE(o6_setObjectName), + OPCODE(o6_invalid), /* 98 */ OPCODE(o6_isSoundRunning), OPCODE(o6_setBoxFlags), diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp index ae355bfe59..5f7e436f15 100644 --- a/engines/scumm/script_v6.cpp +++ b/engines/scumm/script_v6.cpp @@ -3154,9 +3154,6 @@ void ScummEngine_v6::decodeParseString(int m, int n) { _string[m].overhead = true; _string[m].no_talk_anim = false; break; - case 73: // SO_SAY_VOICE - error("decodeParseString: case 73"); - break; case 74: // SO_MUMBLE _string[m].no_talk_anim = true; break; |