aboutsummaryrefslogtreecommitdiff
path: root/engines/queen
diff options
context:
space:
mode:
authorMax Horn2007-03-17 00:53:21 +0000
committerMax Horn2007-03-17 00:53:21 +0000
commit15d9bc42ea14d1c1fd5d1f8787664bbf0944d0a3 (patch)
tree1658efcaefcad7d9c8301317ea1acd3707048e76 /engines/queen
parenta6f3ed8173a0490855df84e955229c9f77ecf9c2 (diff)
downloadscummvm-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/queen')
-rw-r--r--engines/queen/input.cpp4
-rw-r--r--engines/queen/journal.cpp4
2 files changed, 6 insertions, 2 deletions
diff --git a/engines/queen/input.cpp b/engines/queen/input.cpp
index 82bcc9d8da..578aa56e03 100644
--- a/engines/queen/input.cpp
+++ b/engines/queen/input.cpp
@@ -21,6 +21,7 @@
*/
#include "common/stdafx.h"
+#include "common/events.h"
#include "common/system.h"
#include "queen/input.h"
@@ -91,7 +92,8 @@ void Input::delay(uint amount) {
uint32 end = _system->getMillis() + amount;
do {
OSystem::Event event;
- while (_system->pollEvent(event)) {
+ Common::EventManager *eventMan = _system->getEventManager();
+ while (eventMan->pollEvent(event)) {
_idleTime = 0;
switch (event.type) {
case OSystem::EVENT_KEYDOWN:
diff --git a/engines/queen/journal.cpp b/engines/queen/journal.cpp
index 82a2a5e0b8..be4b3a45a1 100644
--- a/engines/queen/journal.cpp
+++ b/engines/queen/journal.cpp
@@ -21,6 +21,7 @@
*/
#include "common/stdafx.h"
+#include "common/events.h"
#include "common/system.h"
#include "queen/journal.h"
@@ -65,7 +66,8 @@ void Journal::use() {
_quitMode = QM_LOOP;
while (_quitMode == QM_LOOP) {
OSystem::Event event;
- while (_system->pollEvent(event)) {
+ Common::EventManager *eventMan = _system->getEventManager();
+ while (eventMan->pollEvent(event)) {
switch (event.type) {
case OSystem::EVENT_KEYDOWN:
handleKeyDown(event.kbd.ascii, event.kbd.keycode);