4 files changed, 15 insertions, 15 deletions

diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp
index eb6b6d4dca..36dbadee40 100644
--- a/engines/sword1/animation.cpp
+++ b/engines/sword1/animation.cpp
@@ -302,7 +302,7 @@ void MoviePlayer::play(void) {
 				break;
 			}
 		}
-		if (_vm->quit())
+		if (_vm->shouldQuit())
 			terminated = true;
 	}
 
diff --git a/engines/sword1/control.cpp b/engines/sword1/control.cpp
index d0808d3ece..2e283915fb 100644
--- a/engines/sword1/control.cpp
+++ b/engines/sword1/control.cpp
@@ -215,7 +215,7 @@ void Control::askForCd(void) {
 				notAccepted = false;
 			}
 		}
-	} while (notAccepted && (!g_engine->quit()));
+	} while (notAccepted && (!g_engine->shouldQuit()));
 
 	_resMan->resClose(fontId);
 	free(_screenBuf);
@@ -317,7 +317,7 @@ uint8 Control::runPanel(void) {
 		}
 		delay(1000 / 12);
 		newMode = getClicks(mode, &retVal);
-	} while ((newMode != BUTTON_DONE) && (retVal == 0) && (!g_engine->quit()));
+	} while ((newMode != BUTTON_DONE) && (retVal == 0) && (!g_engine->shouldQuit()));
 
 	if (SwordEngine::_systemVars.controlPanelMode == CP_NORMAL) {
 		uint8 volL, volR;
diff --git a/engines/sword1/credits.cpp b/engines/sword1/credits.cpp
index 258784ab53..a3ce402711 100644
--- a/engines/sword1/credits.cpp
+++ b/engines/sword1/credits.cpp
@@ -125,7 +125,7 @@ void CreditsPlayer::play(void) {
 	uint16 renderY = BUFSIZE_Y / 2;
 	uint16 clearY = 0xFFFF;
 	bool clearLine = false;
-	while (((*textData != FNT_EOB) || (scrollY != renderY)) && !g_engine->quit()) {
+	while (((*textData != FNT_EOB) || (scrollY != renderY)) && !g_engine->shouldQuit()) {
 		if ((int32)_mixer->getSoundElapsedTime(bgSound) - relDelay < (SCROLL_TIMING * 2)) { // sync to audio
 			if (scrollY < BUFSIZE_Y - CREDITS_Y)
 				_system->copyRectToScreen(screenBuf + scrollY * CREDITS_X, CREDITS_X, START_X, START_Y, CREDITS_X, CREDITS_Y);
@@ -175,7 +175,7 @@ void CreditsPlayer::play(void) {
 	uint8 *revoBuf = credFile.decompressFile(REVO_LOGO);
 	uint8 *revoPal = credFile.fetchFile(REVO_PAL, &_palLen);
 	_palLen /= 3;
-	while ((_mixer->getSoundElapsedTime(bgSound) < LOGO_FADEUP_TIME) && !g_engine->quit()) {
+	while ((_mixer->getSoundElapsedTime(bgSound) < LOGO_FADEUP_TIME) && !g_engine->shouldQuit()) {
 		delay(100);
 	}
 	memset(_palette, 0, 256 * 4);
@@ -184,13 +184,13 @@ void CreditsPlayer::play(void) {
 	_system->updateScreen();
 
 	fadePalette(revoPal, true, _palLen);
-	while ((_mixer->getSoundElapsedTime(bgSound) < LOGO_FADEDOWN_TIME) && !g_engine->quit()) {
+	while ((_mixer->getSoundElapsedTime(bgSound) < LOGO_FADEDOWN_TIME) && !g_engine->shouldQuit()) {
 		delay(100);
 	}
 	fadePalette(revoPal, false, _palLen);
 	delay(3000);
 
-	if (g_engine->quit())
+	if (g_engine->shouldQuit())
 		_mixer->stopAll();
 	free(revoBuf);
 }
@@ -200,7 +200,7 @@ void CreditsPlayer::fadePalette(uint8 *srcPal, bool fadeup, uint16 len) {
 	int fadeStart = fadeup ? 0 : 12;
 
 	int relDelay = _system->getMillis();
-	for (int fadeStep = fadeStart; (fadeStep >= 0) && (fadeStep <= 12) && !g_engine->quit(); fadeStep += fadeDir) {
+	for (int fadeStep = fadeStart; (fadeStep >= 0) && (fadeStep <= 12) && !g_engine->shouldQuit(); fadeStep += fadeDir) {
 		for (uint16 cnt = 0; cnt < len * 3; cnt++)
 			_palette[(cnt / 3) * 4 + (cnt % 3)] = (srcPal[cnt] * fadeStep) / 12;
 		_system->setPalette(_palette, 0, 256);
@@ -293,7 +293,7 @@ void CreditsPlayer::delay(int msecs) {
 		if (msecs > 0)
 			_system->delayMillis(10);
 
-	} while ((_system->getMillis() < start + msecs) && !g_engine->quit());
+	} while ((_system->getMillis() < start + msecs) && !g_engine->shouldQuit());
 }
 
 ArcFile::ArcFile(void) {
diff --git a/engines/sword1/sword1.cpp b/engines/sword1/sword1.cpp
index 42124d419e..35fe58e819 100644
--- a/engines/sword1/sword1.cpp
+++ b/engines/sword1/sword1.cpp
@@ -703,7 +703,7 @@ int SwordEngine::go() {
 			_systemVars.controlPanelMode = CP_NEWGAME;
 			if (_control->runPanel() == CONTROL_GAME_RESTORED)
 				_control->doRestore();
-			else if (!quit())
+			else if (!shouldQuit())
 				_logic->startPositions(0);
 		} else {
 			// no savegames, start new game.
@@ -712,10 +712,10 @@ int SwordEngine::go() {
 	}
 	_systemVars.controlPanelMode = CP_NORMAL;
 
-	while (!quit()) {
+	while (!shouldQuit()) {
 		uint8 action = mainLoop();
 
-		if (!quit()) {
+		if (!shouldQuit()) {
 			// the mainloop was left, we have to reinitialize.
 			reinitialize();
 			if (action == CONTROL_GAME_RESTORED)
@@ -756,7 +756,7 @@ uint8 SwordEngine::mainLoop(void) {
 	uint8 retCode = 0;
 	_keyPressed.reset();
 
-	while ((retCode == 0) && (!quit())) {
+	while ((retCode == 0) && (!shouldQuit())) {
 		// do we need the section45-hack from sword.c here?
 		checkCd();
 
@@ -805,9 +805,9 @@ uint8 SwordEngine::mainLoop(void) {
 			}
 			_mouseState = 0;
 			_keyPressed.reset();
-		} while ((Logic::_scriptVars[SCREEN] == Logic::_scriptVars[NEW_SCREEN]) && (retCode == 0) && (!quit()));
+		} while ((Logic::_scriptVars[SCREEN] == Logic::_scriptVars[NEW_SCREEN]) && (retCode == 0) && (!shouldQuit()));
 
-		if ((retCode == 0) && (Logic::_scriptVars[SCREEN] != 53) && _systemVars.wantFade && (!quit())) {
+		if ((retCode == 0) && (Logic::_scriptVars[SCREEN] != 53) && _systemVars.wantFade && (!shouldQuit())) {
 			_screen->fadeDownPalette();
 			int32 relDelay = (int32)_system->getMillis();
 			while (_screen->stillFading()) {