[Scummvm-cvs-logs] CVS: scummvm/scumm script_v5.cpp,1.125,1.126

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv6897

Modified Files:
	script_v5.cpp 
Log Message:
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)

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- script_v5.cpp	21 Jun 2003 20:27:48 -0000	1.125
+++ script_v5.cpp	24 Jun 2003 17:31:35 -0000	1.126
@@ -2011,11 +2011,15 @@
 }
 
 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);
 	}
 }