From 65ca749f0ac3fef8e056f9df7cb7520c38669c16 Mon Sep 17 00:00:00 2001
From: Colin Snover
Date: Fri, 22 Jul 2016 09:26:21 -0500
Subject: SCI32: Improve behaviour of screen transitions

1. Use the same throttling speed as normal frameouts. The
   old throttling speed seemed a bit too slow.
2. Exit the event loop immediately if the engine is supposed to
   quit, instead of forcing the user to wait until the transition
   has finished before quitting.
---
 engines/sci/graphics/frameout.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp
index 7bb9a4f5cf..a7899b8d89 100644
--- a/engines/sci/graphics/frameout.cpp
+++ b/engines/sci/graphics/frameout.cpp
@@ -1516,6 +1516,10 @@ void GfxFrameout::processShowStyles() {
 			}
 		}
 
+		if (g_engine->shouldQuit()) {
+			return;
+		}
+
 		if (doFrameOut) {
 			frameOut(true);
 
@@ -1523,9 +1527,7 @@ void GfxFrameout::processShowStyles() {
 			// fast, but the throttle value is arbitrary. Someone on
 			// real hardware probably needs to test what the actual
 			// speed of these transitions should be
-			EngineState *state = g_sci->getEngineState();
-			state->speedThrottler(33);
-			state->_throttleTrigger = true;
+			throttle();
 		}
 	} while(continueProcessing && doFrameOut);
 }
-- 
cgit v1.2.3