[Pingus-CVS] r3687 - trunk/pingus/src

[grumbel at BerliOS]

Author: grumbel
Date: 2008-07-05 07:22:56 +0200 (Sat, 05 Jul 2008)
New Revision: 3687

Modified:
   trunk/pingus/src/pingus_main.cpp
   trunk/pingus/src/pingus_menu.hpp
   trunk/pingus/src/pingus_menu_manager.cpp
   trunk/pingus/src/pingus_menu_manager.hpp
Log:
Removed singleton handling from PingusMenuManager

Modified: trunk/pingus/src/pingus_main.cpp
===================================================================
--- trunk/pingus/src/pingus_main.cpp    2008-07-05 04:29:24 UTC (rev 3686)
+++ trunk/pingus/src/pingus_main.cpp    2008-07-05 05:22:56 UTC (rev 3687)
@@ -708,7 +708,7 @@
   else // start a normal game
     {
       pout(PINGUS_DEBUG_LOADING) << "starting normal game" << std::endl;
-      ScreenManager::instance()->push_screen(PingusMenuManager::instance (), 
false);
+      ScreenManager::instance()->push_screen(new PingusMenuManager(), true);
       pout(PINGUS_DEBUG_LOADING) << "done: starting normal game" << std::endl;
     }
 
@@ -804,7 +804,6 @@
   Resource::init();
   Fonts::init();
   ScreenManager::init();
-  PingusMenuManager::init();
   Sound::PingusSound::init();
   PinguActionFactory::init();
   
@@ -821,7 +820,6 @@
   Fonts::deinit();
   PinguActionFactory::deinit();
   Sound::PingusSound::deinit();
-  PingusMenuManager::deinit();
   WorldObjFactory::deinit();
   ScreenManager::deinit();
   StatManager::deinit();

Modified: trunk/pingus/src/pingus_menu.hpp
===================================================================
--- trunk/pingus/src/pingus_menu.hpp    2008-07-05 04:29:24 UTC (rev 3686)
+++ trunk/pingus/src/pingus_menu.hpp    2008-07-05 05:22:56 UTC (rev 3687)
@@ -41,7 +41,6 @@
 
 private:
   Sprite logo;
-  LayerManager layer_manager;
 
   MenuButton* start_button;
   MenuButton* quit_button;

Modified: trunk/pingus/src/pingus_menu_manager.cpp
===================================================================
--- trunk/pingus/src/pingus_menu_manager.cpp    2008-07-05 04:29:24 UTC (rev 
3686)
+++ trunk/pingus/src/pingus_menu_manager.cpp    2008-07-05 05:22:56 UTC (rev 
3687)
@@ -147,26 +147,4 @@
   Sound::PingusSound::play_music("pingus-1.it");
 }
 
-PingusMenuManager*
-PingusMenuManager::instance ()
-{
-  if (instance_)
-    return instance_;
-  else
-    return instance_ = new PingusMenuManager ();
-}
-
-void
-PingusMenuManager::init()
-{
-  instance_ = 0;
-}
-
-void
-PingusMenuManager::deinit()
-{
-  delete instance_;
-}
-
-
 /* EOF */

Modified: trunk/pingus/src/pingus_menu_manager.hpp
===================================================================
--- trunk/pingus/src/pingus_menu_manager.hpp    2008-07-05 04:29:24 UTC (rev 
3686)
+++ trunk/pingus/src/pingus_menu_manager.hpp    2008-07-05 05:22:56 UTC (rev 
3687)
@@ -29,14 +29,9 @@
   static PingusMenuManager* instance_;
   /** Menu stack. the menu on top is .end (), the bottom menu .begin () */
   std::vector<PingusSubMenu *> menu_stack;
-  typedef std::vector<PingusSubMenu *>::iterator MenuStackIter;
+  typedef std::vector<PingusSubMenu *>::iterator         MenuStackIter;
   typedef std::vector<PingusSubMenu *>::reverse_iterator MenuStackRIter;
 
-  /// Register all event-handling stuff
-  void register_events ();
-
-  /// Unregister all event-handling stuff
-  void unregister_events ();
 public:
   /* Menu's FIXME: These shouldn't get exported to the outsite,
      instead only handles (enum's) should be visible */
@@ -44,6 +39,7 @@
   LayerManager background;
   ExitMenu       exitmenu;
 
+  PingusMenuManager();
   virtual ~PingusMenuManager();
 
   bool draw(DrawingContext& gc);
@@ -70,13 +66,6 @@
 
   void on_startup();
 
-  static PingusMenuManager* instance ();
-  static void init();
-  static void deinit();
-
-protected:
-  PingusMenuManager ();
-
 private:
   PingusMenuManager (const PingusMenuManager&);
   PingusMenuManager& operator= (const PingusMenuManager&);