[Scummvm-cvs-logs] scummvm master -> dacd7d4022ef049fbcf59a3b555b6d9ee8c1511e

[dreammaster]

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:
dacd7d4022 MADS: Correctly show main menu after showing credits


Commit: dacd7d4022ef049fbcf59a3b555b6d9ee8c1511e
    https://github.com/scummvm/scummvm/commit/dacd7d4022ef049fbcf59a3b555b6d9ee8c1511e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-03-07T17:14:49-05:00

Commit Message:
MADS: Correctly show main menu after showing credits

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



diff --git a/engines/mads/nebular/dialogs_nebular.cpp b/engines/mads/nebular/dialogs_nebular.cpp
index 6985455..23aef6b 100644
--- a/engines/mads/nebular/dialogs_nebular.cpp
+++ b/engines/mads/nebular/dialogs_nebular.cpp
@@ -328,7 +328,7 @@ void DialogsNebular::showDialog() {
 			TextView *dlg = new RexTextView(_vm);
 			dlg->show();
 			delete dlg;
-			break;
+			return;
 		}
 		case DIALOG_ANIMVIEW: {
 			AnimationView *dlg = new RexAnimationView(_vm);
diff --git a/engines/mads/nebular/game_nebular.cpp b/engines/mads/nebular/game_nebular.cpp
index 8c8d4ab..ce3b5a8 100644
--- a/engines/mads/nebular/game_nebular.cpp
+++ b/engines/mads/nebular/game_nebular.cpp
@@ -110,7 +110,9 @@ void GameNebular::startGame() {
 	}
 	*/
 
+	_sectionNumber = 1;
 	initSection(_sectionNumber);
+	_vm->_events->setCursor(CURSOR_ARROW);
 	_statusFlag = true;
 
 	// Show the main menu
diff --git a/engines/mads/nebular/menu_nebular.cpp b/engines/mads/nebular/menu_nebular.cpp
index 358a978..2fdef34 100644
--- a/engines/mads/nebular/menu_nebular.cpp
+++ b/engines/mads/nebular/menu_nebular.cpp
@@ -136,14 +136,12 @@ void MainMenu::doFrame() {
 			addSpriteSlot();
 		}
 
-		_vm->_events->setCursor(CURSOR_ARROW);
 		_vm->_events->showCursor();
 	} else {
 		if ((_menuItemIndex == -1) || (_frameIndex == 0)) {
 			if (++_menuItemIndex == 6) {
 
 				// Reached end of display animation
-				_vm->_events->setCursor(CURSOR_ARROW);
 				_vm->_events->showCursor();
 				return;
 			} else if (_menuItemIndex == 4 && !shouldShowQuotes()) {