From 69c1f70818aaf83f97bf7131cdf9423c0a75027f Mon Sep 17 00:00:00 2001
From: Bastien Bouclet
Date: Sat, 29 Jul 2017 18:20:45 +0200
Subject: MOHAWK: Riven: Let the gameloop gracefully end when quitting

Prevents the quit confirmation dialog from being displayed at the end of
the game's ending if it is enabled.

Fixes #9943.
---
 engines/mohawk/riven_stacks/bspit.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines/mohawk/riven_stacks/bspit.cpp')

diff --git a/engines/mohawk/riven_stacks/bspit.cpp b/engines/mohawk/riven_stacks/bspit.cpp
index 51d3656761..b1ba5abd7b 100644
--- a/engines/mohawk/riven_stacks/bspit.cpp
+++ b/engines/mohawk/riven_stacks/bspit.cpp
@@ -126,7 +126,7 @@ void BSpit::xblabbooknextpage(const ArgumentArray &args) {
 
 	// Keep turning pages while the mouse is pressed
 	bool firstPageTurn = true;
-	while ((mouseIsDown() || firstPageTurn) && !_vm->shouldQuit()) {
+	while ((mouseIsDown() || firstPageTurn) && !_vm->hasGameEnded()) {
 		// Check for the last page
 		if (page == 22)
 			return;
@@ -313,7 +313,7 @@ void BSpit::xbait(const ArgumentArray &args) {
 	_vm->_cursor->setCursor(kRivenPelletCursor);
 
 	// Loop until the player lets go (or quits)
-	while (mouseIsDown() && !_vm->shouldQuit()) {
+	while (mouseIsDown() && !_vm->hasGameEnded()) {
 		_vm->doFrame();
 	}
 
@@ -369,7 +369,7 @@ void BSpit::xbaitplate(const ArgumentArray &args) {
 	_vm->getCard()->drawPicture(3);
 
 	// Loop until the player lets go (or quits)
-	while (mouseIsDown() && !_vm->shouldQuit()) {
+	while (mouseIsDown() && !_vm->hasGameEnded()) {
 		_vm->doFrame();
 	}
 
@@ -485,7 +485,7 @@ void BSpit::xbchipper(const ArgumentArray &args) {
 	Common::Point startPos = getMouseDragStartPosition();
 
 	bool pulledLever = false;
-	while (mouseIsDown() && !_vm->shouldQuit()) {
+	while (mouseIsDown() && !_vm->hasGameEnded()) {
 		Common::Point pos = getMousePosition();
 		if (pos.y > startPos.y) {
 			pulledLever = true;
-- 
cgit v1.2.3