aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2005-03-07 04:21:11 +0000
committerTravis Howell2005-03-07 04:21:11 +0000
commit1e07216b8590224efb7e38675e08e63267a4bc0b (patch)
treea93959d4fa736d25bf91ac1aa69c55041359ff9f
parentcb492e9b08363845c9727e5a9eaa606df2f10fe9 (diff)
downloadscummvm-rg350-1e07216b8590224efb7e38675e08e63267a4bc0b.tar.gz
scummvm-rg350-1e07216b8590224efb7e38675e08e63267a4bc0b.tar.bz2
scummvm-rg350-1e07216b8590224efb7e38675e08e63267a4bc0b.zip
Cases are different.
svn-id: r17023
-rw-r--r--scumm/script_v100he.cpp15
-rw-r--r--scumm/script_v72he.cpp7
2 files changed, 16 insertions, 6 deletions
diff --git a/scumm/script_v100he.cpp b/scumm/script_v100he.cpp
index df79646412..b146ac5724 100644
--- a/scumm/script_v100he.cpp
+++ b/scumm/script_v100he.cpp
@@ -438,11 +438,10 @@ void ScummEngine_v100he::o100_actorOps() {
a->charset = pop();
break;
case 18:
- case 128:
- _actorClipOverride.bottom = pop();
- _actorClipOverride.right = pop();
- _actorClipOverride.top = pop();
- _actorClipOverride.left = pop();
+ a->_clipOverride.bottom = pop();
+ a->_clipOverride.right = pop();
+ a->_clipOverride.top = pop();
+ a->_clipOverride.left = pop();
break;
case 22:
k = getStackList(args, ARRAYSIZE(args));
@@ -521,6 +520,12 @@ void ScummEngine_v100he::o100_actorOps() {
case 89: // SO_NEVER_ZCLIP
a->forceClip = 0;
break;
+ case 128:
+ _actorClipOverride.bottom = pop();
+ _actorClipOverride.right = pop();
+ _actorClipOverride.top = pop();
+ _actorClipOverride.left = pop();
+ break;
case 130: // SO_SOUND
k = getStackList(args, ARRAYSIZE(args));
for (i = 0; i < k; i++)
diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp
index a2ae0eb4db..4f963bbb8d 100644
--- a/scumm/script_v72he.cpp
+++ b/scumm/script_v72he.cpp
@@ -998,12 +998,17 @@ void ScummEngine_v72he::o72_actorOps() {
a->needRedraw = true;
break;
case 64:
- case 67: // HE 99+
_actorClipOverride.bottom = pop();
_actorClipOverride.right = pop();
_actorClipOverride.top = pop();
_actorClipOverride.left = pop();
break;
+ case 67: // HE 99+
+ a->_clipOverride.bottom = pop();
+ a->_clipOverride.right = pop();
+ a->_clipOverride.top = pop();
+ a->_clipOverride.left = pop();
+ break;
case 65: // HE 98+
i = pop();
j = pop();