aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorMax Horn2003-06-24 17:31:35 +0000
committerMax Horn2003-06-24 17:31:35 +0000
commit22e979de216c99d72892c9b33177fdd639e38547 (patch)
tree02ab20b118bda9263653909ab1e6940991598cfe /scumm
parentc9d22c69a23d4cf3714e45d14a28280233f9362e (diff)
downloadscummvm-rg350-22e979de216c99d72892c9b33177fdd639e38547.tar.gz
scummvm-rg350-22e979de216c99d72892c9b33177fdd639e38547.tar.bz2
scummvm-rg350-22e979de216c99d72892c9b33177fdd639e38547.zip
still don't know how the o5_startMusic opcode works in Zak (if it is even music releated), but this way makes more sense (thanks to Hibernatus)
svn-id: r8643
Diffstat (limited to 'scumm')
-rw-r--r--scumm/script_v5.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp
index ef2ab20366..147fc401b2 100644
--- a/scumm/script_v5.cpp
+++ b/scumm/script_v5.cpp
@@ -2011,11 +2011,15 @@ void Scumm_v5::o5_setVarRange() {
}
void Scumm_v5::o5_startMusic() {
- _sound->addSoundToQueue(getVarOrDirectByte(0x80));
+ int snd;
if (_gameId == GID_ZAK256) {
- int a = fetchScriptByte();
- int b = fetchScriptByte();
- warning("Just skipped two bytes of unknown meaning: %d, %d", a, b);
+ getResultPos();
+ snd = getVarOrDirectByte(0x80);
+ warning("unknown: o5_startMusic(%d)", snd);
+ setResult(0);
+ } else {
+ snd = getVarOrDirectByte(0x80);
+ _sound->addSoundToQueue(snd);
}
}