[Pingus-CVS] CVS: Games/Pingus/src menu_button.cxx,1.3,1.4 pingus_menu.cxx,1.13,1.14 pingus_menu.hxx,1.9,1.10 pingus_menu_manager.cxx,1.22,1.23 pingus_menu_manager.hxx,1.17,1.18

[grumbel]

Update of /var/lib/cvs/Games/Pingus/src
In directory dark:/tmp/cvs-serv2747/src

Modified Files:
        menu_button.cxx pingus_menu.cxx pingus_menu.hxx 
        pingus_menu_manager.cxx pingus_menu_manager.hxx 
Log Message:
reordered the main menu a bit, removed some not used items, made pingus_small4 
a bit better readable, added white border to the logo added GPL text at menu 
screen

Index: menu_button.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/menu_button.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- menu_button.cxx     25 Mar 2003 00:37:44 -0000      1.3
+++ menu_button.cxx     27 Mar 2003 15:57:22 -0000      1.4
@@ -243,8 +243,8 @@
   // x_pos = CL_Display::get_width() * 500 / 640; 
   // y_pos = CL_Display::get_height() * 320 / 480; 
 
-  x_pos = CL_Display::get_width() * 516 / 640; 
-  y_pos = CL_Display::get_height() * 369 / 480; 
+  x_pos = CL_Display::get_width() * 650 / 800; 
+  y_pos = CL_Display::get_height() * 370 / 600; 
 
   desc = _("..:: Bye, bye ::..");
   //desc["de"] = "..:: Auf Wiedersehen ::..";
@@ -267,8 +267,6 @@
 void
 QuitButton::on_click()
 {
-  //std::cout << "QuitButton: do exit" << std::endl;
-  //PingusSound::play_sound ("goodidea");
   menu->get_manager ()->show_exit_menu ();
 }
 
