diff options
author | Travis Howell | 2009-04-24 10:07:34 +0000 |
---|---|---|
committer | Travis Howell | 2009-04-24 10:07:34 +0000 |
commit | d22aeae5fc64a05ade74e06e78084ee1d8ad2464 (patch) | |
tree | 1eef933bc4749d6ea4e23aa28acc5601b2d0c13f /engines | |
parent | 457acf5e427a7dfaa0c8d6a44ebb2c6cc6c0404e (diff) | |
download | scummvm-rg350-d22aeae5fc64a05ade74e06e78084ee1d8ad2464.tar.gz scummvm-rg350-d22aeae5fc64a05ade74e06e78084ee1d8ad2464.tar.bz2 scummvm-rg350-d22aeae5fc64a05ade74e06e78084ee1d8ad2464.zip |
Fix pausing during video play back.
svn-id: r40098
Diffstat (limited to 'engines')
-rw-r--r-- | engines/agos/agos.cpp | 6 | ||||
-rw-r--r-- | engines/agos/animation.cpp | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp index 2170d4e5dc..5d27d9e90f 100644 --- a/engines/agos/agos.cpp +++ b/engines/agos/agos.cpp @@ -983,13 +983,11 @@ void AGOSEngine::pauseEngineIntern(bool pauseIt) { _midi.pause(true); _mixer->pauseAll(true); - _sound->ambientPause(true); } else { _pause = false; _midi.pause(_musicPaused); _mixer->pauseAll(false); - _sound->ambientPause(_ambientPaused); } } @@ -998,8 +996,10 @@ void AGOSEngine::pause() { while (_pause && !shouldQuit()) { delay(1); - if (_keyPressed.keycode == Common::KEYCODE_PAUSE) + if (_keyPressed.keycode == Common::KEYCODE_PAUSE) { pauseEngine(false); + _keyPressed.reset(); + } } } diff --git a/engines/agos/animation.cpp b/engines/agos/animation.cpp index 92f2c4945f..86332fa0c4 100644 --- a/engines/agos/animation.cpp +++ b/engines/agos/animation.cpp @@ -100,6 +100,8 @@ void MoviePlayer::handleNextFrame() { while (eventMan->pollEvent(event)) { switch (event.type) { case Common::EVENT_KEYDOWN: + if (event.kbd.keycode == Common::KEYCODE_PAUSE) + _vm->pause(); if (event.kbd.ascii == 27) { _leftButtonDown = true; _rightButtonDown = true; |