aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v2.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'scumm/script_v2.cpp')
-rw-r--r--scumm/script_v2.cpp15
1 files changed, 2 insertions, 13 deletions
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp
index ee70356a0d..3f74a8d6fa 100644
--- a/scumm/script_v2.cpp
+++ b/scumm/script_v2.cpp
@@ -123,7 +123,7 @@ void Scumm_v2::setupOpcodes() {
OPCODE(o5_increment),
OPCODE(o2_setState08),
/* 48 */
- OPCODE(o2_isEqual),
+ OPCODE(o5_isEqual),
OPCODE(o5_faceActor),
OPCODE(o2_chainScript),
OPCODE(o2_setObjY),
@@ -283,7 +283,7 @@ void Scumm_v2::setupOpcodes() {
OPCODE(o5_decrement),
OPCODE(o2_clearState08),
/* C8 */
- OPCODE(o2_isEqual),
+ OPCODE(o5_isEqual),
OPCODE(o5_faceActor),
OPCODE(o2_chainScript),
OPCODE(o2_setObjY),
@@ -775,17 +775,6 @@ void Scumm_v2::o2_verbOps() {
}
}
-void Scumm_v2::o2_isEqual() {
- int a = getVar();
- int b = getVarOrDirectWord(0x80);
-
- if (b == a)
- ignoreScriptWord();
- else
- o5_jumpRelative();
-
-}
-
void Scumm_v2::o2_doSentence() {
int a;
SentenceTab *st;