diff options
| author | Paul Gilbert | 2014-12-06 16:43:30 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2014-12-12 23:02:06 -0500 |
| commit | a1e5e8be9481add1402ea337039b755937ef6441 (patch) | |
| tree | 6ea34dbd22b41933f29a100cd0a9b4dd5b21e597 /engines/access/access.cpp | |
| parent | 40b84172969781899347aff208f87da9d243d0ba (diff) | |
| download | scummvm-rg350-a1e5e8be9481add1402ea337039b755937ef6441.tar.gz scummvm-rg350-a1e5e8be9481add1402ea337039b755937ef6441.tar.bz2 scummvm-rg350-a1e5e8be9481add1402ea337039b755937ef6441.zip | |
ACCESS: Cleaned up event handling for scene establish text display
Diffstat (limited to 'engines/access/access.cpp')
| -rw-r--r-- | engines/access/access.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/engines/access/access.cpp b/engines/access/access.cpp index 55fe2514ed..a09e47c733 100644 --- a/engines/access/access.cpp +++ b/engines/access/access.cpp @@ -196,7 +196,7 @@ void AccessEngine::speakText(ASurface *s, const Common::String &msg) { int curPage = 0; int soundsLeft = 0; - for (;;) { + while (!shouldQuit()) { soundsLeft = _countTbl[curPage]; _events->zeroKeys(); @@ -216,7 +216,7 @@ void AccessEngine::speakText(ASurface *s, const Common::String &msg) { if (!_sound->_isVoice) { _events->waitKeyMouse(); } else { - for (;;) { + while (!shouldQuit()) { _sound->freeSounds(); Resource *sound = _sound->loadSound(_narateFile + 99, _sndSubFile); _sound->_soundTable.push_back(SoundEntry(sound, 1)); @@ -225,11 +225,7 @@ void AccessEngine::speakText(ASurface *s, const Common::String &msg) { _events->pollEvents(); - if (_events->_leftButton) { - _events->debounceLeft(); - _sndSubFile += soundsLeft; - break; - } else if (_events->isKeyPending()) { + if (_events->isKeyMousePressed()) { _sndSubFile += soundsLeft; break; } else { |