[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.420,1.421

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26331/simon

Modified Files:
	simon.cpp 
Log Message:

Check sfx/music status before pause.


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.420
retrieving revision 1.421
diff -u -d -r1.420 -r1.421
--- simon.cpp	9 Feb 2004 05:11:50 -0000	1.420
+++ simon.cpp	12 Feb 2004 13:33:01 -0000	1.421
@@ -3552,15 +3552,18 @@
 void SimonEngine::pause() {
 	_key_pressed = 1;
 	_pause = 1;
-	midi.pause(_music_paused ^= 1);
-	_sound->ambientPause(_ambient_paused ^= 1);
+	bool ambient_status = _ambient_paused;
+	bool music_status = _music_paused;
+
+	midi.pause(true);
+	_sound->ambientPause(true);
 	while (_pause) {
 		delay(1);
 		if (_key_pressed == 'p')
 			_pause = 0;
 	}
-	midi.pause(_music_paused ^= 1);
-	_sound->ambientPause(_ambient_paused ^= 1);
+	midi.pause(music_status);
+	_sound->ambientPause(ambient_status);
 
 }