4 files changed, 22 insertions, 22 deletions
diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp
index f8ed59a7a6..e816651e48 100644
--- a/engines/sword1/animation.cpp
+++ b/engines/sword1/animation.cpp
@@ -200,19 +200,19 @@ void MoviePlayer::play(void) {
 		syncFrame();
 		updateScreen();
 		_currentFrame++;
-		OSystem::Event event;
+		Common::Event event;
 		while (eventMan->pollEvent(event)) {
 			switch (event.type) {
-			case OSystem::EVENT_SCREEN_CHANGED:
+			case Common::EVENT_SCREEN_CHANGED:
 				handleScreenChanged();
 				break;
-			case OSystem::EVENT_KEYDOWN:
+			case Common::EVENT_KEYDOWN:
 				if (event.kbd.keycode == 27) {
 					_snd->stopHandle(_bgSoundHandle);
 					terminated = true;
 				}
 				break;
-			case OSystem::EVENT_QUIT:
+			case Common::EVENT_QUIT:
 				_sys->quit();
 				break;
 			default:
diff --git a/engines/sword1/control.cpp b/engines/sword1/control.cpp
index ec612ce1fc..aeb9da700b 100644
--- a/engines/sword1/control.cpp
+++ b/engines/sword1/control.cpp
@@ -1028,7 +1028,7 @@ void Control::doRestore(void) {
 }
 
 void Control::delay(uint32 msecs) {
-	OSystem::Event event;
+	Common::Event event;
 
 	uint32 now = _system->getMillis();
 	uint32 endTime = now + msecs;
@@ -1039,7 +1039,7 @@ void Control::delay(uint32 msecs) {
 		Common::EventManager *eventMan = _system->getEventManager();
 		while (eventMan->pollEvent(event)) {
 			switch (event.type) {
-			case OSystem::EVENT_KEYDOWN:
+			case Common::EVENT_KEYDOWN:
 
 				// Make sure backspace works right (this fixes a small issue on OS X)
 				if (event.kbd.keycode == 8)
@@ -1049,11 +1049,11 @@ void Control::delay(uint32 msecs) {
 				// we skip the rest of the delay and return immediately
 				// to handle keyboard input
 				return;
-			case OSystem::EVENT_MOUSEMOVE:
+			case Common::EVENT_MOUSEMOVE:
 				_mouseX = event.mouse.x;
 				_mouseY = event.mouse.y;
 				break;
-			case OSystem::EVENT_LBUTTONDOWN:
+			case Common::EVENT_LBUTTONDOWN:
 				_mouseDown = true;
 				_mouseState |= BS1L_BUTTON_DOWN;
 #if defined(_WIN32_WCE) || defined(PALMOS_MODE)
@@ -1061,19 +1061,19 @@ void Control::delay(uint32 msecs) {
 				_mouseY = event.mouse.y;
 #endif
 				break;
-			case OSystem::EVENT_LBUTTONUP:
+			case Common::EVENT_LBUTTONUP:
 				_mouseDown = false;
 				_mouseState |= BS1L_BUTTON_UP;
 				break;
-			case OSystem::EVENT_WHEELUP:
+			case Common::EVENT_WHEELUP:
 				_mouseDown = false;
 				_mouseState |= BS1_WHEEL_UP;
 				break;
-			case OSystem::EVENT_WHEELDOWN:
+			case Common::EVENT_WHEELDOWN:
 				_mouseDown = false;
 				_mouseState |= BS1_WHEEL_DOWN;
 				break;
-			case OSystem::EVENT_QUIT:
+			case Common::EVENT_QUIT:
 				SwordEngine::_systemVars.engineQuit = true;
 				break;
 			default:
diff --git a/engines/sword1/credits.cpp b/engines/sword1/credits.cpp
index 06539f986f..aa520367d7 100644
--- a/engines/sword1/credits.cpp
+++ b/engines/sword1/credits.cpp
@@ -272,13 +272,13 @@ uint8 CreditsPlayer::getPalIdx(uint8 r, uint8 g, uint8 b) {
 
 void CreditsPlayer::delay(int msecs) {
 
-	OSystem::Event event;
+	Common::Event event;
 	uint32 start = _system->getMillis();
 	do {
 		Common::EventManager *eventMan = _system->getEventManager();
 		while (eventMan->pollEvent(event)) {
 			switch (event.type) {
-			case OSystem::EVENT_QUIT:
+			case Common::EVENT_QUIT:
 				SwordEngine::_systemVars.engineQuit = true;
 				break;
 			default:
diff --git a/engines/sword1/sword1.cpp b/engines/sword1/sword1.cpp
index d9c689a769..7a783c63b3 100644
--- a/engines/sword1/sword1.cpp
+++ b/engines/sword1/sword1.cpp
@@ -702,45 +702,45 @@ uint8 SwordEngine::mainLoop(void) {
 
 void SwordEngine::delay(int32 amount) { //copied and mutilated from sky.cpp
 
-	OSystem::Event event;
+	Common::Event event;
 	uint32 start = _system->getMillis();
 
 	do {
 		Common::EventManager *eventMan = _system->getEventManager();
 		while (eventMan->pollEvent(event)) {
 			switch (event.type) {
-			case OSystem::EVENT_KEYDOWN:
+			case Common::EVENT_KEYDOWN:
 				// Make sure backspace works right (this fixes a small issue on OS X)
 				if (event.kbd.keycode == 8)
 					_keyPressed = 8;
 				else
 					_keyPressed = (uint8)event.kbd.ascii;
 				break;
-			case OSystem::EVENT_MOUSEMOVE:
+			case Common::EVENT_MOUSEMOVE:
 				_mouseX = event.mouse.x;
 				_mouseY = event.mouse.y;
 				break;
-			case OSystem::EVENT_LBUTTONDOWN:
+			case Common::EVENT_LBUTTONDOWN:
 				_mouseState |= BS1L_BUTTON_DOWN;
 #if defined(_WIN32_WCE) || defined(PALMOS_MODE)
 				_mouseX = event.mouse.x;
 				_mouseY = event.mouse.y;
 #endif
 				break;
-			case OSystem::EVENT_RBUTTONDOWN:
+			case Common::EVENT_RBUTTONDOWN:
 				_mouseState |= BS1R_BUTTON_DOWN;
 #if defined(_WIN32_WCE) || defined(PALMOS_MODE)
 				_mouseX = event.mouse.x;
 				_mouseY = event.mouse.y;
 #endif
 				break;
-			case OSystem::EVENT_LBUTTONUP:
+			case Common::EVENT_LBUTTONUP:
 				_mouseState |= BS1L_BUTTON_UP;
 				break;
-			case OSystem::EVENT_RBUTTONUP:
+			case Common::EVENT_RBUTTONUP:
 				_mouseState |= BS1R_BUTTON_UP;
 				break;
-			case OSystem::EVENT_QUIT:
+			case Common::EVENT_QUIT:
 				_systemVars.engineQuit = true;
 				break;
 			default: