aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorTorbjörn Andersson2012-11-14 22:12:46 +0100
committerTorbjörn Andersson2012-11-14 22:12:46 +0100
commitb75349383e834b47ad57f86a2c0f5ab48ca4aa2c (patch)
tree6e1766712ed0b08bffbf9a7727c9eea67a0f6432 /engines
parent0dcd4ba5a7bf40e03b11a475c1a6082002f486aa (diff)
downloadscummvm-rg350-b75349383e834b47ad57f86a2c0f5ab48ca4aa2c.tar.gz
scummvm-rg350-b75349383e834b47ad57f86a2c0f5ab48ca4aa2c.tar.bz2
scummvm-rg350-b75349383e834b47ad57f86a2c0f5ab48ca4aa2c.zip
SCUMM: Remove Mac version of MI1 from special case.
We no longer use iMuse for MI1 Mac so this never happens. The Mac player can only play one song at a time, so it should be all right.
Diffstat (limited to 'engines')
-rw-r--r--engines/scumm/sound.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index cfce0cbc62..2fe16c5441 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -391,8 +391,7 @@ void Sound::playSound(int soundID) {
}
else {
- if (_vm->_game.id == GID_MONKEY_VGA || _vm->_game.id == GID_MONKEY_EGA
- || (_vm->_game.id == GID_MONKEY && _vm->_game.platform == Common::kPlatformMacintosh)) {
+ if (_vm->_game.id == GID_MONKEY_VGA || _vm->_game.id == GID_MONKEY_EGA) {
// Works around the fact that in some places in MonkeyEGA/VGA,
// the music is never explicitly stopped.
// Rather it seems that starting a new music is supposed to