aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorTravis Howell2007-06-01 08:47:22 +0000
committerTravis Howell2007-06-01 08:47:22 +0000
commite29263611a61ac2d0ef2111f7dfbf03b5924742b (patch)
tree5c4f5bcb10dcadeb9f7efb6849b2eb89a971255e /engines/scumm
parent22c0403e0dfec16badf156afa842c6c37e850263 (diff)
downloadscummvm-rg350-e29263611a61ac2d0ef2111f7dfbf03b5924742b.tar.gz
scummvm-rg350-e29263611a61ac2d0ef2111f7dfbf03b5924742b.tar.bz2
scummvm-rg350-e29263611a61ac2d0ef2111f7dfbf03b5924742b.zip
Fix bug #1727457 - WATER: Unexpected crash at the end of level 15.
svn-id: r27036
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/he/script_v60he.cpp8
-rw-r--r--engines/scumm/he/script_v70he.cpp3
2 files changed, 7 insertions, 4 deletions
diff --git a/engines/scumm/he/script_v60he.cpp b/engines/scumm/he/script_v60he.cpp
index 29226cd939..8bbea49bd5 100644
--- a/engines/scumm/he/script_v60he.cpp
+++ b/engines/scumm/he/script_v60he.cpp
@@ -1138,13 +1138,13 @@ void ScummEngine_v60he::o60_soundOps() {
int arg = pop();
switch (subOp) {
- case 0xde:
+ case 222:
_imuse->setMusicVolume(arg);
break;
- case 0xdf:
- // Used in fbear introduction
+ case 223:
+ // WORKAROUND: For error in room script 228 (room 2) of fbear.
break;
- case 0xe0:
+ case 224:
// Fatty Bear's Birthday surprise uses this when playing the
// piano, but only when using one of the digitized instruments.
// See also o6_startSound().
diff --git a/engines/scumm/he/script_v70he.cpp b/engines/scumm/he/script_v70he.cpp
index 6b1f670e15..1ced349225 100644
--- a/engines/scumm/he/script_v70he.cpp
+++ b/engines/scumm/he/script_v70he.cpp
@@ -461,6 +461,9 @@ void ScummEngine_v70he::o70_startSound() {
case 164:
_heSndFlags |= 2;
break;
+ case 222:
+ // WORKAROUND: For errors in room script 240 (room 4) of maze
+ break;
case 224:
_heSndSoundFreq = pop();
break;