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

svn-id: r34700

4 files changed, 6 insertions, 6 deletions

diff --git a/engines/parallaction/exec_ns.cpp b/engines/parallaction/exec_ns.cpp
index 2ce50f498e..9cbb5c33b4 100644
--- a/engines/parallaction/exec_ns.cpp
+++ b/engines/parallaction/exec_ns.cpp
@@ -357,7 +357,7 @@ void CommandExec::runList(CommandList::iterator first, CommandList::iterator las
 	_ctxt.suspend = false;
 
 	for ( ; first != last; first++) {
-		if (_vm->quit())
+		if (_vm->shouldQuit())
 			break;
 
 		CommandPtr cmd = *first;
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp
index 828cb4d021..b52c4cfba8 100644
--- a/engines/parallaction/parallaction.cpp
+++ b/engines/parallaction/parallaction.cpp
@@ -326,7 +326,7 @@ void Parallaction::processInput(int event) {
 void Parallaction::runGame() {
 
 	int event = _input->updateInput();
-	if (quit())
+	if (shouldQuit())
 		return;
 
 	runGuiFrame();
@@ -337,7 +337,7 @@ void Parallaction::runGame() {
 		processInput(event);
 		runPendingZones();
 
-		if (quit())
+		if (shouldQuit())
 			return;
 
 		if (_engineFlags & kEngineChangeLocation) {
diff --git a/engines/parallaction/parallaction_br.cpp b/engines/parallaction/parallaction_br.cpp
index a06fba43f9..8929efdcbc 100644
--- a/engines/parallaction/parallaction_br.cpp
+++ b/engines/parallaction/parallaction_br.cpp
@@ -104,7 +104,7 @@ int Parallaction_br::go() {
 
 	bool splash = true;
 
-	while (!quit()) {
+	while (!shouldQuit()) {
 
 		if (getFeatures() & GF_DEMO) {
 			scheduleLocationSwitch("camalb.1");
@@ -117,7 +117,7 @@ int Parallaction_br::go() {
 
 //		initCharacter();
 
-		while (((_engineFlags & kEngineReturn) == 0) && (!quit())) {
+		while (((_engineFlags & kEngineReturn) == 0) && (!shouldQuit())) {
 			runGame();
 		}
 		_engineFlags &= ~kEngineReturn;
diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp
index 8e11931c28..f4a1ef03ec 100644
--- a/engines/parallaction/parallaction_ns.cpp
+++ b/engines/parallaction/parallaction_ns.cpp
@@ -231,7 +231,7 @@ int Parallaction_ns::go() {
 
 	startGui();
 
-	while (!quit()) {
+	while (!shouldQuit()) {
 		runGame();
 	}