Force all code to use EventManager::pollEvent instead of OSystem::pollEvent

svn-id: r26156

2 files changed, 6 insertions, 2 deletions

diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp
index 692694851d..48b3738209 100644
--- a/engines/scumm/input.cpp
+++ b/engines/scumm/input.cpp
@@ -24,6 +24,7 @@
 #include "common/stdafx.h"
 
 #include "common/config-manager.h"
+#include "common/events.h"
 #include "common/system.h"
 
 #include "gui/message.h"
@@ -56,7 +57,8 @@ enum MouseButtonStatus {
 void ScummEngine::parseEvents() {
 	OSystem::Event event;
 
-	while (_system->pollEvent(event)) {
+	Common::EventManager *eventMan = _system->getEventManager();
+	while (eventMan->pollEvent(event)) {
 
 		switch (event.type) {
 		case OSystem::EVENT_KEYDOWN:
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 267b78d1f7..74ebd47d26 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -26,6 +26,7 @@
 #include "common/config-manager.h"
 #include "common/fs.h"
 #include "common/md5.h"
+#include "common/events.h"
 #include "common/system.h"
 
 #include "gui/message.h"
@@ -850,7 +851,8 @@ int ScummEngine_vCUPhe::go() {
 void ScummEngine_vCUPhe::parseEvents() {
 	OSystem::Event event;
 	
-	while (_system->pollEvent(event)) {
+	Common::EventManager *eventMan = _system->getEventManager();
+	while (eventMan->pollEvent(event)) {
 		switch (event.type) {
 		case OSystem::EVENT_QUIT:
 			_quit = true;