PEGASUS: Cleanup menu button handling

Also, hooked the Restore button up to the load dialog

1 files changed, 13 insertions, 6 deletions

diff --git a/engines/pegasus/menu.cpp b/engines/pegasus/menu.cpp
index d2cb584d31..8f587c3095 100644
--- a/engines/pegasus/menu.cpp
+++ b/engines/pegasus/menu.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "common/events.h"
+#include "common/textconsole.h"
 
 #include "pegasus/pegasus.h"
 
@@ -81,8 +82,13 @@ void PegasusEngine::runMainMenu() {
 					if (buttonSelected != kDifficultyButton) {
 						drawMenuButtonSelected(buttonSelected);
 						setGameMode(buttonSelected);
-						_sound->stopSound();
-						return;
+
+						if (_gameMode != kMainMenuMode) {
+							_sound->stopSound();
+							return;
+						}
+
+						drawMenu(buttonSelected);
 					}
 					break;
 				default:
@@ -107,6 +113,7 @@ void PegasusEngine::runMainMenu() {
 	// Too slow! Go back and show the intro again.
 	_sound->stopSound();
 	_video->playMovie("Images/Opening_Closing/LilMovie.movie");
+	_gameMode = kIntroMode;
 }
 
 void PegasusEngine::drawMenu(int buttonSelected) {
@@ -159,7 +166,7 @@ void PegasusEngine::setGameMode(int buttonSelected) {
 			_gameMode = kMainGameMode;
 			break;
 		case kDemoCreditsButton:
-			_gameMode = kCreditsMode;
+			warning("No credits just yet");
 			break;
 		case kDemoQuitButton:
 			_gameMode = kQuitMode;
@@ -168,16 +175,16 @@ void PegasusEngine::setGameMode(int buttonSelected) {
 	} else {
 		switch (buttonSelected) {
 		case kInterfaceOverviewButton:
-			_gameMode = kInterfaceOverviewMode;
+			warning("No overview just yet");
 			break;
 		case kStartButton:
 			_gameMode = kMainGameMode;
 			break;
 		case kRestoreButton:
-			_gameMode = kRestoreMode;
+			showLoadDialog();
 			break;
 		case kCreditsButton:
-			_gameMode = kCreditsMode;
+			warning("No credits just yet");
 			break;
 		case kQuitButton:
 			_gameMode = kQuitMode;