[Scummvm-cvs-logs] SF.net SVN: scummvm:[42180] scummvm/trunk/engines/kyra/kyra_mr.cpp

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Mon Jul 6 18:17:03 CEST 2009


Revision: 42180
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42180&view=rev
Author:   lordhoto
Date:     2009-07-06 16:17:03 +0000 (Mon, 06 Jul 2009)

Log Message:
-----------
Fix RTL from Kyra3 main menu. (It now doesn't quit ScummVM anymore)

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_mr.cpp

Modified: scummvm/trunk/engines/kyra/kyra_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_mr.cpp	2009-07-06 15:50:44 UTC (rev 42179)
+++ scummvm/trunk/engines/kyra/kyra_mr.cpp	2009-07-06 16:17:03 UTC (rev 42180)
@@ -310,16 +310,19 @@
 			break;
 
 		case 3:
-		default:
 			fadeOutMusic(60);
 			_screen->fadeToBlack(60);
 			uninitMainMenu();
 			quitGame();
 			running = false;
+			break;
+
+		default:
+			break;
 		}
 	}
 
-	if (_showOutro)
+	if (_showOutro && !shouldQuit())
 		playVQA("CREDITS");
 
 	return Common::kNoError;


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




More information about the Scummvm-git-logs mailing list