From 8e45582492cab277c5b53884f7ec9c0a22a6e4ca Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 18 Nov 2014 21:47:42 -0500
Subject: ACCESS: Add extra shouldQuit checks during title sequence

---
 engines/access/amazon/amazon_game.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'engines/access')

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index d7ad12e721..dba1b6fb9c 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -273,8 +273,7 @@ void AmazonEngine::doTitle() {
 	_player->_scrollAmount = 1;
 	_pCount = 0;
 
-	while(true) {
-		_events->pollEvents();
+	while (!shouldQuit()) {
 		if (_events->_rightButton) {
 			_skipStart = true;
 			_room->clearRoom();
@@ -293,7 +292,7 @@ void AmazonEngine::doTitle() {
 		if (_screen->_scrollCol + _screen->_vWindowWidth != _room->_playFieldWidth) {
 			_screen->_scrollX += _player->_scrollAmount;
 
-			while (_screen->_scrollX >= TILE_WIDTH && !shouldQuit()) {
+			while (_screen->_scrollX >= TILE_WIDTH) {
 				_screen->_scrollX -= TILE_WIDTH;
 				++_screen->_scrollCol;
 
@@ -316,7 +315,7 @@ void AmazonEngine::doTitle() {
 			g_system->delayMillis(10);
 		}
 
-		while(true) {
+		while (!shouldQuit()) {
 			_pCount = 0;
 			_events->_vbCount = 3;
 			if (_screen->_scrollRow + _screen->_vWindowHeight >= _room->_playFieldHeight) {
-- 
cgit v1.2.3