aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v100he.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_v100he.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_v100he.cpp')
-rw-r--r--scumm/script_v100he.cpp25
1 files changed, 16 insertions, 9 deletions
diff --git a/scumm/script_v100he.cpp b/scumm/script_v100he.cpp
index 298bcc4a70..e5aa8baea6 100644
--- a/scumm/script_v100he.cpp
+++ b/scumm/script_v100he.cpp
@@ -1623,23 +1623,30 @@ void ScummEngine_v100he::o100_roomOps() {
}
void ScummEngine_v100he::o100_startSound() {
+ byte filename[260];
+ int var, value;
+
byte subOp = fetchScriptByte();
switch (subOp) {
case 6:
_heSndFlags |= 16;
- pop();
+ _heSndOffset = pop();
+ break;
+ case 47:
+ copyScriptString(filename, sizeof(filename));
+ _heSndSoundId = pop();
+ if (_heSndSoundId)
+ debug(0, "Load sound %d from file %s\n", _heSndSoundId, filename);
break;
case 55:
_heSndFlags |= 8;
break;
case 83:
- {
- 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,"o100_startSound: case 29 (snd %d, var %d, value %d)", _heSndSoundId, var, value);
break;
case 92:
debug(0, "o100_startSound (ID %d, Offset %d, Channel %d, Flags %d)", _heSndSoundId, _heSndOffset, _heSndChannel, _heSndFlags);
@@ -1658,8 +1665,8 @@ void ScummEngine_v100he::o100_startSound() {
case 131:
_heSndFlags |= 4;
break;
- case 132:
- case 134:
+ case 132: // Music
+ case 134: // Sound
_heSndSoundId = pop();
_heSndOffset = 0;
_heSndSoundFreq = 11025;