aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/scumm.cpp
diff options
context:
space:
mode:
authorTravis Howell2009-11-26 00:31:19 +0000
committerTravis Howell2009-11-26 00:31:19 +0000
commit8783b0f2f7dbfb44c977812244a4ab4cde47a796 (patch)
treee1d210c4759d432a43d7805f20423257fb76a764 /engines/scumm/scumm.cpp
parent4e830d821cadbf1e29d2fe212a33e23770a890f8 (diff)
downloadscummvm-rg350-8783b0f2f7dbfb44c977812244a4ab4cde47a796.tar.gz
scummvm-rg350-8783b0f2f7dbfb44c977812244a4ab4cde47a796.tar.bz2
scummvm-rg350-8783b0f2f7dbfb44c977812244a4ab4cde47a796.zip
Add patch #2839048 - MM C64 sound/music player, with minor changes.
svn-id: r46143
Diffstat (limited to 'engines/scumm/scumm.cpp')
-rw-r--r--engines/scumm/scumm.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 309e79b7a0..6e9582b3a7 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -52,6 +52,7 @@
#include "scumm/he/sound_he.h"
#include "scumm/object.h"
#include "scumm/player_nes.h"
+#include "scumm/player_sid.h"
#include "scumm/player_pce.h"
#include "scumm/player_v1.h"
#include "scumm/player_v2.h"
@@ -1719,7 +1720,7 @@ void ScummEngine::setupMusic(int midi) {
} else if (_game.platform == Common::kPlatformApple2GS && _game.version == 0){
// TODO: Add support for music format
} else if (_game.platform == Common::kPlatformC64 && _game.version <= 1) {
- // TODO: Add support for music format
+ _musicEngine = new Player_SID(this, _mixer);
} else if (_game.platform == Common::kPlatformNES && _game.version == 1) {
_musicEngine = new Player_NES(this, _mixer);
} else if (_game.platform == Common::kPlatformAmiga && _game.version == 2) {