aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/kyra_v1.h
diff options
context:
space:
mode:
authorJohannes Schickel2009-05-24 01:29:09 +0000
committerJohannes Schickel2009-05-24 01:29:09 +0000
commit344caa88fcf8ce352e7bee6b2c6d4a8df2df548e (patch)
tree34060263b7e3c21cfab3df09ce811fe7d094d34e /engines/kyra/kyra_v1.h
parentc2812140274d1c37e57f732f0a30e8a39d30e2ca (diff)
downloadscummvm-rg350-344caa88fcf8ce352e7bee6b2c6d4a8df2df548e.tar.gz
scummvm-rg350-344caa88fcf8ce352e7bee6b2c6d4a8df2df548e.tar.bz2
scummvm-rg350-344caa88fcf8ce352e7bee6b2c6d4a8df2df548e.zip
Make various Sound functionality SoundHandle instead of filename based.
- This fixes multiple sounds being played at once in Lands of Lore svn-id: r40848
Diffstat (limited to 'engines/kyra/kyra_v1.h')
-rw-r--r--engines/kyra/kyra_v1.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h
index 148da506c4..efa84bb488 100644
--- a/engines/kyra/kyra_v1.h
+++ b/engines/kyra/kyra_v1.h
@@ -32,6 +32,8 @@
#include "common/events.h"
#include "common/system.h"
+#include "sound/mixer.h"
+
#include "kyra/script.h"
namespace Common {
@@ -278,7 +280,7 @@ protected:
uint8 _flagsTable[100]; // TODO: check this value
// sound
- Common::String _speechFile;
+ Audio::SoundHandle _speechHandle;
int _curMusicTheme;
int _curSfxFile;