[Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.60,1.61 simon.cpp,1.185,1.186 simon.h,1.58,1.59 vga.cpp,1.41,1.42

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv5798/simon

Modified Files:
	items.cpp simon.cpp simon.h vga.cpp 
Log Message:

music_unk isn't needed in playmusic, it is always set to 999


Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- items.cpp	19 May 2003 09:47:33 -0000	1.60
+++ items.cpp	19 May 2003 09:59:23 -0000	1.61
@@ -1462,7 +1462,7 @@
 	} else {
 		if (a != _last_music_played) {
 			_last_music_played = a;
-			playMusic(0, a);
+			playMusic(a);
 		}
 	}
 }

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -d -r1.185 -r1.186
--- simon.cpp	19 May 2003 09:41:28 -0000	1.185
+++ simon.cpp	19 May 2003 09:59:23 -0000	1.186
@@ -3115,7 +3115,7 @@
 				if (midi._midi_sfx_toggle)
 					midi.stop();
 				else
-					playMusic(0, _last_music_played);
+					playMusic(_last_music_played);
 			} else
 				_sound->effectsPause(_effects_paused ^= 1);
 			break;
@@ -5041,16 +5041,16 @@
 	// FIXME What exactly should this function do?
 	if (music != 0) {
 		//_midi_cur_song_ptr = ((arg_0 & 0xFFFF) << 4) + midi_songs;
-		if (_vc72_var1 == 999)
+		if (_vc72_var1 == 999) {
 			//midi.initialize();
-
+		}
 		//_midi_var11 = 0;
 		//_midi_var12 = 1;
 	}
 }
 
 
-void SimonState::playMusic(uint music_unk, uint music) {
+void SimonState::playMusic(uint music) {
 	if (midi._midi_sfx_toggle)
 		return;
 
@@ -5063,7 +5063,7 @@
 			midi.playXMIDI (_game_file);
 		}
 		_last_music_played = music;
-		_vc72_var1 = music_unk;
+		_vc72_var1 = 999;
 		_vc70_var1 = 0xFFFF;
 		_vc72_var3 = 0xFFFF;
 		_next_music_to_play = 0xFFFF;

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- simon.h	19 May 2003 09:41:28 -0000	1.58
+++ simon.h	19 May 2003 09:59:23 -0000	1.59
@@ -763,7 +763,7 @@
 	void video_putchar_drawchar(FillOrCopyStruct *fcs, uint x, uint y, byte chr);
 
 	void midi_play(uint music);
-	void playMusic(uint music, uint music_unk);
+	void playMusic(uint music);
 	void checkTimerCallback();
 	void delay(uint delay);
 

Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- vga.cpp	19 May 2003 09:47:33 -0000	1.41
+++ vga.cpp	19 May 2003 09:59:23 -0000	1.42
@@ -1693,7 +1693,7 @@
 	if (!_video_var_3) {
 		if (_game & GF_SIMON2) {
 			if (_next_music_to_play != 0xFFFF)
-				playMusic(999, _next_music_to_play);
+				playMusic(_next_music_to_play);
 		}
 	} else
 		_video_var_3 = true;