aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--simon/items.cpp12
-rw-r--r--simon/simon.cpp2
2 files changed, 7 insertions, 7 deletions
diff --git a/simon/items.cpp b/simon/items.cpp
index 5a5b745f86..4179315707 100644
--- a/simon/items.cpp
+++ b/simon/items.cpp
@@ -1307,17 +1307,17 @@ void SimonState::o_quit_if_user_presses_y() {
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;
}
diff --git a/simon/simon.cpp b/simon/simon.cpp
index a3e3707086..6056c643c6 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -1088,7 +1088,6 @@ void SimonState::playSting(uint a) {
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 @@ void SimonState::shutdown() {
delete _game_file;
_game_file = NULL;
}
+ _system->quit();
}
void SimonState::delay(uint amount) {