moved menu states into separate directory

asteroids/View.cc

@@ -1,6 +1,6 @@
 #include "View.h"
 #include "CameraBase.h"
-#include "MenuOverlay.h"
+#include "UserInterface.h"
 #include "SimpleConsoleOverlay.h"
 
 #include "Engine.h"
@@ -30,17 +30,29 @@ int View::OnInit (int argc, char* argv[]) {
 	ViewBase::OnInit (argc, argv);
 
 	// We want menu
-	mMenuOverlay = boost::shared_ptr<MenuOverlay> (new MenuOverlay);
-	mMenuOverlay->SetModel ((Model*) mModel);
-	mMenuOverlay->SetView (this);
-	mMenuOverlay->Init();
-	mOverlayManager.Register (mMenuOverlay, GameStateMainMenu);
+	Engine::OverlayBasePtr menu_overlay (new MainMenuOverlay);
+	Engine::OverlayBasePtr game_running_overlay (new GameRunningOverlay);
+	Engine::OverlayBasePtr game_over_overlay (new GameOverOverlay);
+	Engine::OverlayBasePtr level_complete_overlay (new LevelCompleteOverlay);
+	Engine::OverlayBasePtr game_paused_overlay (new GamePausedOverlay);
+	Engine::OverlayBasePtr player_died_overlay (new PlayerDiedOverlay);
 
+	mOverlayManager.Register (menu_overlay, GameStateMainMenu);
+	mOverlayManager.Register (game_running_overlay, GameStateRunning);
+	mOverlayManager.Register (level_complete_overlay, GameStateLevelComplete);
+	mOverlayManager.Register (game_over_overlay, GameStateGameOver);
+	mOverlayManager.Register (player_died_overlay, GameStatePlayerDied);
+	mOverlayManager.Register (game_paused_overlay, GameStatePaused);
+
+	mOverlayManager.InitOverlays();
+
+	/*
 	// We want the console
 	mConsoleOverlay = boost::shared_ptr<Engine::SimpleConsoleOverlay> (new Engine::SimpleConsoleOverlay);
 	// We also want to display the log bar
 	mConsoleOverlay->SetDrawLogBar (true);
 	mOverlayManager.Register (mConsoleOverlay, GameStateMainMenu);
+	*/
 
 	// This is a simple star field that makes the game so spacy
 	int i;
@@ -79,8 +91,6 @@ void View::OnDestroy() {
 	mBackgroundStars.clear();
 	mShipPartsEntityIds.clear();
 
-	mMenuOverlay.reset();
-
 	Engine::ViewBase::OnDestroy();
 }