diff options
| author | David Corrales | 2007-06-23 18:51:33 +0000 |
|---|---|---|
| committer | David Corrales | 2007-06-23 18:51:33 +0000 |
| commit | cacd7a28fd51d960947de88abbf30c487e66529d (patch) | |
| tree | f3baa59853bfb307e452b86b9d93c4737b1fa6ab /engines/scumm/he/script_v60he.cpp | |
| parent | 0ac96302fe9c04df79cb01a77d19535b45fe2db0 (diff) | |
| parent | 90c2210dae8c91fa8babc6b05564e15c9d445d18 (diff) | |
| download | scummvm-rg350-cacd7a28fd51d960947de88abbf30c487e66529d.tar.gz scummvm-rg350-cacd7a28fd51d960947de88abbf30c487e66529d.tar.bz2 scummvm-rg350-cacd7a28fd51d960947de88abbf30c487e66529d.zip | |
Merged the FSNode branch with trunk r27031:27680
svn-id: r27681
Diffstat (limited to 'engines/scumm/he/script_v60he.cpp')
| -rw-r--r-- | engines/scumm/he/script_v60he.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/engines/scumm/he/script_v60he.cpp b/engines/scumm/he/script_v60he.cpp index 29226cd939..baee2f3e49 100644 --- a/engines/scumm/he/script_v60he.cpp +++ b/engines/scumm/he/script_v60he.cpp @@ -1090,7 +1090,7 @@ void ScummEngine_v60he::o60_readFile() { int val; // Fatty Bear uses positive values - if ((_game.platform == Common::kPlatformPC) && (_game.id == GID_FBEAR)) + if (_game.platform == Common::kPlatformPC && _game.id == GID_FBEAR) size = -size; assert(_hInFileTable[slot]); @@ -1120,7 +1120,7 @@ void ScummEngine_v60he::o60_writeFile() { int slot = pop(); // Fatty Bear uses positive values - if ((_game.platform == Common::kPlatformPC) && (_game.id == GID_FBEAR)) + if (_game.platform == Common::kPlatformPC && _game.id == GID_FBEAR) size = -size; assert(_hOutFileTable[slot]); @@ -1138,13 +1138,15 @@ void ScummEngine_v60he::o60_soundOps() { int arg = pop(); switch (subOp) { - case 0xde: - _imuse->setMusicVolume(arg); + case 222: + if (_imuse) { + _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(). |