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/agos/script.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines/agos/script.cpp')

diff --git a/engines/agos/script.cpp b/engines/agos/script.cpp
index 39c172be62..4bcb573e09 100644
--- a/engines/agos/script.cpp
+++ b/engines/agos/script.cpp
@@ -965,7 +965,7 @@ void AGOSEngine::writeVariable(uint16 variable, uint16 contents) {
 int AGOSEngine::runScript() {
 	bool flag;
 
-	if (quit())
+	if (shouldQuit())
 		return 1;
 
 	do {
@@ -1010,9 +1010,9 @@ int AGOSEngine::runScript() {
 			error("Invalid opcode '%d' encountered", _opcode);
 
 		executeOpcode(_opcode);
-	} while  (getScriptCondition() != flag && !getScriptReturn() && !quit());
+	} while  (getScriptCondition() != flag && !getScriptReturn() && !shouldQuit());
 
-	return (quit()) ? 1 : getScriptReturn();
+	return (shouldQuit()) ? 1 : getScriptReturn();
 }
 
 Child *nextSub(Child *sub, int16 key) {
@@ -1066,7 +1066,7 @@ void AGOSEngine::waitForSync(uint a) {
 	_exitCutscene = false;
 	_rightButtonDown = false;
 
-	while (_vgaWaitFor != 0 && !quit()) {
+	while (_vgaWaitFor != 0 && !shouldQuit()) {
 		if (_rightButtonDown) {
 			if (_vgaWaitFor == 200 && (getGameType() == GType_FF || !getBitFlag(14))) {
 				skipSpeech();
-- 
cgit v1.2.3