[Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.75,1.76 simon.cpp,1.222,1.223

[Travis Howell]

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

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

Use shutdown function before quiting


Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- items.cpp	26 May 2003 08:45:30 -0000	1.75
+++ items.cpp	29 May 2003 06:05:34 -0000	1.76
@@ -1307,17 +1307,17 @@
 	for (;;) {
 		delay(1);
 		if (_key_pressed == 'f' && _language == 20) // Hebrew
-			_system->quit();
+			shutdown();
 		if (_key_pressed == 's' && _language == 5) // Spanish
-			_system->quit();
+			shutdown();
 		if (_key_pressed == 's' && _language == 3) // Italian
-			_system->quit();
+			shutdown();
 		if (_key_pressed == 'o' && _language == 2) // French
-			_system->quit();
+			shutdown();
 		if (_key_pressed == 'j' && _language == 1) // German
-			_system->quit();
+			shutdown();
 		if (_key_pressed == 'y' && _language == 0) // English
-			_system->quit();
+			shutdown();
 		if (_key_pressed == 'n')
 			goto get_out;
 	}

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -d -r1.222 -r1.223
--- simon.cpp	28 May 2003 02:09:18 -0000	1.222
+++ simon.cpp	29 May 2003 06:05:34 -0000	1.223
@@ -1088,7 +1088,6 @@
 	if (_mus_file->read(_mus_offsets, size) != size)
 		error("Can't read offsets");
 
-	// midi.shutdown();
 	_mus_file->seek(_mus_offsets[a], SEEK_SET);
 	midi.loadSMF (_mus_file, a, true);
 	midi.startTrack (0);
@@ -4440,6 +4439,7 @@
 		delete _game_file;
 		_game_file = NULL;
 	}
+	_system->quit();
 }
 
 void SimonState::delay(uint amount) {