- added option to start in window mode

SVN-Revision: 1500

diff --git a/src/setup.cpp b/src/setup.cpp
index 19ac305..45a8bed 100644 (file)
--- a/src/setup.cpp
+++ b/src/setup.cpp
@@ -946,10 +946,13 @@ void parseargs(int argc, char * argv[])
       if (strcmp(argv[i], "--fullscreen") == 0 ||
           strcmp(argv[i], "-f") == 0)
         {
-          /* Use full screen: */
-
           use_fullscreen = true;
         }
+      else if (strcmp(argv[i], "--window") == 0 ||
+               strcmp(argv[i], "-w") == 0)
+        {
+          use_fullscreen = false;
+        }
       else if (strcmp(argv[i], "--joystick") == 0 || strcmp(argv[i], "-j") == 0)
         {
           assert(i+1 < argc);
@@ -1044,7 +1047,8 @@ void parseargs(int argc, char * argv[])
                "  Please see the file \"README.txt\" for more details.\n"));
           printf(_("Usage: %s [OPTIONS] FILENAME\n\n"), argv[0]);
           puts(_("Display Options:\n"
-               "  --fullscreen        Run in fullscreen mode.\n"
+               "  -f, --fullscreen    Run in fullscreen mode.\n"
+               "  -w, --window        Run in window mode.\n"
                "  --opengl            If OpenGL support was compiled in, this will tell\n"
                "                      SuperTux to make use of it.\n"
                "  --sdl               Use the SDL software graphical renderer\n"