aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/sound.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2008-11-30 02:47:20 +0000
committerJohannes Schickel2008-11-30 02:47:20 +0000
commit1fc33dbae5efcff1b69a04e4da8036e97f23b9eb (patch)
tree8af66785b5e9889c161ded79188b5b0d2507daba /engines/kyra/sound.cpp
parent8142873c6a508583e1b305969b57674e8bd1529e (diff)
downloadscummvm-rg350-1fc33dbae5efcff1b69a04e4da8036e97f23b9eb.tar.gz
scummvm-rg350-1fc33dbae5efcff1b69a04e4da8036e97f23b9eb.tar.bz2
scummvm-rg350-1fc33dbae5efcff1b69a04e4da8036e97f23b9eb.zip
- Fix some valgrind warnings
- Added MIDI SFX support for Kyra2 svn-id: r35178
Diffstat (limited to 'engines/kyra/sound.cpp')
-rw-r--r--engines/kyra/sound.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp
index 63a97185c8..5699cce5db 100644
--- a/engines/kyra/sound.cpp
+++ b/engines/kyra/sound.cpp
@@ -166,6 +166,13 @@ void KyraEngine_v1::snd_playTheme(int file, int track) {
_curSfxFile = _curMusicTheme = file;
_sound->loadSoundFile(_curMusicTheme);
+
+ // Kyrandia 2 uses a special file for
+ // MIDI sound effects, so we load
+ // this here
+ if (_flags.gameID == GI_KYRA2)
+ _sound->loadSfxFile("K2SFX");
+
if (track != -1)
_sound->playTrack(track);
}