diff options
| author | Alejandro Marzini | 2010-08-06 03:21:21 +0000 |
|---|---|---|
| committer | Alejandro Marzini | 2010-08-06 03:21:21 +0000 |
| commit | 33e40e1a20c4cc60031854c87d6da5e461f9eb73 (patch) | |
| tree | f76425d516e75d147ffbbacbec3fad49297da1b1 /engines/scumm/scumm.cpp | |
| parent | f97809a9a62a2d8840229facb2c2b6f75e37bad3 (diff) | |
| parent | 6c8bcd2ba1cad1312f0a588ca284110bbbb81ccc (diff) | |
| download | scummvm-rg350-33e40e1a20c4cc60031854c87d6da5e461f9eb73.tar.gz scummvm-rg350-33e40e1a20c4cc60031854c87d6da5e461f9eb73.tar.bz2 scummvm-rg350-33e40e1a20c4cc60031854c87d6da5e461f9eb73.zip | |
Merged from trunk, from r51495 to r51775
svn-id: r51776
Diffstat (limited to 'engines/scumm/scumm.cpp')
| -rw-r--r-- | engines/scumm/scumm.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 7e2db22c5b..ab7be02c48 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -1723,7 +1723,9 @@ void ScummEngine::setupMusic(int midi) { _musicEngine = new Player_SID(this, _mixer); #endif } else if (_game.platform == Common::kPlatformNES && _game.version == 1) { +#ifndef DISABLE_NES_APU _musicEngine = new Player_NES(this, _mixer); +#endif } else if (_game.platform == Common::kPlatformAmiga && _game.version == 2) { _musicEngine = new Player_V2A(this, _mixer); } else if (_game.platform == Common::kPlatformAmiga && _game.version == 3) { |