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

[Travis Howell]

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

Modified Files:
	simon.cpp 
Log Message:

Small clean up of simon midi code


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- simon.cpp	5 Nov 2002 13:42:25 -0000	1.54
+++ simon.cpp	5 Nov 2002 13:55:04 -0000	1.55
@@ -4994,19 +4994,17 @@
 	/* Simon 1 dos talkie music doesn't detect correct size of music data */
 	/* Simon 2 dos talkie music isn't supported */
 	/* Simon 2 dos music isn't supported */
-	if (_voice_type == FORMAT_WAV) {
+	if (_game & GAME_WIN) {	
 		midi.shutdown();
-		if (_game & GAME_TALKIE || _game & GAME_WIN) {
-			_game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music], SEEK_SET);
-			midi.read_all_songs(_game_file);
-		}
+		_game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music], SEEK_SET);
+		midi.read_all_songs(_game_file);
 	
 		midi.initialize();
 		midi.play();
 	} else if (!(_game & GAME_SIMON2)){
 		midi.shutdown();
 
-		if (_game & GAME_TALKIE || _game & GAME_WIN) {
+		if (_game & GAME_TALKIE) {
 			_game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music], SEEK_SET);
 			midi.read_all_songs_old(_game_file);
 		} else {