[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.159,1.160

[Max Horn]

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

Modified Files:
	sound.cpp 
Log Message:
the amiga check should be separate since the big FIXME comment does not apply to it at all

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -d -r1.159 -r1.160
--- sound.cpp	6 Jul 2003 07:17:50 -0000	1.159
+++ sound.cpp	6 Jul 2003 10:39:02 -0000	1.160
@@ -464,6 +464,10 @@
 	}
 
 	if (_scumm->_gameId == GID_MONKEY_VGA || _scumm->_gameId == GID_MONKEY_EGA) {
+		// Sound is currently not supported at all in the amiga versions of these games
+		if (_scumm->_features & GF_AMIGA)
+			return;
+
 		// FIXME: This evil hack works around the fact that in some
 		// places in MonkeyVGA, the music is never explicitly stopped.
 		// Rather it seems that starting a new music is supposed to 
@@ -471,9 +475,7 @@
 		// This hack relays on the fact that we currently don't support SFX
 		// in these games, only music. Once we add SFX support, we'll have to
 		// revise it / replace it by a proper fix.
-		if (_scumm->_features & GF_AMIGA)
-			return;
-		else if (ptr) {
+		if (ptr) {
 			_scumm->_imuse->stop_all_sounds();
 		}
 	}