[Scummvm-cvs-logs] scummvm master -> 27b6ded6f95fdc01faa5816b8577464685357c2d

dreammaster dreammaster at scummvm.org
Sat Mar 7 23:20:24 CET 2015


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
27b6ded6f9 MADS: Fix Credits and Quotes option on the main menu


Commit: 27b6ded6f95fdc01faa5816b8577464685357c2d
    https://github.com/scummvm/scummvm/commit/27b6ded6f95fdc01faa5816b8577464685357c2d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-03-07T17:18:51-05:00

Commit Message:
MADS: Fix Credits and Quotes option on the main menu

Changed paths:
    engines/mads/nebular/game_nebular.cpp



diff --git a/engines/mads/nebular/game_nebular.cpp b/engines/mads/nebular/game_nebular.cpp
index ce3b5a8..53cdc4d 100644
--- a/engines/mads/nebular/game_nebular.cpp
+++ b/engines/mads/nebular/game_nebular.cpp
@@ -87,38 +87,39 @@ void GameNebular::startGame() {
 		break;
 	}
 
-	checkShowDialog();
-	_winStatus = 0;
-
-	/*
-	// Check copy protection
-	ProtectionResult protectionResult = checkCopyProtection();
-	switch (protectionResult) {
-	case PROTECTION_FAIL:
+	do {
+		checkShowDialog();
+		_winStatus = 0;
+
+		/*
+		// Check copy protection
+		ProtectionResult protectionResult = checkCopyProtection();
+		switch (protectionResult) {
+		case PROTECTION_FAIL:
 		// Copy protection failed
 		_scene._nextSceneId = 804;
 		initializeGlobals();
 		_globals[kCopyProtectFailed] = true;
 		return;
-	case PROTECTION_ESCAPE:
+		case PROTECTION_ESCAPE:
 		// User escaped out of copy protection dialog
 		_vm->quitGame();
 		return;
-	default:
+		default:
 		// Copy protection check succeeded
 		break;
-	}
-	*/
+		}
+		*/
 
-	_sectionNumber = 1;
-	initSection(_sectionNumber);
-	_vm->_events->setCursor(CURSOR_ARROW);
-	_statusFlag = true;
+		_sectionNumber = 1;
+		initSection(_sectionNumber);
+		_vm->_events->setCursor(CURSOR_ARROW);
+		_statusFlag = true;
 
-	// Show the main menu
-	_vm->_dialogs->_pendingDialog = DIALOG_MAIN_MENU;
-	_vm->_dialogs->showDialog();
-	_vm->_dialogs->_pendingDialog = DIALOG_NONE;
+		// Show the main menu
+		_vm->_dialogs->_pendingDialog = DIALOG_MAIN_MENU;
+		_vm->_dialogs->showDialog();
+	} while (!_vm->shouldQuit() && _vm->_dialogs->_pendingDialog != DIALOG_NONE);
 
 	_priorSectionNumber = 0;
 	_priorSectionNumber = -1;






More information about the Scummvm-git-logs mailing list