From cbadb51ce75f2ec599203433b50c9d4bf5f51728 Mon Sep 17 00:00:00 2001
From: Christopher Page
Date: Fri, 11 Jul 2008 01:09:48 +0000
Subject: SAGA works with new GMM implementation

svn-id: r33000
---
 engines/saga/introproc_ihnm.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'engines/saga/introproc_ihnm.cpp')

diff --git a/engines/saga/introproc_ihnm.cpp b/engines/saga/introproc_ihnm.cpp
index 6614f4098f..079b355826 100644
--- a/engines/saga/introproc_ihnm.cpp
+++ b/engines/saga/introproc_ihnm.cpp
@@ -59,8 +59,12 @@ int Scene::IHNMStartProc() {
 
 		// Play Cyberdreams logo for 168 frames
 		if (!playTitle(0, logoLength, true)) {
+			if (_vm->quit())
+				return !SUCCESS;
 			// Play Dreamers Guild logo for 10 seconds
 			if (!playLoopingTitle(1, 10)) {
+				if (_vm->quit())
+					return !SUCCESS;
 				// Play the title music
 				_vm->_music->play(1, MUSIC_NORMAL);
 				// Play title screen
@@ -70,6 +74,8 @@ int Scene::IHNMStartProc() {
 	} else {
 		_vm->_music->play(1, MUSIC_NORMAL);
 		playTitle(0, 10);
+		if (_vm->quit())
+			return !SUCCESS;
 		playTitle(2, 12);
 	}
 
@@ -144,7 +150,6 @@ bool Scene::checkKey() {
 		switch (event.type) {
 		case Common::EVENT_QUIT:
 			res = true;
-			_vm->shutDown();
 			break;
 		case Common::EVENT_KEYDOWN:
 			// Don't react to modifier keys alone. The original did
@@ -187,7 +192,7 @@ bool Scene::playTitle(int title, int time, int mode) {
 
 	_vm->_gfx->getCurrentPal(pal_cut);
 
-	while (!done) {
+	while (!done && !_vm->quit()) {
 		curTime = _vm->_system->getMillis();
 
 		switch (phase) {
-- 
cgit v1.2.3