[Scummvm-cvs-logs] SF.net SVN: scummvm: [32933] scummvm/branches/gsoc2008-rtl/engines/queen

[cpage88 at users.sourceforge.net]

Revision: 32933
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32933&view=rev
Author:   cpage88
Date:     2008-07-06 16:42:29 -0700 (Sun, 06 Jul 2008)

Log Message:
-----------
QUEEN: Made it possible to quit during the intro cutaways

Modified Paths:
--------------
    scummvm/branches/gsoc2008-rtl/engines/queen/input.cpp
    scummvm/branches/gsoc2008-rtl/engines/queen/logic.cpp

Modified: scummvm/branches/gsoc2008-rtl/engines/queen/input.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/queen/input.cpp	2008-07-06 21:38:26 UTC (rev 32932)
+++ scummvm/branches/gsoc2008-rtl/engines/queen/input.cpp	2008-07-06 23:42:29 UTC (rev 32933)
@@ -121,6 +121,8 @@
 
 			case Common::EVENT_QUIT:
 				_vm->quitGame();
+				if (_cutawayRunning)
+					_cutawayQuit = true;
 				return;
 
 			default:

Modified: scummvm/branches/gsoc2008-rtl/engines/queen/logic.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/queen/logic.cpp	2008-07-06 21:38:26 UTC (rev 32932)
+++ scummvm/branches/gsoc2008-rtl/engines/queen/logic.cpp	2008-07-06 23:42:29 UTC (rev 32933)
@@ -2076,6 +2076,8 @@
 		displayRoom(currentRoom(), RDM_FADE_NOJOE, 100, 2, true);
 		playCutaway("CLOGO.CUT");
 		sceneReset();
+		if (_vm->_quit)
+			return true;
 		currentRoom(ROOM_HOTEL_LOBBY);
 		entryObj(584);
 		displayRoom(currentRoom(), RDM_FADE_JOE, 100, 2, true);
@@ -2129,7 +2131,11 @@
 	} else if (currentRoom() == FOTAQ_LOGO && gameState(VAR_INTRO_PLAYED) == 0) {
 		displayRoom(currentRoom(), RDM_FADE_NOJOE, 100, 2, true);
 		playCutaway("COPY.CUT");
+		if (_vm->_quit)
+			return true;
 		playCutaway("CLOGO.CUT");
+		if (_vm->_quit)
+			return true;
 		if (_vm->resource()->getPlatform() != Common::kPlatformAmiga) {
 			if (ConfMan.getBool("alt_intro") && _vm->resource()->isCD()) {
 				playCutaway("CINTR.CUT");
@@ -2137,7 +2143,11 @@
 				playCutaway("CDINT.CUT");
 			}
 		}
+		if (_vm->_quit)
+			return true;
 		playCutaway("CRED.CUT");
+		if (_vm->_quit)
+			return true;
 		_vm->display()->palSetPanel();
 		sceneReset();
 		currentRoom(ROOM_HOTEL_LOBBY);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.