[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.53,1.54

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/simon
In directory usw-pr-cvs1:/tmp/cvs-serv29002/simon

Modified Files:
	simon.cpp 
Log Message:

Fix simon sound effects again


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- simon.cpp	5 Nov 2002 12:56:32 -0000	1.53
+++ simon.cpp	5 Nov 2002 13:42:25 -0000	1.54
@@ -4944,9 +4944,9 @@
 	if (_effects_sound != 0)
 		_mixer->stop(_effects_sound);
 
-	if ((_game & GAME_SIMON2) && !(_game & GAME_WIN))  {			/* VOC sound simon2talkie */
+	if ((_game & GAME_SIMON2) && !(_game & GAME_WIN))  {			/* VOC sound simon2dos/talkie */
 		playVoc(_game_file, _effects_offsets, sound, &_effects_sound);
-	} else if (!(_game & GAME_WIN)) {			/* VOC sound simon1talkie/win */
+	} else if (_game == GAME_SIMON1TALKIE) {			/* VOC sound simon1talkie */
 #ifdef USE_MAD
 		if (_effects_type == FORMAT_MP3) {
 			playMP3(_effects_file, _effects_offsets, sound, &_effects_sound);
@@ -4956,7 +4956,7 @@
 #ifdef USE_MAD
 		}
 #endif
-	} else 	if ((_game & GAME_SIMON2) && (_game & GAME_WIN)) { 		/* sound simon2win */
+	} else 	if (_game & GAME_WIN) { 		/* sound simon1/2win */
 		byte *p;
 
 		if (_playing_sound != 0)