[Pingus-CVS] CVS: Games/Pingus/src pingus_menu_manager.cxx,1.11,1.12 pingus_menu_manager.hxx,1.11,1.12

[grumbel]

Update of /usr/local/cvsroot/Games/Pingus/src
In directory dark:/tmp/cvs-serv29298/src

Modified Files:
        pingus_menu_manager.cxx pingus_menu_manager.hxx 
Log Message:
- added little marker that this is an unplayable develpment version
- fixed bug in laser_exit_obj
- fixed bug in laser kill

Index: pingus_menu_manager.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_menu_manager.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- pingus_menu_manager.cxx     5 Sep 2002 12:24:02 -0000       1.11
+++ pingus_menu_manager.cxx     13 Sep 2002 18:28:26 -0000      1.12
@@ -31,13 +31,16 @@
 PingusMenuManager* PingusMenuManager::instance_ = 0;
 
 PingusMenuManager::PingusMenuManager ()
-  : event_register_counter (0),
+  : unplayable ("misc/unplayable", "core"),
     intro (this), mainmenu (this), optionmenu (this), story (this),
     exitmenu (this)
 {
+  unplayable.set_align_center ();
+
   //current_menu = 0;
   //if (intro_disabled)
   push_menu (&mainmenu);
+  
   //else
   //push_menu (&intro); 
 }
@@ -50,6 +53,9 @@
 PingusMenuManager::draw (GraphicContext& gc)
 {
   background.draw ();
+  
+  gc.draw (unplayable, CL_Vector(CL_Display::get_width ()/2, 30));
+
   CL_Display::fill_rect(0, CL_Display::get_height () - 22,
                        CL_Display::get_width (), CL_Display::get_height (),
                        0, 0, 0, 1.0f);

Index: pingus_menu_manager.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_menu_manager.hxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- pingus_menu_manager.hxx     5 Sep 2002 12:24:02 -0000       1.11
+++ pingus_menu_manager.hxx     13 Sep 2002 18:28:26 -0000      1.12
@@ -26,6 +26,7 @@
 #include "pingus_menu.hxx"
 #include "intro.hxx"
 #include "option_menu.hxx"
+#include "sprite.hxx"
 
 class PingusSubMenu;
 
@@ -38,9 +39,7 @@
   typedef std::vector<PingusSubMenu *>::iterator MenuStackIter;
   typedef std::vector<PingusSubMenu *>::reverse_iterator MenuStackRIter;
 
-  bool loop;
-
-  int event_register_counter;
+  Sprite unplayable;
   
   /// Register all event-handling stuff
   void register_events ();