[Scummvm-cvs-logs] CVS: scummvm/scumm script_v5.cpp,1.135,1.136 sound.cpp,1.183,1.184

[Travis Howell]

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

Modified Files:
	script_v5.cpp sound.cpp 
Log Message:

fm towns cd audio fix from Hibernatus


Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- script_v5.cpp	22 Jul 2003 22:33:34 -0000	1.135
+++ script_v5.cpp	23 Jul 2003 05:17:21 -0000	1.136
@@ -2044,7 +2044,7 @@
 			break;
 		}
 		warning("unknown: o5_startMusic(%d)", b);
-		setResult(0);
+		setResult(result);
 	} else {
 		_sound->addSoundToQueue(getVarOrDirectByte(0x80));
 	}

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -d -r1.183 -r1.184
--- sound.cpp	22 Jul 2003 22:14:14 -0000	1.183
+++ sound.cpp	23 Jul 2003 05:17:21 -0000	1.184
@@ -470,7 +470,7 @@
 	
 	}
 	
-	if (_scumm->_gameId == GID_LOOM && (READ_LE_UINT16(ptr + 4) == 'so')) {
+	if (_scumm->_gameId == GID_LOOM) {
 		// Mac version of Loom uses yet another sound format
 		/*
 		playSound #9 (room 70)