diff options
author | Max Horn | 2003-05-31 21:25:14 +0000 |
---|---|---|
committer | Max Horn | 2003-05-31 21:25:14 +0000 |
commit | 7ffb40e61b3ab0bb14d3315636710963fa406c4e (patch) | |
tree | 839ba1b507ed64ea2db9c5160d360e64272e1457 /scumm/script_v6.cpp | |
parent | 30b0702ef50cdcde59be7044ec38595579867926 (diff) | |
download | scummvm-rg350-7ffb40e61b3ab0bb14d3315636710963fa406c4e.tar.gz scummvm-rg350-7ffb40e61b3ab0bb14d3315636710963fa406c4e.tar.bz2 scummvm-rg350-7ffb40e61b3ab0bb14d3315636710963fa406c4e.zip |
cleanup
svn-id: r8193
Diffstat (limited to 'scumm/script_v6.cpp')
-rw-r--r-- | scumm/script_v6.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index 460a4ef535..47e3fd4182 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -2042,10 +2042,8 @@ void Scumm_v6::o6_wait() { offs = fetchScriptWordSigned(); actnum = pop(); a = derefActor(actnum, "o6_wait:168"); - if (a->isInCurrentRoom() && a->moving) { - _scriptPointer += offs; - o6_breakHere(); - } + if (a->isInCurrentRoom() && a->moving) + break; return; case 169: // HACK: For Conroy Bumpus' song in Sam & Max. @@ -2085,10 +2083,8 @@ void Scumm_v6::o6_wait() { offs = fetchScriptWordSigned(); actnum = pop(); a = derefActor(actnum, "o6_wait:226"); - if (a->isInCurrentRoom() && a->needRedraw) { - _scriptPointer += offs; - o6_breakHere(); - } + if (a->isInCurrentRoom() && a->needRedraw) + break; return; case 232: /* wait until actor stops turning */ // FIXME: This opcode is really odd. It's used a lot in The Dig. @@ -2107,10 +2103,8 @@ void Scumm_v6::o6_wait() { actnum = _curActor; } a = derefActor(actnum, "o6_wait:232b"); - if (a->isInCurrentRoom() && a->moving & MF_TURN) { - _scriptPointer += offs; - o6_breakHere(); - } + if (a->isInCurrentRoom() && a->moving & MF_TURN) + break; return; default: error("o6_wait: default case 0x%x", subOp); |