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/sword2 | |
| 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/sword2')
| -rw-r--r-- | engines/sword2/animation.cpp | 4 | ||||
| -rw-r--r-- | engines/sword2/sword2.cpp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/engines/sword2/animation.cpp b/engines/sword2/animation.cpp index 1d7dd3e98e..b56d122509 100644 --- a/engines/sword2/animation.cpp +++ b/engines/sword2/animation.cpp @@ -22,6 +22,7 @@ #include "common/stdafx.h" #include "common/config-manager.h" #include "common/file.h" +#include "common/events.h" #include "common/system.h" #include "sword2/sword2.h" @@ -408,7 +409,8 @@ void MoviePlayer::play(SequenceTextInfo *textList, uint32 numLines, int32 leadIn OSystem::Event event; - while (_system->pollEvent(event)) { + Common::EventManager *eventMan = _system->getEventManager(); + while (eventMan->pollEvent(event)) { switch (event.type) { case OSystem::EVENT_SCREEN_CHANGED: handleScreenChanged(); diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp index fb162aae62..d04cdadfa2 100644 --- a/engines/sword2/sword2.cpp +++ b/engines/sword2/sword2.cpp @@ -26,6 +26,7 @@ #include "common/config-manager.h" #include "common/file.h" #include "common/fs.h" +#include "common/events.h" #include "common/system.h" #include "sword2/sword2.h" @@ -540,7 +541,8 @@ void Sword2Engine::parseInputEvents() { uint32 now = _system->getMillis(); - while (_system->pollEvent(event)) { + Common::EventManager *eventMan = _system->getEventManager(); + while (eventMan->pollEvent(event)) { switch (event.type) { case OSystem::EVENT_KEYDOWN: if (event.kbd.flags == OSystem::KBD_CTRL) { |