diff options
| author | Gregory Montoir | 2004-10-17 05:04:49 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2004-10-17 05:04:49 +0000 |
| commit | 0765435c444c364016b0647a530085939a037f57 (patch) | |
| tree | 49e7182e8a74cd2666a8a79e00afda63bd4c9a22 /scumm/script_v6he.cpp | |
| parent | 3905129a9702e8f6db9b345734a27133fb630882 (diff) | |
| download | scummvm-rg350-0765435c444c364016b0647a530085939a037f57.tar.gz scummvm-rg350-0765435c444c364016b0647a530085939a037f57.tar.bz2 scummvm-rg350-0765435c444c364016b0647a530085939a037f57.zip | |
cleanup: moved some things to gfx.cpp and changed o60_setState to match disassembly of version 72
svn-id: r15578
Diffstat (limited to 'scumm/script_v6he.cpp')
| -rw-r--r-- | scumm/script_v6he.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scumm/script_v6he.cpp b/scumm/script_v6he.cpp index a550e12219..6795f2560c 100644 --- a/scumm/script_v6he.cpp +++ b/scumm/script_v6he.cpp @@ -405,11 +405,15 @@ void ScummEngine_v60he::o60_setState() { int state = pop(); int obj = pop(); + if (_heversion >= 72) { + putState(obj, state & 0x7FFF); + removeObjectFromDrawQue(obj); + return; + } + if (state & 0x8000) { state &= 0x7FFF; putState(obj, state); - if (_heversion >= 72) - removeObjectFromDrawQue(obj); return; } |