[Pingus-CVS] CVS: Games/Pingus/src Makefile.am,1.146,1.147 pingus_main.cxx,1.72,1.73 pingus_menu_manager.cxx,1.24,1.25 pingus_menu_manager.hxx,1.19,1.20 option_menu.cxx,1.14,NONE option_menu.hxx,1.8,NONE

[grumbel]

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

Modified Files:
        Makefile.am pingus_main.cxx pingus_menu_manager.cxx 
        pingus_menu_manager.hxx 
Removed Files:
        option_menu.cxx option_menu.hxx 
Log Message:
- removed unused stuff

Index: Makefile.am
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/Makefile.am,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- Makefile.am 10 Apr 2003 21:35:58 -0000      1.146
+++ Makefile.am 11 Apr 2003 14:30:05 -0000      1.147
@@ -179,8 +179,6 @@
 multiline_text.cxx \
 multiline_text.hxx \
 my_gettext.hxx \
-option_menu.cxx \
-option_menu.hxx \
 path_manager.cxx \
 path_manager.hxx \
 pingu.cxx \

Index: pingus_main.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_main.cxx,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- pingus_main.cxx     10 Apr 2003 19:38:51 -0000      1.72
+++ pingus_main.cxx     11 Apr 2003 14:30:05 -0000      1.73
@@ -100,28 +100,28 @@
     case SIGSEGV:
       
puts("\n,------------------------------------------------------------------------");
       puts(_("| segfault_handler: catched a SIGSEGV."));
