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

svn-id: r34700

2 files changed, 3 insertions, 3 deletions

diff --git a/engines/touche/menu.cpp b/engines/touche/menu.cpp
index 82490fca38..9da76dadde 100644
--- a/engines/touche/menu.cpp
+++ b/engines/touche/menu.cpp
@@ -433,7 +433,7 @@ void ToucheEngine::handleOptions(int forceDisplay) {
 			_system->delayMillis(10);
 		}
 		_fullRedrawCounter = 2;
-		if (!menuData.exit && quit()) {
+		if (!menuData.exit && shouldQuit()) {
 			if (displayQuitDialog())
 				quitGame();
 		}
diff --git a/engines/touche/touche.cpp b/engines/touche/touche.cpp
index e122187dcd..26170e2734 100644
--- a/engines/touche/touche.cpp
+++ b/engines/touche/touche.cpp
@@ -268,7 +268,7 @@ void ToucheEngine::mainLoop() {
 	}
 
 	uint32 frameTimeStamp = _system->getMillis();
-	for (uint32 cycleCounter = 0; !quit(); ++cycleCounter) {
+	for (uint32 cycleCounter = 0; !shouldQuit(); ++cycleCounter) {
 		if ((cycleCounter % 3) == 0) {
 			runCycle();
 		}
@@ -1837,7 +1837,7 @@ int ToucheEngine::handleActionMenuUnderCursor(const int16 *actions, int offs, in
 	_menuRedrawCounter = 2;
 	Common::Rect rect(0, y, kScreenWidth, y + h);
 	i = -1;
-	while (_inp_rightMouseButtonPressed && !quit()) {
+	while (_inp_rightMouseButtonPressed && !shouldQuit()) {
 		Common::Point mousePos = getMousePos();
 		if (rect.contains(mousePos)) {
 			int c = (mousePos.y - y) / kTextHeight;