diff options
| author | Paweł Kołodziejski | 2003-04-27 07:13:03 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2003-04-27 07:13:03 +0000 |
| commit | 5a687ff50f7882626e9cd0b809f2c25b662093c7 (patch) | |
| tree | 0f7c230d324f356e72a981bbe7097b0d9caedec8 | |
| parent | 92ddaf20f0203a9112eff9280e7ef3b4039f6133 (diff) | |
| download | scummvm-rg350-5a687ff50f7882626e9cd0b809f2c25b662093c7.tar.gz scummvm-rg350-5a687ff50f7882626e9cd0b809f2c25b662093c7.tar.bz2 scummvm-rg350-5a687ff50f7882626e9cd0b809f2c25b662093c7.zip | |
small fix for v2 opcodes
svn-id: r7147
| -rw-r--r-- | scumm/intern.h | 2 | ||||
| -rw-r--r-- | scumm/script_v2.cpp | 15 |
2 files changed, 5 insertions, 12 deletions
diff --git a/scumm/intern.h b/scumm/intern.h index 92c670d086..e73e592cd7 100644 --- a/scumm/intern.h +++ b/scumm/intern.h @@ -305,7 +305,7 @@ protected: void o2_stopSound(); void o2_endCutscene(); void o2_decrement(); - void o2_divide(); + void o2_drawSentence(); }; class Scumm_v4 : public Scumm_v3 { diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp index 40b3bb52f2..8839e2f94e 100644 --- a/scumm/script_v2.cpp +++ b/scumm/script_v2.cpp @@ -248,7 +248,7 @@ void Scumm_v2::setupOpcodes() { OPCODE(o2_addDirect), OPCODE(o5_dummy), /* AC */ - OPCODE(o2_delay), + OPCODE(o2_drawSentence), OPCODE(o2_putActorInRoom), OPCODE(o2_waitForSentence), OPCODE(o2_ifNotState04), @@ -306,7 +306,7 @@ void Scumm_v2::setupOpcodes() { OPCODE(o2_printEgo), OPCODE(o2_doSentence), OPCODE(o2_add), - OPCODE(o2_divide), + OPCODE(o2_setBitVar), /* DC */ OPCODE(o5_dummy), OPCODE(o2_ifClassOfIs), @@ -1480,13 +1480,6 @@ void Scumm_v2::o2_stopSound() { _sound->stopSound(getVarOrDirectByte(0x80)); } -void Scumm_v2::o2_divide() { - int a; - getResultPos(); - a = getVarOrDirectWord(0x80); - if (a == 0) { - error("Divide by zero"); - _vars[_resultVarNumber] = 0; - } else - _vars[_resultVarNumber] /= a; +void Scumm_v2::o2_drawSentence() { + error("TODO o2_drawSentence()"); } |