aboutsummaryrefslogtreecommitdiff
path: root/simon
diff options
context:
space:
mode:
authorTravis Howell2004-02-12 13:33:01 +0000
committerTravis Howell2004-02-12 13:33:01 +0000
commit322266106124af70a0f1c1fb91f77766917c57e0 (patch)
treea10a144bc3cb924bdb45d22b3d15b134d7bd61ba /simon
parentc1c01bcc0e6209afe0e15cbc3a3c3e8b037c8510 (diff)
downloadscummvm-rg350-322266106124af70a0f1c1fb91f77766917c57e0.tar.gz
scummvm-rg350-322266106124af70a0f1c1fb91f77766917c57e0.tar.bz2
scummvm-rg350-322266106124af70a0f1c1fb91f77766917c57e0.zip
Check sfx/music status before pause.
svn-id: r12828
Diffstat (limited to 'simon')
-rw-r--r--simon/simon.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp
index cb3a269b1b..7e6987a102 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -3552,15 +3552,18 @@ void SimonEngine::processSpecialKeys() {
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);
}