[Pingus-CVS] r3852 - trunk/pingus/src

[grumbel at BerliOS]

Author: grumbel
Date: 2008-07-17 15:02:53 +0200 (Thu, 17 Jul 2008)
New Revision: 3852

Modified:
   trunk/pingus/src/pingus_main.cpp
Log:
Quick workaround for game crashing at starting, needed since ConfigManager 
doesn't yet know when the Display is created

Modified: trunk/pingus/src/pingus_main.cpp
===================================================================
--- trunk/pingus/src/pingus_main.cpp    2008-07-17 10:52:41 UTC (rev 3851)
+++ trunk/pingus/src/pingus_main.cpp    2008-07-17 13:02:53 UTC (rev 3852)
@@ -186,8 +186,8 @@
   if (options.swcursor.is_set())
     swcursor_enabled = options.swcursor.get();
 
-  if (options.geometry.is_set())
-    config_manager.set_resolution(options.geometry.get());
+  // FIXME: if (options.geometry.is_set())
+  // FIXME:   config_manager.set_resolution(options.geometry.get());
 
   // Sound
   if (options.disable_music.is_set())
@@ -591,9 +591,9 @@
   else
     std::cout << "music support:          disabled" << std::endl;
 
-  std::cout << "resolution:              " 
-            << config_manager.get_resolution().width << "x"
-            << config_manager.get_resolution().height << std::endl;
+  // FIXME: std::cout << "resolution:              " 
+  // FIXME: << config_manager.get_resolution().width << "x"
+  // FIXME:            << config_manager.get_resolution().height << std::endl;
   std::cout << "fullscreen:              "
             << (fullscreen_enabled ? " enabled" : "disabled")
             << std::endl;
@@ -730,7 +730,7 @@
     exit(1);
   }
   atexit(SDL_Quit); 
-  Display::set_video_mode(config_manager.get_resolution(), fullscreen_enabled);
+  Display::set_video_mode(Size(800, 600), fullscreen_enabled);
 
   SDL_WM_SetCaption("Pingus " VERSION " - SDL Edition", 0 /* icon */);