diff options
| author | Nicola Mettifogo | 2008-07-23 07:52:43 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2008-07-23 07:52:43 +0000 |
| commit | 53615c91288b32892e9a8334ea67d4c0059b575c (patch) | |
| tree | 54f317cca9384d5050d91e5c5faba2802c894250 /engines/parallaction/callables_ns.cpp | |
| parent | 78ccedf8985151c594ef384fda95de295d39bb5c (diff) | |
| download | scummvm-rg350-53615c91288b32892e9a8334ea67d4c0059b575c.tar.gz scummvm-rg350-53615c91288b32892e9a8334ea67d4c0059b575c.tar.bz2 scummvm-rg350-53615c91288b32892e9a8334ea67d4c0059b575c.zip | |
Removed the historical waitUntilLeftClick function and adapted code to use the more general readInput and waitForButtonEvent.
svn-id: r33226
Diffstat (limited to 'engines/parallaction/callables_ns.cpp')
| -rw-r--r-- | engines/parallaction/callables_ns.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/engines/parallaction/callables_ns.cpp b/engines/parallaction/callables_ns.cpp index ed60a193ce..558d6fdc33 100644 --- a/engines/parallaction/callables_ns.cpp +++ b/engines/parallaction/callables_ns.cpp @@ -340,7 +340,7 @@ void Parallaction_ns::_c_endComment(void *param) { g_system->delayMillis(20); } - _input->waitUntilLeftClick(); + _input->waitForButtonEvent(kMouseLeftUp); _balloonMan->freeBalloons(); return; @@ -396,7 +396,9 @@ void Parallaction_ns::_c_finito(void *parm) { _gfx->showLabel(id[1], CENTER_LABEL_HORIZONTAL, 100); _gfx->showLabel(id[2], CENTER_LABEL_HORIZONTAL, 130); _gfx->showLabel(id[3], CENTER_LABEL_HORIZONTAL, 160); - _input->waitUntilLeftClick(); + + _gfx->updateScreen(); + _input->waitForButtonEvent(kMouseLeftUp); _gfx->freeLabels(); @@ -498,18 +500,15 @@ void Parallaction_ns::_c_endIntro(void *parm) { id[0] = _gfx->createLabel(_menuFont, "CLICK MOUSE BUTTON TO START", 1); _gfx->showLabel(id[0], CENTER_LABEL_HORIZONTAL, 80); - - _input->waitUntilLeftClick(); - + _gfx->updateScreen(); + _input->waitForButtonEvent(kMouseLeftUp); _gfx->freeLabels(); - _engineFlags &= ~kEngineBlockInput; selectStartLocation(); - cleanupGame(); - } else { - _input->waitUntilLeftClick(); + _gfx->updateScreen(); + _input->waitForButtonEvent(kMouseLeftUp); } return; |