aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sound
diff options
context:
space:
mode:
authorMartin Kiewitz2010-07-29 21:12:16 +0000
committerMartin Kiewitz2010-07-29 21:12:16 +0000
commit1c24f2ca8fc333e5cf4df29dfbca83a9eb50bf3f (patch)
tree7c0c8e3393494449aab51368d99d163ad048bc34 /engines/sci/sound
parent630127bc077e56c619c816a89e1d577c38b5eafb (diff)
downloadscummvm-rg350-1c24f2ca8fc333e5cf4df29dfbca83a9eb50bf3f.tar.gz
scummvm-rg350-1c24f2ca8fc333e5cf4df29dfbca83a9eb50bf3f.tar.bz2
scummvm-rg350-1c24f2ca8fc333e5cf4df29dfbca83a9eb50bf3f.zip
SCI: midi hold behaviour fixed
we shouldnt react on hold midi data when no actual hold was called, fixes eq2/amulet problem (bug #3035392) svn-id: r51482
Diffstat (limited to 'engines/sci/sound')
-rw-r--r--engines/sci/sound/music.cpp2
-rw-r--r--engines/sci/sound/music.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index 64a94ee510..c3315bd2b5 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -598,7 +598,7 @@ MusicEntry::MusicEntry() {
priority = 0;
loop = 0;
volume = MUSIC_VOLUME_DEFAULT;
- hold = 0;
+ hold = -1;
pauseCounter = 0;
sampleLoopCounter = 0;
diff --git a/engines/sci/sound/music.h b/engines/sci/sound/music.h
index 943a5bd2a8..37e3c30030 100644
--- a/engines/sci/sound/music.h
+++ b/engines/sci/sound/music.h
@@ -71,7 +71,7 @@ public:
byte priority;
uint16 loop;
int16 volume;
- byte hold;
+ int16 hold;
int16 pauseCounter;
uint sampleLoopCounter;