[Pingus-CVS] [pingus] push by address@hidden - Some fixes to text output on 2011-10-22 18:10 GMT

[pingus]

Revision: b9a0b1937542
Author:   Ingo Ruhnke <address@hidden>
Date:     Sat Oct 22 11:10:17 2011
Log:      Some fixes to text output

http://code.google.com/p/pingus/source/detail?r=b9a0b1937542

Modified:
 /src/engine/display/display.cpp
 /src/pingus/pingus_main.cpp

=======================================
--- /src/engine/display/display.cpp     Thu Oct 13 19:03:23 2011
+++ /src/engine/display/display.cpp     Sat Oct 22 11:10:17 2011
@@ -90,7 +90,7 @@
 {
   assert(!s_framebuffer.get());

-  log_info(framebuffer_type_to_string(framebuffer_type) << " " << size  
<< " " << fullscreen);
+  log_info(framebuffer_type_to_string(framebuffer_type) << " " << size  
<< " " << (fullscreen?"fullscreen":"window"));

   switch (framebuffer_type)
   {
=======================================
--- /src/pingus/pingus_main.cpp Wed Oct 19 17:00:36 2011
+++ /src/pingus/pingus_main.cpp Sat Oct 22 11:10:17 2011
@@ -190,7 +190,7 @@
   argp.add_option('f', "fullscreen", "",
                   _("Start in Fullscreen"));
   argp.add_option('r', "renderer", "RENDERER",
-                  _("Use the given renderer (default: delta)"));
+                  _("Use the given renderer (default: sdl)"));
   argp.add_option('g', "geometry", "{width}x{height}",
                   _("Set the window resolution for pingus (default:  
800x600)"));
   argp.add_option('R', "fullscreen-resolution", "{width}x{height}",
@@ -255,7 +255,7 @@
         if (argp.get_argument() == "help")
         {
           std::cout << "Available renderers: " << std::endl;
-          std::cout << "   delta: Software rendering with dirty-rectangles  
(default)" << std::endl;
+          std::cout << "   delta: Software rendering with  
dirty-rectangles" << std::endl;
           std::cout << "     sdl: Software rendering" << std::endl;
           std::cout << "  opengl: Hardware accelerated graphics" <<  
std::endl;
           std::cout << "    null: No rendering at all, for debugging" <<  
std::endl;
@@ -492,10 +492,10 @@
     std::cout << "music support:           disabled" << std::endl;

   std::cout << "fullscreen:              ";
-  if (config_manager.get_fullscreen())
-  {
-    std::cout << config_manager.get_fullscreen_resolution().width << "x"
-              << config_manager.get_fullscreen_resolution().height <<  
std::endl;
+  if (cmd_options.fullscreen.is_set() && cmd_options.fullscreen.get())
+  {
+    std::cout << cmd_options.fullscreen_resolution.get().width << "x"
+              << cmd_options.fullscreen_resolution.get().height <<  
std::endl;
   }
   else
   {