From 9b160804ab8878b55efb032fb62ee359ab97f848 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 30 Sep 2008 12:27:38 +0000
Subject: Renamed Engine::quit to Engine::shouldQuit (previously, it was easily
 confused with Engine::quitGame); also cleaned up engine.h a bit

svn-id: r34700
---
 engines/kyra/sequences_lok.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'engines/kyra/sequences_lok.cpp')

diff --git a/engines/kyra/sequences_lok.cpp b/engines/kyra/sequences_lok.cpp
index 77cfbed2d0..c9c1a05842 100644
--- a/engines/kyra/sequences_lok.cpp
+++ b/engines/kyra/sequences_lok.cpp
@@ -163,7 +163,7 @@ void KyraEngine_LoK::seq_introLogos() {
 	_screen->updateScreen();
 	_screen->fadeFromBlack();
 
-	if (_seq->playSequence(_seq_WestwoodLogo, _skipFlag) || quit()) {
+	if (_seq->playSequence(_seq_WestwoodLogo, _skipFlag) || shouldQuit()) {
 		_screen->fadeToBlack();
 		_screen->clearPage(0);
 		return;
@@ -175,14 +175,14 @@ void KyraEngine_LoK::seq_introLogos() {
 		_screen->setScreenPalette(_screen->_currentPalette);
 	}
 
-	if ((_seq->playSequence(_seq_KyrandiaLogo, _skipFlag) && !seq_skipSequence()) || quit()) {
+	if ((_seq->playSequence(_seq_KyrandiaLogo, _skipFlag) && !seq_skipSequence()) || shouldQuit()) {
 		_screen->fadeToBlack();
 		_screen->clearPage(0);
 		return;
 	}
 	_screen->fillRect(0, 179, 319, 199, 0);
 
-	if (quit())
+	if (shouldQuit())
 		return;
 
 	if (_flags.platform == Common::kPlatformAmiga) {
@@ -222,10 +222,10 @@ void KyraEngine_LoK::seq_introLogos() {
 
 			oldDistance = distance;
 			delay(10);
-		} while (!doneFlag && !quit() && !_abortIntroFlag);
+		} while (!doneFlag && !shouldQuit() && !_abortIntroFlag);
 	}
 
-	if (quit())
+	if (shouldQuit())
 		return;
 
 	_seq->playSequence(_seq_Forest, true);
@@ -1029,7 +1029,7 @@ void KyraEngine_LoK::seq_brandonToStone() {
 
 void KyraEngine_LoK::seq_playEnding() {
 	debugC(9, kDebugLevelMain, "KyraEngine_LoK::seq_playEnding()");
-	if (quit())
+	if (shouldQuit())
 		return;
 	_screen->hideMouse();
 	_screen->_curPage = 0;
@@ -1210,7 +1210,7 @@ void KyraEngine_LoK::seq_playCredits() {
 
 bool KyraEngine_LoK::seq_skipSequence() const {
 	debugC(9, kDebugLevelMain, "KyraEngine_LoK::seq_skipSequence()");
-	return quit() || _abortIntroFlag;
+	return shouldQuit() || _abortIntroFlag;
 }
 
 int KyraEngine_LoK::handleMalcolmFlag() {
-- 
cgit v1.2.3