aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v6.cpp
diff options
context:
space:
mode:
authorMax Horn2003-05-20 23:05:34 +0000
committerMax Horn2003-05-20 23:05:34 +0000
commit34eee8b33bb1295f1872b8752d904df68133ad4c (patch)
tree0d983dc1c018eeae71487b383a2e87d0c12e37a7 /scumm/script_v6.cpp
parent4584cb9616ffa78324544c140ef7fc0ad71744a1 (diff)
downloadscummvm-rg350-34eee8b33bb1295f1872b8752d904df68133ad4c.tar.gz
scummvm-rg350-34eee8b33bb1295f1872b8752d904df68133ad4c.tar.bz2
scummvm-rg350-34eee8b33bb1295f1872b8752d904df68133ad4c.zip
cleanup
svn-id: r7756
Diffstat (limited to 'scumm/script_v6.cpp')
-rw-r--r--scumm/script_v6.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index 1306ede6c1..6f68df086a 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -1686,21 +1686,22 @@ void Scumm_v6::o6_actorOps() {
break;
case 95:
a->ignoreBoxes = 1;
- if (_features & GF_AFTER_V7) // yazoo: I don't know if it's supposed to be 100 in other games too...
+ if (_features & GF_AFTER_V7)
a->forceClip = 100;
else
a->forceClip = 0;
- FixRooms:;
if (a->isInCurrentRoom())
a->putActor(a->x, a->y, a->room);
break;
case 96:
a->ignoreBoxes = 0;
- if (_features & GF_AFTER_V7) // yazoo: I don't know if it's supposed to be 100 in other games too...
+ if (_features & GF_AFTER_V7)
a->forceClip = 100;
else
a->forceClip = 0;
- goto FixRooms;
+ if (a->isInCurrentRoom())
+ a->putActor(a->x, a->y, a->room);
+ break;
case 97:
a->animSpeed = pop();
a->animProgress = 0;