diff options
author | Martin Kiewitz | 2009-12-03 22:24:29 +0000 |
---|---|---|
committer | Martin Kiewitz | 2009-12-03 22:24:29 +0000 |
commit | c70a9e2cac5b26440310098a9f04623a1b84247c (patch) | |
tree | 6df125c64e0bd1a733ba1a47458d61b899928eaa /engines/sci/sfx | |
parent | dbf850999a88af128a39f03d6ac487ae6d448ded (diff) | |
download | scummvm-rg350-c70a9e2cac5b26440310098a9f04623a1b84247c.tar.gz scummvm-rg350-c70a9e2cac5b26440310098a9f04623a1b84247c.tar.bz2 scummvm-rg350-c70a9e2cac5b26440310098a9f04623a1b84247c.zip |
SCI: Dont init sound when using old sfx code (fixes assert)
svn-id: r46246
Diffstat (limited to 'engines/sci/sfx')
-rw-r--r-- | engines/sci/sfx/soundcmd.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/sci/sfx/soundcmd.cpp b/engines/sci/sfx/soundcmd.cpp index d883874b83..352f61c307 100644 --- a/engines/sci/sfx/soundcmd.cpp +++ b/engines/sci/sfx/soundcmd.cpp @@ -131,8 +131,10 @@ SoundCommandParser::SoundCommandParser(ResourceManager *resMan, SegManager *segM _hasNodePtr = (((SciEngine*)g_engine)->getKernel()->_selectorCache.nodePtr != -1); - _music = new SciMusic(); - _music->init(); + #ifndef USE_OLD_MUSIC_FUNCTIONS + _music = new SciMusic(); + _music->init(); + #endif switch (doSoundVersion) { case SCI_VERSION_0_EARLY: |