aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorTravis Howell2004-07-14 09:37:15 +0000
committerTravis Howell2004-07-14 09:37:15 +0000
commit50c80a808aba13160a2a4a218f8f0dc49a157e1c (patch)
tree32f8a0e31457dcd75e274ac6e77f04e86b3142a5 /scumm
parentbe7ee03501025b0e8237ae0e719c7944d0924cc4 (diff)
downloadscummvm-rg350-50c80a808aba13160a2a4a218f8f0dc49a157e1c.tar.gz
scummvm-rg350-50c80a808aba13160a2a4a218f8f0dc49a157e1c.tar.bz2
scummvm-rg350-50c80a808aba13160a2a4a218f8f0dc49a157e1c.zip
HE 7.0 games set fade effects to 1 but don't actually use any fade effects.
svn-id: r14212
Diffstat (limited to 'scumm')
-rw-r--r--scumm/script_v6he.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/scumm/script_v6he.cpp b/scumm/script_v6he.cpp
index e62ffdad52..69a3a0d622 100644
--- a/scumm/script_v6he.cpp
+++ b/scumm/script_v6he.cpp
@@ -459,7 +459,9 @@ void ScummEngine_v6he::o6_roomOps() {
case 181: // SO_ROOM_FADE
a = pop();
- if (a) {
+ if (_heversion == 70) {
+ // Defaults to 1 but doesn't use fade effects
+ } else if (a) {
_switchRoomEffect = (byte)(a & 0xFF);
_switchRoomEffect2 = (byte)(a >> 8);
} else {