diff options
| author | Johannes Schickel | 2012-12-14 11:57:49 -0800 |
|---|---|---|
| committer | Johannes Schickel | 2012-12-14 11:57:49 -0800 |
| commit | 97d7bf9b9aaa1aac4939d2a690f65fde7e844b63 (patch) | |
| tree | 2b315520ba205d324761861b831558c68e567963 /engines/scumm/scumm.cpp | |
| parent | ebaa3fb6715fbbc3227edec2c1457e3a41c9212d (diff) | |
| parent | d3cf4d10f27a6349f08bee66713e9032d81cb8f8 (diff) | |
| download | scummvm-rg350-97d7bf9b9aaa1aac4939d2a690f65fde7e844b63.tar.gz scummvm-rg350-97d7bf9b9aaa1aac4939d2a690f65fde7e844b63.tar.bz2 scummvm-rg350-97d7bf9b9aaa1aac4939d2a690f65fde7e844b63.zip | |
Merge pull request #291 from eriktorbjorn/mac-mi-music-final
SCUMM: Add support for Macintosh music in Monkey Island 1 and Loom
Diffstat (limited to 'engines/scumm/scumm.cpp')
| -rw-r--r-- | engines/scumm/scumm.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 6a4fe238a1..3afeeda13d 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -61,7 +61,9 @@ #include "scumm/player_v2cms.h" #include "scumm/player_v2a.h" #include "scumm/player_v3a.h" +#include "scumm/player_v3m.h" #include "scumm/player_v4a.h" +#include "scumm/player_v5m.h" #include "scumm/resource.h" #include "scumm/he/resource_he.h" #include "scumm/scumm_v0.h" @@ -1819,6 +1821,12 @@ void ScummEngine::setupMusic(int midi) { #endif } else if (_game.platform == Common::kPlatformAmiga && _game.version <= 4) { _musicEngine = new Player_V4A(this, _mixer); + } else if (_game.platform == Common::kPlatformMacintosh && _game.id == GID_LOOM) { + _musicEngine = new Player_V3M(this, _mixer); + ((Player_V3M *)_musicEngine)->init(); + } else if (_game.platform == Common::kPlatformMacintosh && _game.id == GID_MONKEY) { + _musicEngine = new Player_V5M(this, _mixer); + ((Player_V5M *)_musicEngine)->init(); } else if (_game.id == GID_MANIAC && _game.version == 1) { _musicEngine = new Player_V1(this, _mixer, MidiDriver::getMusicType(dev) != MT_PCSPK); } else if (_game.version <= 2) { |