aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2004-10-17 05:54:56 +0000
committerTravis Howell2004-10-17 05:54:56 +0000
commit4667a12c9d071df2f086773f6cad8686649cf630 (patch)
tree5a1be2eedc2a0cc2cb6dbf87279797ec933890c2
parent0765435c444c364016b0647a530085939a037f57 (diff)
downloadscummvm-rg350-4667a12c9d071df2f086773f6cad8686649cf630.tar.gz
scummvm-rg350-4667a12c9d071df2f086773f6cad8686649cf630.tar.bz2
scummvm-rg350-4667a12c9d071df2f086773f6cad8686649cf630.zip
Revert, break older games.
svn-id: r15579
-rw-r--r--scumm/script_v6he.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/scumm/script_v6he.cpp b/scumm/script_v6he.cpp
index 6795f2560c..a550e12219 100644
--- a/scumm/script_v6he.cpp
+++ b/scumm/script_v6he.cpp
@@ -405,15 +405,11 @@ 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;
}