NWN: Add back the main menu

xoreos · Feb 3, 2014 · 5eac1bb · 5eac1bb
1 parent 9047140
commit 5eac1bb
Showing 1 changed file with 29 additions and 5 deletions.
diff --git a/src/engines/nwn/nwn.cpp b/src/engines/nwn/nwn.cpp
@@ -53,6 +53,9 @@
 #include "engines/aurora/resources.h"
 
 #include "engines/nwn/nwn.h"
+#include "engines/nwn/module.h"
+
+#include "engines/nwn/gui/main/main.h"
 
 namespace Engines {
 
@@ -133,11 +136,7 @@ void NWNEngine::run(const Common::UString &target) {
 	if (ConfigMan.getBool("showfps", false))
 		fps = new Graphics::Aurora::FPS;
 
-	playMenuMusic();
-
-	while (!EventMan.quitRequested()) {
-		EventMan.delay(10);
-	}
+	mainMenuLoop();
 
 	delete fps;
 
@@ -405,6 +404,31 @@ void NWNEngine::mainMenuLoop() {
 	// Start sound
 	playSound("gui_prompt", Sound::kSoundTypeSFX);
 
+	Module module;
+
+	while (!EventMan.quitRequested()) {
+		GUI *mainMenu = new MainMenu(module);
+
+		EventMan.flushEvents();
+
+		mainMenu->setVisible(true);
+		mainMenu->run();
+		mainMenu->setVisible(false);
+
+		delete mainMenu;
+		if (EventMan.quitRequested())
+			break;
+
+		stopMenuMusic();
+
+		module.run();
+		if (EventMan.quitRequested())
+			break;
+
+		playMenuMusic();
+		module.clear();
+	}
+
 	stopMenuMusic();
 }