diff options
| author | Travis Howell | 2003-05-29 06:05:34 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-05-29 06:05:34 +0000 |
| commit | 6416c7d25d5365c8af40854025c7dc7308900c61 (patch) | |
| tree | b929bafb7d1c50c0f5957ad26766008962477d57 /simon | |
| parent | 46321eaf622a5d6d2c14dbb754d3437b253d2020 (diff) | |
| download | scummvm-rg350-6416c7d25d5365c8af40854025c7dc7308900c61.tar.gz scummvm-rg350-6416c7d25d5365c8af40854025c7dc7308900c61.tar.bz2 scummvm-rg350-6416c7d25d5365c8af40854025c7dc7308900c61.zip | |
Use shutdown function before quiting
svn-id: r8079
Diffstat (limited to 'simon')
| -rw-r--r-- | simon/items.cpp | 12 | ||||
| -rw-r--r-- | simon/simon.cpp | 2 |
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) { |