diff options
| author | Max Horn | 2007-03-17 00:53:21 +0000 |
|---|---|---|
| committer | Max Horn | 2007-03-17 00:53:21 +0000 |
| commit | 15d9bc42ea14d1c1fd5d1f8787664bbf0944d0a3 (patch) | |
| tree | 1658efcaefcad7d9c8301317ea1acd3707048e76 /engines/parallaction | |
| parent | a6f3ed8173a0490855df84e955229c9f77ecf9c2 (diff) | |
| download | scummvm-rg350-15d9bc42ea14d1c1fd5d1f8787664bbf0944d0a3.tar.gz scummvm-rg350-15d9bc42ea14d1c1fd5d1f8787664bbf0944d0a3.tar.bz2 scummvm-rg350-15d9bc42ea14d1c1fd5d1f8787664bbf0944d0a3.zip | |
Force all code to use EventManager::pollEvent instead of OSystem::pollEvent
svn-id: r26156
Diffstat (limited to 'engines/parallaction')
| -rw-r--r-- | engines/parallaction/dialogue.cpp | 4 | ||||
| -rw-r--r-- | engines/parallaction/parallaction.cpp | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/engines/parallaction/dialogue.cpp b/engines/parallaction/dialogue.cpp index 732c11ba99..c91c9c96b7 100644 --- a/engines/parallaction/dialogue.cpp +++ b/engines/parallaction/dialogue.cpp @@ -28,6 +28,8 @@ #include "parallaction/parser.h" #include "parallaction/zone.h" +#include "common/events.h" + namespace Parallaction { #define SKIPPED_ANSWER 1000 @@ -433,7 +435,7 @@ void runDialogue(SpeakData *data) { while (e.kbd.ascii != 0xD && passwordLen < MAX_PASSWORD_LENGTH) { // FIXME: see comment for updateInput() - if (!g_system->pollEvent(e)) continue; + if (!g_system->getEventManager()->pollEvent(e)) continue; if (e.type != OSystem::EVENT_KEYDOWN) continue; if (e.type != OSystem::EVENT_QUIT) g_system->quit(); if (!isdigit(e.kbd.ascii)) continue; diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp index 3aecef69ab..eeb29f8bc3 100644 --- a/engines/parallaction/parallaction.cpp +++ b/engines/parallaction/parallaction.cpp @@ -22,9 +22,10 @@ #include "common/stdafx.h" -#include "common/util.h" -#include "common/file.h" #include "common/config-manager.h" +#include "common/events.h" +#include "common/file.h" +#include "common/util.h" #include "sound/mididrv.h" #include "sound/mixer.h" @@ -326,7 +327,8 @@ uint16 Parallaction::updateInput() { _mouseButtons = kMouseNone; - while (g_system->pollEvent(e)) { + Common::EventManager *eventMan = _system->getEventManager(); + while (eventMan->pollEvent(e)) { switch (e.type) { case OSystem::EVENT_KEYDOWN: @@ -375,8 +377,9 @@ void waitUntilLeftClick() { OSystem::Event e; + Common::EventManager *eventMan = g_system->getEventManager(); for (;;) { - g_system->pollEvent(e); + eventMan->pollEvent(e); if (e.type == OSystem::EVENT_LBUTTONUP) break; |