[Pingus-CVS] CVS: Games/Pingus/src pingus_main.cxx,1.34,1.35 pingus_menu_manager.cxx,1.15,1.16 pingus_menu_manager.hxx,1.14,1.15 surface_button.cxx,1.16,1.17 story.cxx,1.14,NONE story.hxx,1.10,NONE

[grumbel]

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

Modified Files:
        pingus_main.cxx pingus_menu_manager.cxx 
        pingus_menu_manager.hxx surface_button.cxx 
Removed Files:
        story.cxx story.hxx 
Log Message:
- added some debugging stuff to worldmap
- removed story menu, since it was pretty useless

Index: pingus_main.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_main.cxx,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- pingus_main.cxx     3 Nov 2002 13:29:09 -0000       1.34
+++ pingus_main.cxx     3 Nov 2002 23:31:35 -0000       1.35
@@ -507,9 +507,14 @@
         {
           pingus_debug_flags |= PINGUS_DEBUG_INPUT;
         }
+      else if (strcmp (optarg, "worldmap") == 0)
+        {
+          pingus_debug_flags |= PINGUS_DEBUG_WORLDMAP;
+        }
       else
        {
          std::cout << "PingusMain: Unhandled debug flag: " << optarg << 
std::endl;
+          exit(EXIT_FAILURE);
        }
 
       break;

Index: pingus_menu_manager.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_menu_manager.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- pingus_menu_manager.cxx     1 Oct 2002 21:48:32 -0000       1.15
+++ pingus_menu_manager.cxx     3 Nov 2002 23:31:35 -0000       1.16
@@ -26,7 +26,7 @@
 
 PingusMenuManager::PingusMenuManager ()
   : unplayable ("misc/unplayable", "core"),
-    intro (this), mainmenu (this), optionmenu (this), story (this),
+    intro (this), mainmenu (this), optionmenu (this),
     exitmenu (this)
 {
   unplayable.set_align_center ();

Index: pingus_menu_manager.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_menu_manager.hxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- pingus_menu_manager.hxx     1 Oct 2002 21:48:32 -0000       1.14
+++ pingus_menu_manager.hxx     3 Nov 2002 23:31:35 -0000       1.15
@@ -22,7 +22,6 @@
 
 #include "menu_background.hxx"
 #include "exit_menu.hxx"
-#include "story.hxx"
 #include "pingus_menu.hxx"
 #include "intro.hxx"
 #include "option_menu.hxx"
@@ -53,7 +52,6 @@
   PingusMenu mainmenu;
   OptionMenu optionmenu;
   MenuBackground background;
-  Story story;
   ExitMenu exitmenu;
 
   virtual ~PingusMenuManager ();

Index: surface_button.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/surface_button.cxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- surface_button.cxx  12 Oct 2002 00:49:10 -0000      1.16
+++ surface_button.cxx  3 Nov 2002 23:31:35 -0000       1.17
@@ -29,6 +29,7 @@
 #include "theme_selector.hxx"
 #include "surface_button.hxx"
 #include "screen_manager.hxx"
+#include "worldmap/manager.hxx"
 
 /* Headers needed for i18n / gettext */
 #include <clocale>
@@ -366,9 +367,7 @@
 StoryButton::on_click ()
 {
   PingusSound::play_sound ("sounds/letsgo.wav");
-  std::cout << "Set story" << std::endl;
-  menu->get_manager ()->set_menu (&menu->get_manager ()->story);
-  std::cout << "Set done" << std::endl;
+  ScreenManager::instance()->push_screen(WorldMapNS::WorldMapManager::instance 
());
 }
 
 ThemeButton::ThemeButton (PingusMenu* menu_)

--- story.cxx DELETED ---

--- story.hxx DELETED ---