From 93890a49c1f62791f39e4ee07c2366c8fdb8fb37 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 16 Jun 2010 23:28:20 +0000
Subject: Added back the functionality to skip videos

svn-id: r49911
---
 engines/sci/engine/kgraphics.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'engines/sci/engine')

diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index 424d5049e5..5c84ddfb49 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -1160,8 +1160,9 @@ reg_t kShowMovie(EngineState *s, int argc, reg_t *argv) {
 	if (videoDecoder) {
 		uint16 x = (screenWidth - videoDecoder->getWidth()) / 2;
 		uint16 y = (screenHeight - videoDecoder->getHeight()) / 2;
+		bool skipVideo = false;
 
-		while (!g_engine->shouldQuit() && !videoDecoder->endOfVideo()) {
+		while (!g_engine->shouldQuit() && !videoDecoder->endOfVideo() && !skipVideo) {
 			if (videoDecoder->needsUpdate()) {
 				Graphics::Surface *frame = videoDecoder->decodeNextFrame();
 				if (frame) {
@@ -1175,8 +1176,10 @@ reg_t kShowMovie(EngineState *s, int argc, reg_t *argv) {
 			}
 
 			Common::Event event;
-			while (g_system->getEventManager()->pollEvent(event))
-				;
+			while (g_system->getEventManager()->pollEvent(event)) {
+				if ((event.type == Common::EVENT_KEYDOWN && event.kbd.keycode == Common::KEYCODE_ESCAPE) || event.type == Common::EVENT_LBUTTONUP)
+					skipVideo = true;
+			}
 
 			g_system->delayMillis(10);
 		}
-- 
cgit v1.2.3