[Pingus-CVS] CVS: Games/Pingus/src pingus_main.cxx,1.59,1.60 pingus_main.hxx,1.8,1.9

[grumbel]

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

Modified Files:
        pingus_main.cxx pingus_main.hxx 
Log Message:
- added --worldmap option
- cleanup 'greeting' a bit

Index: pingus_main.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_main.cxx,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- pingus_main.cxx     30 Mar 2003 16:51:43 -0000      1.59
+++ pingus_main.cxx     31 Mar 2003 21:52:03 -0000      1.60
@@ -86,6 +86,7 @@
 #include "pingu_action_factory.hxx"
 #include "credits.hxx"
 #include "sound/sound.hxx"
+#include "worldmap/manager.hxx"
 #include "cheat.hxx"
 
 using EditorNS::Editor;
@@ -206,6 +207,7 @@
       {"speed",             required_argument, 0, 't'},
       {"datadir",           required_argument, 0, 'd'},
       {"level",             required_argument, 0, 'l'},
+      {"worldmap",          required_argument, 0, 'w'},
       {"help",              no_argument,       0, 'h'},
       {"version",           no_argument,       0, 'V'},
       {"verbose",           required_argument, 0, 'v'},
@@ -260,6 +262,10 @@
       print_fps = true;
       if (verbose) std::cout << "PingusMain:check_args: Printing fps enabled" 
<< std::endl;
       break;
+    case 'w': // -w, --worldmap
+      worldmapfile = optarg;
+      break;
+
     case 'l': // -l, --level
       {
        // FIXME: Quick hack to get an absolute path
@@ -655,35 +661,35 @@
   std::cout << std::endl;
   
 #ifdef HAVE_LIBCLANVORBIS
-  std::cout << "clanVorbis support: ok" << std::endl;
+  std::cout << _("clanVorbis support:           ok") << std::endl;
 #else
-  std::cout << "clanVoribs support: missing (.ogg music files will not be 
playable)" << std::endl;
+  std::cout << _("clanVoribs support:  missing (.ogg music files will not be 
playable)") << std::endl;
 #endif
 
 #ifdef HAVE_LIBCLANMIKMOD
-  std::cout << "clanMikMod support: ok" << std::endl;
+  std::cout << _("clanMikMod support:           ok") << std::endl;
 #else
-  std::cout << "clanMikMod support: missing (.it and .s3m music files will not 
be playable)" << std::endl;
+  std::cout << _("clanMikMod support:  missing (music files will not be 
playable)") << std::endl;
 #endif
 
 #ifdef HAVE_GETTEXT
-  std::cout << "getext support: ok" << std::endl;
-  std::cout << gettext("gettext language: english") << std::endl;
+  std::cout << _("getext support:               ok") << std::endl;
+  std::cout << _("gettext language:        english") << std::endl;
 #else
   std::cout << "getext support: missing (only support for english will be 
available)" << std::endl;
 #endif
 
   if (sound_enabled)
-    std::cout << "sound support: enabled" << std::endl;
+    std::cout << _("sound support:           enabled") << std::endl;
   else
-    std::cout << "sound support: disabled" << std::endl;
+    std::cout << _("sound support:          disabled") << std::endl;
 
   if (music_enabled)
-    std::cout << "music support: enabled" << std::endl;
+    std::cout << _("music support:           enabled") << std::endl;
   else
-    std::cout << "music support: disabled" << std::endl;
+    std::cout << _("music support:          disabled") << std::endl;
 
-  std::cout << "resolution set to: " << screen_width << "x" << screen_height 
<< std::endl;
+  std::cout << _("resolution set to:       ") << screen_width << "x" << 
screen_height << std::endl;
 
   std::cout << std::endl;
 }
@@ -748,6 +754,11 @@
   else if (!demo_file.empty()) // start a demo
     {
       ScreenManager::instance()->push_screen(new DemoSession (demo_file));
+    }
+  else if (!worldmapfile.empty())
+    {
+      WorldMapNS::WorldMapManager::instance()->load(worldmapfile);
+      
ScreenManager::instance()->push_screen(WorldMapNS::WorldMapManager::instance());
     }
   else // start a normal game
     {

Index: pingus_main.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_main.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- pingus_main.hxx     28 Mar 2003 13:06:55 -0000      1.8
+++ pingus_main.hxx     31 Mar 2003 21:52:03 -0000      1.9
@@ -34,6 +34,7 @@
   /// the name of the exe: argv[0]
   std::string executable_name;
   std::string levelfile;
+  std::string worldmapfile;
   std::string resolution;
 
   CL_Slot on_button_press_slot;