diff options
| author | Gregory Montoir | 2004-11-28 05:33:33 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2004-11-28 05:33:33 +0000 |
| commit | 67b8abac08befed3e545dd500df4f28b7524348a (patch) | |
| tree | 2afcceeb83d4320ffee77c4e6e12000198bcc479 /scumm | |
| parent | 41f710c06cfeb291112843f60f8f92ca4bdb2aee (diff) | |
| download | scummvm-rg350-67b8abac08befed3e545dd500df4f28b7524348a.tar.gz scummvm-rg350-67b8abac08befed3e545dd500df4f28b7524348a.tar.bz2 scummvm-rg350-67b8abac08befed3e545dd500df4f28b7524348a.zip | |
correction
svn-id: r15928
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/intern.h | 4 | ||||
| -rw-r--r-- | scumm/script_v90he.cpp | 14 |
2 files changed, 8 insertions, 10 deletions
diff --git a/scumm/intern.h b/scumm/intern.h index cd9f748f2a..c0a2f1c9a1 100644 --- a/scumm/intern.h +++ b/scumm/intern.h @@ -883,8 +883,8 @@ protected: void o90_getWizData(); void o90_unknown2F(); void o90_mod(); - void o90_shl4(); - void o90_shr4(); + void o90_shl(); + void o90_shr(); void o90_findAllObjectsWithClassOf(); void o90_getPolygonOverlap(); void o90_cond(); diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp index 8d311cf9dd..40a6b68828 100644 --- a/scumm/script_v90he.cpp +++ b/scumm/script_v90he.cpp @@ -105,8 +105,8 @@ void ScummEngine_v90he::setupOpcodes() { OPCODE(o90_unknown2F), /* 30 */ OPCODE(o90_mod), - OPCODE(o90_shl4), - OPCODE(o90_shr4), + OPCODE(o90_shl), + OPCODE(o90_shr), OPCODE(o6_invalid), /* 34 */ OPCODE(o90_findAllObjectsWithClassOf), @@ -800,8 +800,6 @@ void ScummEngine_v90he::o90_unknown25() { error("o90_unknown25: Unknown case %d", subOp); } push(0); - - } void ScummEngine_v90he::o90_unknown26() { @@ -1112,13 +1110,13 @@ void ScummEngine_v90he::o90_unknown2F() { debug(1,"o90_unknown2F stub (%d)", subOp); } -void ScummEngine_v90he::o90_shl4() { - int a = pop() << 2; +void ScummEngine_v90he::o90_shl() { + int a = pop(); push(pop() << a); } -void ScummEngine_v90he::o90_shr4() { - int a = pop() << 2; +void ScummEngine_v90he::o90_shr() { + int a = pop(); push(pop() >> a); } |