diff options
| author | Martin Kiewitz | 2010-01-10 13:22:45 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-01-10 13:22:45 +0000 |
| commit | bda3fc940c3ecca011b04a32fb20970f53f49d1c (patch) | |
| tree | be32624b9eea53e39e774c257eccabb436eac57a /engines | |
| parent | 4122e411d045d8177deab74950bcb6d77ea6515f (diff) | |
| download | scummvm-rg350-bda3fc940c3ecca011b04a32fb20970f53f49d1c.tar.gz scummvm-rg350-bda3fc940c3ecca011b04a32fb20970f53f49d1c.tar.bz2 scummvm-rg350-bda3fc940c3ecca011b04a32fb20970f53f49d1c.zip | |
SCI: kPortrait - abort on mouse presses only
svn-id: r47225
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/graphics/portrait.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/engines/sci/graphics/portrait.cpp b/engines/sci/graphics/portrait.cpp index fc48ba981c..354c583012 100644 --- a/engines/sci/graphics/portrait.cpp +++ b/engines/sci/graphics/portrait.cpp @@ -172,8 +172,10 @@ void Portrait::doit(Common::Point position, uint16 resourceId, uint16 noun, uint do { _gui->wait(1); curEvent = _event->get(SCI_EVENT_ANY); + if (curEvent.type == SCI_EVENT_MOUSE_PRESS) + userAbort = true; curPosition = _audio->getAudioPosition(); - } while ((curPosition != -1) && (curPosition < timerPosition) && (curEvent.type == SCI_EVENT_NONE)); + } while ((curPosition != -1) && (curPosition < timerPosition) && (!userAbort)); if (syncCue != 0xFFFF) { // Display animation bitmap @@ -186,12 +188,6 @@ void Portrait::doit(Common::Point position, uint16 resourceId, uint16 noun, uint warning("kPortrait: sync information tried to draw non-existant %d", syncCue); } } - - switch (curEvent.type) { - case SCI_EVENT_MOUSE_RELEASE: - case SCI_EVENT_MOUSE_PRESS: - userAbort = true; - } } if (userAbort) |