@@ -276,8 +274,8 @@
 
 LoadButton::LoadButton()
 {
-  x_pos = CL_Display::get_width() * 226 / 640;
-  y_pos = CL_Display::get_height() * 482 / 480; 
+  x_pos = CL_Display::get_width() * 400 / 800;
+  y_pos = CL_Display::get_height() * 500 / 600; 
 
   surface   = PingusResource::load_surface("menu/load", "core");
   surface_p = PingusResource::load_surface("menu/load_p", "core");
@@ -300,11 +298,8 @@
 EditorButton::EditorButton (PingusMenu* menu_)
   : menu(menu_)
 {
-  // x_pos = CL_Display::get_width() * 335 / 640;
-  // y_pos = CL_Display::get_height() * 370 / 480;
-
-  x_pos = CL_Display::get_width() * 126 / 640;
-  y_pos = CL_Display::get_height() * 113 / 480;
+  x_pos = CL_Display::get_width()  * 150 / 800;
+  y_pos = CL_Display::get_height() * 370 / 600; 
 
   desc = _("..:: Launch the level editor ::..");
   //desc["de"] = "..:: Den Level Editor starten ::..";
@@ -343,13 +338,10 @@
 StoryButton::StoryButton (PingusMenu* menu_)
   : menu(menu_)
 {
-  // x_pos = CL_Display::get_width() * 150 / 640; 
-  // y_pos = CL_Display::get_height() * 430 / 480;
-
-  x_pos = CL_Display::get_width() * 321 / 640; 
-  y_pos = CL_Display::get_height() * 241 / 480;
+  x_pos = CL_Display::get_width()  * 400 / 800;
+  y_pos = CL_Display::get_height() * 370 / 600; 
 
-  desc = _("..:: Lets you select a world to start ::..");
+  desc = _("..:: Start the game ::..");
   //desc["de"] = "..:: Such dir eine Welt zum beginnen aus ::..";
 
   line1 = _("Start");

Index: pingus_menu.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_menu.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- pingus_menu.cxx     18 Mar 2003 17:24:55 -0000      1.13
+++ pingus_menu.cxx     27 Mar 2003 15:57:22 -0000      1.14
@@ -37,18 +37,18 @@
       pout << "PingusMenu::init ()" << std::endl;
       //event_enabled = true;
       is_init = true;
-      SurfaceButton* editor_button = new EditorButton (this);
-         
+
       background = PingusResource::load_surface("misc/logo", "core");
 
-      // FIXME: Lilla... memory leak
-      gui_manager->add(new OptionsButton(this));
-      gui_manager->add(new CreditButton(this));
-      gui_manager->add(new QuitButton(this));
+      //gui_manager->add(new OptionsButton(this));
+      /*if (game_finished)
+        gui_manager->add(new CreditButton(this));*/
       //gui_manager->add(new MultiplayerButton(this));
-      gui_manager->add(new ThemeButton(this));
+      //gui_manager->add(new ThemeButton(this));
+
+      gui_manager->add(new QuitButton(this));
       gui_manager->add(new StoryButton(this));
-      gui_manager->add(editor_button);
+      gui_manager->add(new EditorButton (this));
     }
 }
 
@@ -66,6 +66,17 @@
 PingusMenu::on_escape_press ()
 {
   get_manager ()->show_exit_menu ();
+}
+
+void
+PingusMenu::draw_foreground(GraphicContext& gc)
+{
+  gc.draw(background, (gc.get_width()/2) - (background.get_width()/2), 50);
+  gc.print_left(Fonts::pingus_small, 20, 500, 
+                "Pingus version 0.6.0, Copyright (C) Ingo Ruhnke 
<address@hidden>\n");
+  gc.print_left(Fonts::pingus_small, 20, 530, 
+                "Pingus comes with ABSOLUTELY NO WARRANTY. This is free 
software, and you are welcome\n"
+                "to redistribute it under certain conditions; see the file 
COPYING for details.\n");
 }
 
 /* EOF */

Index: pingus_menu.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_menu.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- pingus_menu.hxx     27 Sep 2002 11:26:44 -0000      1.9
+++ pingus_menu.hxx     27 Mar 2003 15:57:22 -0000      1.10
@@ -20,6 +20,7 @@
 #ifndef HEADER_PINGUS_PINGUS_MENU_HXX
 #define HEADER_PINGUS_PINGUS_MENU_HXX
 
+#include "fonts.hxx"
 #include "pingus_sub_menu.hxx"
 #include "layer_manager.hxx"
 
@@ -58,7 +59,7 @@
   void preload ();
 
   void on_escape_press ();
-  
+  void draw_foreground(GraphicContext& gc);
 private:
   PingusMenu (const PingusMenu&);
   PingusMenu& operator= (const PingusMenu&);

Index: pingus_menu_manager.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_menu_manager.cxx,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- pingus_menu_manager.cxx     25 Mar 2003 00:37:44 -0000      1.22
+++ pingus_menu_manager.cxx     27 Mar 2003 15:57:22 -0000      1.23
@@ -26,12 +26,9 @@
 PingusMenuManager* PingusMenuManager::instance_ = 0;
 
 PingusMenuManager::PingusMenuManager ()
-  : unplayable ("misc/unplayable", "core"),
-    intro (this), mainmenu (this), optionmenu (this),
+  : intro (this), mainmenu (this), optionmenu (this),
     exitmenu (this)
 {
-  unplayable.set_align_center ();
-
   //current_menu = 0;
   //if (intro_disabled)
   push_menu (&mainmenu);
@@ -49,8 +46,6 @@
 {
   background.draw (gc);
   
-  gc.draw (unplayable, Vector(CL_Display::get_width ()/2, 30));
-
   gc.draw_fillrect(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: /var/lib/cvs/Games/Pingus/src/pingus_menu_manager.hxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- pingus_menu_manager.hxx     18 Feb 2003 17:04:13 -0000      1.17
+++ pingus_menu_manager.hxx     27 Mar 2003 15:57:22 -0000      1.18
@@ -38,8 +38,6 @@
   typedef std::vector<PingusSubMenu *>::iterator MenuStackIter;
   typedef std::vector<PingusSubMenu *>::reverse_iterator MenuStackRIter;
 
-  Sprite unplayable;
-  
   /// Register all event-handling stuff
   void register_events ();