5 files changed, 17 insertions, 6 deletions
diff --git a/engines/sky/control.cpp b/engines/sky/control.cpp
index bd51fdf9dc..651dd33c4c 100644
--- a/engines/sky/control.cpp
+++ b/engines/sky/control.cpp
@@ -24,6 +24,7 @@
 #include "common/endian.h"
 #include "common/config-manager.h"
 #include "common/file.h"
+#include "common/events.h"
 #include "common/system.h"
 #include "common/savefile.h"
 #include "common/util.h"
@@ -1550,7 +1551,8 @@ void Control::delay(unsigned int amount) {
 	_keyPressed = 0;	//reset
 
 	do {
-		while (_system->pollEvent(event)) {
+		Common::EventManager *eventMan = _system->getEventManager();
+		while (eventMan->pollEvent(event)) {
 			switch (event.type) {
 			case OSystem::EVENT_KEYDOWN:
 				// Make sure backspace works right (this fixes a small issue on OS X)
diff --git a/engines/sky/intro.cpp b/engines/sky/intro.cpp
index c6cd1f344b..2129a1a50a 100644
--- a/engines/sky/intro.cpp
+++ b/engines/sky/intro.cpp
@@ -23,6 +23,7 @@
 #include "common/stdafx.h"
 #include "common/endian.h"
 #include "common/util.h"
+#include "common/events.h"
 #include "common/system.h"
 
 #include "sky/disk.h"
@@ -906,7 +907,8 @@ bool Intro::escDelay(uint32 msecs) {
 
 	int32 nDelay = 0;
 	do {
-		while (_system->pollEvent(event)) {
+		Common::EventManager *eventMan = _system->getEventManager();
+		while (eventMan->pollEvent(event)) {
 			if (event.type == OSystem::EVENT_KEYDOWN) {
 				if (event.kbd.keycode == 27)
 					return false;
diff --git a/engines/sky/mouse.cpp b/engines/sky/mouse.cpp
index da614db04e..d655bb4e08 100644
--- a/engines/sky/mouse.cpp
+++ b/engines/sky/mouse.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/events.h"
 #include "common/system.h"
 #include "graphics/cursorman.h"
 #include "sky/disk.h"
@@ -173,7 +174,8 @@ void Mouse::waitMouseNotPressed(int minDelay) {
 	uint32 now = _system->getMillis();
 	OSystem::Event event;
 	while (mousePressed || _system->getMillis() < now + minDelay) {
-		while (_system->pollEvent(event)) {
+		Common::EventManager *eventMan = _system->getEventManager();
+		while (eventMan->pollEvent(event)) {
 			switch (event.type) {
 			case OSystem::EVENT_LBUTTONUP:
 				mousePressed = false;
diff --git a/engines/sky/screen.cpp b/engines/sky/screen.cpp
index 3cf545b001..a4509250e9 100644
--- a/engines/sky/screen.cpp
+++ b/engines/sky/screen.cpp
@@ -22,6 +22,7 @@
 
 #include "common/stdafx.h"
 #include "common/endian.h"
+#include "common/events.h"
 #include "common/system.h"
 
 #include "sky/disk.h"
@@ -395,7 +396,8 @@ void Screen::waitForTimer(void) {
 		OSystem::Event event;
 
 		_system->delayMillis(10);
-		while (_system->pollEvent(event));
+		Common::EventManager *eventMan = _system->getEventManager();
+		while (eventMan->pollEvent(event));
 	}
 }
 
@@ -404,7 +406,8 @@ void Screen::waitForSequence(void) {
 		OSystem::Event event;
 
 		_system->delayMillis(20);
-		while (_system->pollEvent(event));
+		Common::EventManager *eventMan = _system->getEventManager();
+		while (eventMan->pollEvent(event));
 	}
 }
 
diff --git a/engines/sky/sky.cpp b/engines/sky/sky.cpp
index 056189c54e..edd5926fb2 100644
--- a/engines/sky/sky.cpp
+++ b/engines/sky/sky.cpp
@@ -27,6 +27,7 @@
 #include "common/config-manager.h"
 #include "common/file.h"
 #include "common/fs.h"
+#include "common/events.h"
 #include "common/system.h"
 #include "common/timer.h"
 
@@ -519,7 +520,8 @@ void SkyEngine::delay(int32 amount) {
 		amount = 0;
 
 	do {
-		while (_system->pollEvent(event)) {
+		Common::EventManager *eventMan = _system->getEventManager();
+		while (eventMan->pollEvent(event)) {
 			switch (event.type) {
 			case OSystem::EVENT_KEYDOWN:
 				_keyFlags = event.kbd.flags;