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/scumm/scumm.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'engines/scumm/scumm.cpp')

diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index a10af41145..267dd812ae 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -24,7 +24,6 @@
  */
 
 
-
 #include "common/config-manager.h"
 #include "common/md5.h"
 #include "common/events.h"
@@ -1726,7 +1725,7 @@ int ScummEngine::go() {
 
 	int diff = 0;	// Duration of one loop iteration
 
-	while (!quit()) {
+	while (!shouldQuit()) {
 
 		if (_debugger->isAttached())
 			_debugger->onFrame();
@@ -1759,7 +1758,7 @@ int ScummEngine::go() {
 		diff = _system->getMillis() - diff;
 
 
-		if (quit()) {
+		if (shouldQuit()) {
 			// TODO: Maybe perform an autosave on exit?
 		}
 	}
@@ -1777,7 +1776,7 @@ void ScummEngine::waitForTimer(int msec_delay) {
 
 	start_time = _system->getMillis();
 
-	while (!quit()) {
+	while (!shouldQuit()) {
 		_sound->updateCD(); // Loop CD Audio if needed
 		parseEvents();
 		_system->updateScreen();
@@ -1900,7 +1899,7 @@ load_game:
 	checkExecVerbs();
 	checkAndRunSentenceScript();
 
-	if (quit())
+	if (shouldQuit())
 		return;
 
 	// HACK: If a load was requested, immediately perform it. This avoids
-- 
cgit v1.2.3