aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v7he.cpp
diff options
context:
space:
mode:
authorTravis Howell2005-05-02 02:12:00 +0000
committerTravis Howell2005-05-02 02:12:00 +0000
commit0ab38726534bec31ed5a67dc5bccb16622612bf0 (patch)
tree93b1719d37c2f4baaa33a7ee637ad6cef697ab5e /scumm/script_v7he.cpp
parent42ae68ff371c85944d80fc6e789890319d0f5881 (diff)
downloadscummvm-rg350-0ab38726534bec31ed5a67dc5bccb16622612bf0.tar.gz
scummvm-rg350-0ab38726534bec31ed5a67dc5bccb16622612bf0.tar.bz2
scummvm-rg350-0ab38726534bec31ed5a67dc5bccb16622612bf0.zip
Add missing case for pajama.
Fixes music in MusicRm. svn-id: r17892
Diffstat (limited to 'scumm/script_v7he.cpp')
-rw-r--r--scumm/script_v7he.cpp23
1 files changed, 11 insertions, 12 deletions
diff --git a/scumm/script_v7he.cpp b/scumm/script_v7he.cpp
index 816bdeb2b6..925dc82d3f 100644
--- a/scumm/script_v7he.cpp
+++ b/scumm/script_v7he.cpp
@@ -425,6 +425,8 @@ void ScummEngine_v70he::appendSubstring(int dst, int src, int srcOffs, int len)
}
void ScummEngine_v70he::o70_startSound() {
+ int var, value;
+
byte subOp = fetchScriptByte();
switch (subOp) {
@@ -432,15 +434,17 @@ void ScummEngine_v70he::o70_startSound() {
_heSndFlags |= 4;
break;
case 23:
- {
- int value = pop();
- int var = pop();
- int snd = pop();
- debug(1,"o70_startSound: case 29 (snd %d, var %d, value %d)", snd, var, value);
- }
+ value = pop();
+ var = pop();
+ _heSndSoundId = pop();
+ debug(0,"o70_startSound: case 29 (snd %d, var %d, value %d)", _heSndSoundId, var, value);
break;
+ case 25:
+ value = pop();
+ _heSndSoundId = pop();
+ _sound->addSoundToQueue(_heSndSoundId, 0, 0, 8);
case 56:
- _heSndFlags |= 2;
+ _heSndFlags |= 16;
break;
case 164:
_heSndFlags |= 2;
@@ -448,26 +452,21 @@ void ScummEngine_v70he::o70_startSound() {
case 224:
_heSndSoundFreq = pop();
break;
-
case 230:
_heSndChannel = pop();
break;
-
case 231:
_heSndOffset = pop();
break;
-
case 232:
_heSndSoundId = pop();
_heSndOffset = 0;
_heSndSoundFreq = 11025;
_heSndChannel = VAR(VAR_MUSIC_CHANNEL);
break;
-
case 245:
_heSndFlags |= 1;
break;
-
case 255:
debug(1, "o70_startSound (ID %d, Offset %d, Channel %d, Flags %d)", _heSndSoundId, _heSndOffset, _heSndChannel, _heSndFlags);
_sound->addSoundToQueue(_heSndSoundId, _heSndOffset, _heSndChannel, _heSndFlags);