-      puts ("|");
+      puts  ("|");
       puts(_("| Woops, Pingus just crashed, congratulations you've found a 
bug."));
       puts(_("| Please write a little bug report to <address@hidden>, include 
informations"));
       puts(_("| where exacly the SIGSEGV occured and how to reproduce it."));
       puts(_("| Also try include a backtrace, you can get it like this:"));
-      puts ("|");
-      puts(_("| $ gdb pingus core"));
-      puts(_("| (gdb) bt"));
-      puts(_("| ..."));
-      puts ("|");
+      puts  ("|");
+      puts  ("| $ gdb pingus core");
+      puts  ("| (gdb) bt");
+      puts  ("| ...");
+      puts  ("|");
       puts(_("| If that doesn't work, try this:"));
-      puts ("|");
-      puts(_("| $ gdb pingus"));
-      puts(_("| (gdb) r"));
+      puts  ("|");
+      puts  ("| $ gdb pingus");
+      puts  ("| (gdb) r");
       puts(_("| [play until it crashes again]"));
-      puts(_("| ..."));
-      puts ("|");
-      
puts(_("'------------------------------------------------------------------------\n"));
+      puts  ("| ...");
+      puts  ("|");
+      puts  
("'------------------------------------------------------------------------\n");
       break;
 
     case SIGINT:
-      
puts(_("\n,------------------------------------------------------------------------"));
+      
puts("\n,------------------------------------------------------------------------");
       puts (_("| Warning: Pingus recieved a SIGINT, exiting now."));
       
puts("`------------------------------------------------------------------------\n");
       break;
@@ -346,11 +346,11 @@
 #endif
                << std::endl;
       
-      std::cout << _("\n"
-                     "Copyright (C) 2003 Ingo Ruhnke <address@hidden>\n"
-                     "There is NO warranty.  You may redistribute this 
software\n"
-                     "under the terms of the GNU General Public License.\n"
-                     "For more information about these matters, see the files 
named COPYING.") << std::endl;
+      std::cout << "\n"
+        "Copyright (C) 2003 Ingo Ruhnke <address@hidden>\n"
+        "There is NO warranty.  You may redistribute this software\n"
+        "under the terms of the GNU General Public License.\n"
+        "For more information about these matters, see the files named 
COPYING." << std::endl;
 
       exit(EXIT_SUCCESS);
       break;
@@ -487,60 +487,62 @@
     default:
       if (verbose) std::cout << _("Unknow char: ") << c << std::endl << 
std::endl;
       std::cout << _("Usage: ") << argv[0] << _(" [OPTIONS]... [LEVELFILE]") 
<< std::endl;
-      std::cout <<
-       _("\n"
-         "Options:\n"
-          "   -g, --geometry {width}x{height}\n"
-          "                            Set the resolution for pingus (default: 
800x600)\n"
-          "   -h, --help               Displays this screen\n"
-          "   --disable-intro          Disable intro\n");
+      std::cout 
+        << "\n"
+        << _("Options:")
+        << "\n   -g, --geometry {width}x{height}"
+        << "\n                            " << _("Set the resolution for 
pingus (default: 800x600)")
+        << "\n   -h, --help               " << _("Displays this help")
+        << "\n   --disable-intro          " << _("Disable intro");
 #ifdef HAVE_LIBCLANGL
-      std::cout << _("   -G, --use-opengl         Use OpenGL\n");
+      std::cout << "   -G, --use-opengl         " << _("Use OpenGL");
 #endif
-      std::cout <<
-       _("   -w, --window             Start in Window Mode\n"
-          "   -f, --fullscreen         Start in Fullscreen\n"
-          "   -d, --datadir PATH       Set the path to load the data files to 
`path'\n"
-          //"   --use-datafile           Use the pre-compiled datafile 
(default)\n"
-          //          "   --use-scriptfile         Use the scriptfile and read 
all data from files\n"
-          "   -l, --level FILE         Load a custom level from FILE\n"
-          "   -w, --worldmap FILE      Load a custom worldmap from FILE\n"
-          "   -v, --verbose            Print some more messages to stdout, can 
be set\n"
-          "                            multible times to increase verbosity\n"
-          "   -V, --version            Prints version number and exit\n"
-          "   -e, --editor             Launch the Level editor 
(experimental)\n"
-          "   --disable-auto-scrolling Disable automatic scrolling\n"
-          //          "   --disable-swcursor       Disable software cursor, 
use hw cursor instead\n"
-          //          "   --enable-swcursor        Enable software cursor\n"
-          //"   --disable-action-help    Disable action button help strings\n"
-          //"   --enable-action-help     Enable action button help 
strings(default)\n"
-          "   --no-cfg-file            Don't read ~/.pingus/config\n"
-          "   --config-file FILE       Read config from FILE (default: 
~/.pingus/config)\n"
-          "                            reduce CPU usage, might speed up the 
game on slower machines\n"
-          "\nDebugging and experimental stuff:\n"
-          "   --maintainer-mode        Enables some features, only interesting 
programmers\n"
-          "   --debug OPTION           Enable the output of debugging infos, 
possible\n"
-          "                            OPTION's are tiles, gametime, actions, 
sound, resources, gui,\n"
-          "                            input\n"
-          "   --min-frame-skip N       Skip at least N frames, larger values 
speed the game up\n"
-          "   --max-frame-skip N       Skip at most N frames\n"
-          "   --frame-skip N           Set both min and max frameskip to N\n"
-          "   -t, --speed SPEED        Set the game speed (0=fastest, 
>0=slower)\n"
-          "   -b, --print-fps          Prints the fps to stdout\n"
-          "   --tile-size INT          Set the size of the map tiles (default: 
32)\n"
-          "   --fast-mode              Disable some cpu intensive features\n"
-          "   --min-cpu-usage          Reduces the CPU usage by issuing 
sleep()\n"
-          "\n"
-          "\nDemo playing and recording:\n"
-          "   -p, --play-demo FILE     Plays a demo session from FILE\n"
-          "   -r, --enable-demo-recording\n"
-          "                            Record demos for each played level\n")
-                << std::endl;
       std::cout
-        << _("\nSound:\n"
-             "   -s, --enable-sound       Enable sound\n"
-             "   -m, --enable-music       Enable music\n")
+       << "\n   -w, --window             " << _("Start in Window Mode")
+        << "\n   -f, --fullscreen         " << _("Start in Fullscreen")
+        << "\n   -d, --datadir PATH       Set the path to load the data files 
to `path'"
+        //"   --use-datafile           Use the pre-compiled datafile 
(default)\n"
+        //          "   --use-scriptfile         Use the scriptfile and read 
all data from files\n"
+        << "\n   -l, --level " << _("FILE      ") << _("Load a custom level 
from FILE")
+        << "\n   -w, --worldmap "<< _("FILE      ") << _("Load a custom 
worldmap from FILE")
+        << "\n   -v, --verbose            " << _("Print some more messages to 
stdout, can be set")
+        << "\n                            " << _("multible times to increase 
verbosity")
+        << "\n   -V, --version            " << _("Prints version number and 
exit")
+        << "\n   -e, --editor             " << _("Launch the Level editor 
(experimental)")
+        << "\n   --disable-auto-scrolling " << _("Disable automatic scrolling")
+        //          "   --disable-swcursor       Disable software cursor, use 
hw cursor instead\n"
+        //          "   --enable-swcursor        Enable software cursor\n"
+        //"   --disable-action-help    Disable action button help strings\n"
+        //"   --enable-action-help     Enable action button help 
strings(default)\n"
+        << "\n   --no-cfg-file            " << _("Don't read ~/.pingus/config")
+        << "\n   --config-file " << _("FILE       ") << _("Read config from 
FILE (default: ~/.pingus/config)")
+        << "\n                            " << _("reduce CPU usage, might 
speed up the game on slower machines")
+        << "\n\n" << _("Debugging and experimental stuff:")
+        << "\n   --maintainer-mode        " << _("Enables some features, only 
interesting programmers")
+        << "\n   --debug OPTION           " << _("Enable the output of 
debugging infos, possible")
+        << "\n                            " << _("OPTION's are tiles, 
gametime, actions, sound, resources, gui,")
+        << "\n                            " << _("input")
+        << "\n   --min-frame-skip N       " << _("Skip at least N frames, 
larger values speed the game up")
+        << "\n   --max-frame-skip N       " << _("Skip at most N frames")
+        << "\n   --frame-skip N           " << _("Set both min and max 
frameskip to N")
+        << "\n   -t, --speed SPEED        " << _("Set the game speed 
(0=fastest, >0=slower)")
+        << "\n   -b, --print-fps          " << _("Prints the fps to stdout")
+        << "\n   --tile-size INT          " << _("Set the size of the map 
tiles (default: 32)")
+        << "\n   --fast-mode              " << _("Disable some cpu intensive 
features")
+        << "\n   --min-cpu-usage          " << _("Reduces the CPU usage by 
issuing sleep()")
+        << "\n"
+        << "\nDemo playing and recording:"
+        << "\n   -p, --play-demo " << _("FILE     ") << _("Plays a demo 
session from FILE")
+        << "\n   -r, --enable-demo-recording"
+        << "\n                            " << _("Record demos for each played 
level")
+        << "\n"
+        << "\n"
+        << _("Sound:")
+        << "\n   -s, --enable-sound       " << _("Enable sound")
+        << "\n   -m, --enable-music       " << _("Enable music")
+        << "\n"
         << std::endl;
+
       exit(EXIT_SUCCESS);
       break;
     }

Index: pingus_menu_manager.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_menu_manager.cxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- pingus_menu_manager.cxx     10 Apr 2003 18:28:30 -0000      1.24
+++ pingus_menu_manager.cxx     11 Apr 2003 14:30:05 -0000      1.25
@@ -26,7 +26,7 @@
 PingusMenuManager* PingusMenuManager::instance_ = 0;
 
 PingusMenuManager::PingusMenuManager ()
-  : mainmenu (this), optionmenu (this),
+  : mainmenu (this),
     exitmenu (this)
 {
   push_menu (&mainmenu);

Index: pingus_menu_manager.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_menu_manager.hxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- pingus_menu_manager.hxx     10 Apr 2003 18:28:30 -0000      1.19
+++ pingus_menu_manager.hxx     11 Apr 2003 14:30:05 -0000      1.20
@@ -23,7 +23,6 @@
 #include "menu_background.hxx"
 #include "exit_menu.hxx"
 #include "pingus_menu.hxx"
-#include "option_menu.hxx"
 #include "sprite.hxx"
 
 class PingusSubMenu;
@@ -46,7 +45,6 @@
   /* Menu's FIXME: These shouldn't get exported to the outsite,
      instead only handles (enum's) should be visible */
   PingusMenu mainmenu;
-  OptionMenu optionmenu;
   MenuBackground background;
   ExitMenu exitmenu;
 

--- option_menu.cxx DELETED ---

--- option_menu.hxx DELETED ---