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

svn-id: r26156

5 files changed, 19 insertions, 7 deletions

diff --git a/engines/kyra/gui.cpp b/engines/kyra/gui.cpp
index 8654cb2c51..0ca9fd6be2 100644
--- a/engines/kyra/gui.cpp
+++ b/engines/kyra/gui.cpp
@@ -29,6 +29,7 @@
 
 #include "common/config-manager.h"
 #include "common/savefile.h"
+#include "common/events.h"
 #include "common/system.h"
 
 namespace Kyra {
@@ -805,7 +806,8 @@ void KyraEngine::gui_getInput() {
 	uint32 now = _system->getMillis();
 
 	_mouseWheel = 0;
-	while (_system->pollEvent(event)) {
+	Common::EventManager *eventMan = _system->getEventManager();
+	while (eventMan->pollEvent(event)) {
 		switch (event.type) {
 		case OSystem::EVENT_QUIT:
 			quitGame();
@@ -1481,7 +1483,8 @@ void KyraEngine::gui_updateMainMenuAnimation() {
 bool KyraEngine::gui_mainMenuGetInput() {
 	OSystem::Event event;
 
-	while (_system->pollEvent(event)) {
+	Common::EventManager *eventMan = _system->getEventManager();
+	while (eventMan->pollEvent(event)) {
 		switch (event.type) {
 		case OSystem::EVENT_QUIT:
 			quitGame();
diff --git a/engines/kyra/kyra.cpp b/engines/kyra/kyra.cpp
index fe85a439a8..887daa7d92 100644
--- a/engines/kyra/kyra.cpp
+++ b/engines/kyra/kyra.cpp
@@ -24,6 +24,7 @@
 
 #include "common/config-manager.h"
 #include "common/file.h"
+#include "common/events.h"
 #include "common/system.h"
 #include "common/savefile.h"
 
@@ -608,7 +609,8 @@ void KyraEngine::delay(uint32 amount, bool update, bool isMainLoop) {
 
 	uint32 start = _system->getMillis();
 	do {
-		while (_system->pollEvent(event)) {
+		Common::EventManager *eventMan = _system->getEventManager();
+		while (eventMan->pollEvent(event)) {
 			switch (event.type) {
 			case OSystem::EVENT_KEYDOWN:
 				if (event.kbd.keycode >= '1' && event.kbd.keycode <= '9' && 
@@ -705,7 +707,8 @@ void KyraEngine::waitForEvent() {
 	bool finished = false;
 	OSystem::Event event;
 	while (!finished && !_quitFlag) {
-		while (_system->pollEvent(event)) {
+		Common::EventManager *eventMan = _system->getEventManager();
+		while (eventMan->pollEvent(event)) {
 			switch (event.type) {
 			case OSystem::EVENT_KEYDOWN:
 				finished = true;
diff --git a/engines/kyra/sequences_v1.cpp b/engines/kyra/sequences_v1.cpp
index c243781a75..955ca3dd98 100644
--- a/engines/kyra/sequences_v1.cpp
+++ b/engines/kyra/sequences_v1.cpp
@@ -30,6 +30,7 @@
 #include "kyra/animator.h"
 #include "kyra/text.h"
 
+#include "common/events.h"
 #include "common/system.h"
 #include "common/savefile.h"
 
@@ -1170,7 +1171,8 @@ void KyraEngine::seq_playCredits() {
 			_screen->updateScreen();
 		}
 
-		while (_system->pollEvent(event)) {
+		Common::EventManager *eventMan = _system->getEventManager();
+		while (eventMan->pollEvent(event)) {
 			switch (event.type) {
 			case OSystem::EVENT_KEYDOWN:
 				finished = true;
diff --git a/engines/kyra/text.cpp b/engines/kyra/text.cpp
index 4433330c1a..4b2caa39d3 100644
--- a/engines/kyra/text.cpp
+++ b/engines/kyra/text.cpp
@@ -28,6 +28,7 @@
 #include "kyra/animator.h"
 #include "kyra/sprites.h"
 
+#include "common/events.h"
 #include "common/system.h"
 #include "common/endian.h"
 
@@ -117,7 +118,8 @@ void KyraEngine::waitForChatToFinish(int vocFile, int16 chatDuration, const char
 		uint32 nextTime = loopStart + _tickLength; 
 		
 		while (_system->getMillis() < nextTime) {
-			while (_system->pollEvent(event)) {
+			Common::EventManager *eventMan = _system->getEventManager();
+			while (eventMan->pollEvent(event)) {
 				switch (event.type) {
 				case OSystem::EVENT_KEYDOWN:
 					if (event.kbd.keycode == '.')
diff --git a/engines/kyra/vqa.cpp b/engines/kyra/vqa.cpp
index 10f85fcfc1..ddeaa4beb1 100644
--- a/engines/kyra/vqa.cpp
+++ b/engines/kyra/vqa.cpp
@@ -29,6 +29,7 @@
 // The jung2.vqa movie does work, but only thanks to a grotesque hack.
 
 #include "common/stdafx.h"
+#include "common/events.h"
 #include "common/system.h"
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
@@ -662,7 +663,8 @@ void VQAMovie::play() {
 
 			OSystem::Event event;
 
-			while (_system->pollEvent(event)) {
+			Common::EventManager *eventMan = _system->getEventManager();
+			while (eventMan->pollEvent(event)) {
 				switch (event.type) {
 				case OSystem::EVENT_KEYDOWN:
 					if (event.kbd.ascii == 27)