aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2009-02-16 06:26:54 +0000
committerTravis Howell2009-02-16 06:26:54 +0000
commit81eb4b83caf67b45f8075b493adc5732a28526d5 (patch)
treed10fd17ebe9c1043cab859ccf1aa2e17e4baf1e8
parentf9705960820c1d8f8b29096cf0ad7a02ee9ee3b5 (diff)
downloadscummvm-rg350-81eb4b83caf67b45f8075b493adc5732a28526d5.tar.gz
scummvm-rg350-81eb4b83caf67b45f8075b493adc5732a28526d5.tar.bz2
scummvm-rg350-81eb4b83caf67b45f8075b493adc5732a28526d5.zip
Remove unneeded code, as _musicEngine is already set to NULL by default.
svn-id: r38346
-rw-r--r--engines/scumm/scumm.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 07c1116189..fd6d354d63 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1629,10 +1629,8 @@ void ScummEngine::setupMusic(int midi) {
// Setup for digital iMuse is performed in another place
} else if (_game.platform == Common::kPlatformApple2GS && _game.version == 0){
// TODO: Add support for music format
- _musicEngine = NULL;
} else if (_game.platform == Common::kPlatformC64 && _game.version <= 1) {
// TODO: Add support for music format
- _musicEngine = NULL;
} else if (_game.platform == Common::kPlatformNES && _game.version == 1) {
_musicEngine = new Player_NES(this, _mixer);
} else if (_game.platform == Common::kPlatformAmiga && _game.version == 2) {
@@ -1641,9 +1639,8 @@ void ScummEngine::setupMusic(int midi) {
_musicEngine = new Player_V3A(this, _mixer);
} else if (_game.platform == Common::kPlatformPCEngine && _game.version == 3) {
// TODO: Add support for music format
- _musicEngine = NULL;
} else if (_game.platform == Common::kPlatformAmiga && _game.version <= 4) {
- _musicEngine = NULL;
+ // TODO: Add support for music format
} else if (_game.id == GID_MANIAC && _game.version == 1) {
_musicEngine = new Player_V1(this, _mixer, midiDriver != MD_PCSPK);
} else if (_game.version <= 2) {