[Pingus-CVS] r3735 - in trunk/pingus/src: . display

[grumbel at BerliOS]

Author: grumbel
Date: 2008-07-08 07:58:53 +0200 (Tue, 08 Jul 2008)
New Revision: 3735

Modified:
   trunk/pingus/src/display/display.cpp
   trunk/pingus/src/globals.cpp
   trunk/pingus/src/globals.hpp
   trunk/pingus/src/pingus_main.cpp
Log:
Removed --allow-resize option, made it default

Modified: trunk/pingus/src/display/display.cpp
===================================================================
--- trunk/pingus/src/display/display.cpp        2008-07-08 05:53:14 UTC (rev 
3734)
+++ trunk/pingus/src/display/display.cpp        2008-07-08 05:58:53 UTC (rev 
3735)
@@ -50,10 +50,7 @@
 void
 Display::set_video_mode(int width, int height)
 {
-  Uint32 flags = 0;
-  
-  if (resize_enabled)
-    flags |= SDL_RESIZABLE;
+  Uint32 flags = SDL_RESIZABLE;
 
   if (fullscreen_enabled)
     flags |= SDL_FULLSCREEN;

Modified: trunk/pingus/src/globals.cpp
===================================================================
--- trunk/pingus/src/globals.cpp        2008-07-08 05:53:14 UTC (rev 3734)
+++ trunk/pingus/src/globals.cpp        2008-07-08 05:58:53 UTC (rev 3735)
@@ -52,8 +52,6 @@
 
 bool        fullscreen_enabled              = false;
 
-bool        resize_enabled                  = false;
-
 #if defined(WIN32) || defined(__APPLE__)
 // The clanSDL target is a little buggy on Windows and OSX - Use OpenGL by 
default
 bool        use_opengl                      = true;

Modified: trunk/pingus/src/globals.hpp
===================================================================
--- trunk/pingus/src/globals.hpp        2008-07-08 05:53:14 UTC (rev 3734)
+++ trunk/pingus/src/globals.hpp        2008-07-08 05:58:53 UTC (rev 3735)
@@ -43,7 +43,6 @@
 extern bool        drag_drop_scrolling; 
 extern int         tile_size;                       ///< --tile-size
 extern bool        fullscreen_enabled;              ///< --enable-fullscreen
-extern bool        resize_enabled;                  ///< --resize-fullscreen
 extern int         default_screen_width;            ///< default screen width
 extern int         default_screen_height;           ///< default screen height
 extern int         screen_width;                    ///< user configured 
screen width

Modified: trunk/pingus/src/pingus_main.cpp
===================================================================
--- trunk/pingus/src/pingus_main.cpp    2008-07-08 05:53:14 UTC (rev 3734)
+++ trunk/pingus/src/pingus_main.cpp    2008-07-08 05:58:53 UTC (rev 3735)
@@ -20,7 +20,6 @@
 #include <signal.h>
 #include <locale.h>
 #include <iostream>
-//#include <physfs.h>
 #include "lisp/lisp.hpp"
 #include "lisp/parser.hpp"
 #include "editor/editor_level.hpp"
@@ -182,9 +181,6 @@
   if (options.fullscreen.is_set())
     fullscreen_enabled = options.fullscreen.get();
 
-  if (options.resize.is_set())
-    resize_enabled = options.resize.get();
-
   if (options.swcursor.is_set())
     swcursor_enabled = options.swcursor.get();
 
@@ -244,8 +240,6 @@
                   _("Start in Window Mode"));
   argp.add_option('f', "fullscreen", "",
                   _("Start in Fullscreen"));
-  argp.add_option('R', "allow-resize", "",
-                  _("Allow Window resize (buggy)"));
   argp.add_option(346, "enable-swcursor", "",
                   _("Enable software cursor"));
   argp.add_option('g', "geometry", "{width}x{height}",  
@@ -386,10 +380,6 @@
           case 'f': // --fullscreen
             cmd_options.fullscreen.set(true);
             break;
-
-          case 'R': // --allow-resize
-            cmd_options.resize.set(true);
-            break;
           
           case 'w': // --window
             cmd_options.fullscreen.set(false);