Renamed Engine::quit to Engine::shouldQuit (previously, it was easily confused with Engine::quitGame); also cleaned up engine.h a bit

svn-id: r34700

1 files changed, 5 insertions, 5 deletions

diff --git a/engines/kyra/kyra_hof.cpp b/engines/kyra/kyra_hof.cpp
index 76d6f6ea05..e5043f0c4e 100644
--- a/engines/kyra/kyra_hof.cpp
+++ b/engines/kyra/kyra_hof.cpp
@@ -317,7 +317,7 @@ int KyraEngine_HoF::go() {
 
 	if (_menuChoice & 1) {
 		startup();
-		if (!quit())
+		if (!shouldQuit())
 			runLoop();
 		cleanup();
 		
@@ -455,7 +455,7 @@ void KyraEngine_HoF::runLoop() {
 	_screen->updateScreen();
 
 	_runFlag = true;
-	while (!quit() && _runFlag) {
+	while (!shouldQuit() && _runFlag) {
 		if (_deathHandler >= 0) {
 			removeHandItem();
 			delay(5);
@@ -463,7 +463,7 @@ void KyraEngine_HoF::runLoop() {
 			_gui->optionsButton(0);
 			_deathHandler = -1;
 
-			if (!_runFlag || !quit())
+			if (!_runFlag || !shouldQuit())
 				break;
 		}
 
@@ -1630,7 +1630,7 @@ void KyraEngine_HoF::loadInvWsa(const char *filename, int run, int delayTime, in
 	_invWsa.timer = _system->getMillis();
 
 	if (run) {
-		while (_invWsa.running && !skipFlag() && !quit()) {
+		while (_invWsa.running && !skipFlag() && !shouldQuit()) {
 			update();
 			_system->delayMillis(10);
 		}
@@ -2004,7 +2004,7 @@ void KyraEngine_HoF::playTim(const char *filename) {
 		return;
 
 	_tim->resetFinishedFlag();
-	while (!quit() && !_tim->finished()) {
+	while (!shouldQuit() && !_tim->finished()) {
 		_tim->exec(tim, 0);
 		if (_chatText)
 			updateWithText();