X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fmain.cpp;h=6acd08c5e497465dc13fad8a2d4b317959ddfc73;hb=38105c22495d9439b30221732dd5d7b89f328a0c;hp=a6ee4e75d3dd2d0d743460a01c7fb548e0eea925;hpb=7819b316c47ea1304251f70cc2971400847a8d96;p=supertux.git

diff --git a/src/main.cpp b/src/main.cpp
index a6ee4e75d..6acd08c5e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -285,7 +285,7 @@ static bool parse_commandline(int argc, char** argv)
       if(i >= argc) 
         {
           print_usage(argv[0]);
-          throw std::runtime_error("Need to specify a parameter for geometry switch");
+          throw std::runtime_error("Need to specify a size (WIDTHxHEIGHT) for geometry argument");
         } 
       else 
         {
@@ -309,28 +309,36 @@ static bool parse_commandline(int argc, char** argv)
       if(i >= argc) 
         {
           print_usage(argv[0]);
-          throw std::runtime_error("Need to specify a parameter for aspect switch");
+          throw std::runtime_error("Need to specify a ratio (WIDTH:HEIGHT) for aspect ratio");
         } 
       else 
         {
-          int aspect_width  = 4;
-          int aspect_height = 3;
-          if(sscanf(argv[++i], "%d:%d", &aspect_width, &aspect_height) != 2) {
-            print_usage(argv[0]);
-            throw std::runtime_error("Invalid aspect spec, should be WIDTH:HEIGHT");
-          } else {
-            float aspect_ratio = static_cast<double>(config->aspect_width) /
-              static_cast<double>(config->aspect_height);
-
-            // use aspect ratio to calculate logical resolution
-            if (aspect_ratio > 1) {
-              config->aspect_width  = static_cast<int> (600 * aspect_ratio + 0.5);
-              config->aspect_height = 600;
-            } else {
-              config->aspect_width  = 600;
-              config->aspect_height = static_cast<int> (600 * 1/aspect_ratio + 0.5);
+          int aspect_width  = 0;
+          int aspect_height = 0;
+          if (strcmp(argv[i], "auto") == 0)
+            {
+              aspect_width  = 0;
+              aspect_height = 0;
+            }
+          else if (sscanf(argv[i], "%d:%d", &aspect_width, &aspect_height) != 2) 
+            {
+              print_usage(argv[0]);
+              throw std::runtime_error("Invalid aspect spec, should be WIDTH:HEIGHT or auto");
+            }
+          else 
+            {
+              float aspect_ratio = static_cast<double>(config->aspect_width) /
+                static_cast<double>(config->aspect_height);
+
+              // use aspect ratio to calculate logical resolution
+              if (aspect_ratio > 1) {
+                config->aspect_width  = static_cast<int> (600 * aspect_ratio + 0.5);
+                config->aspect_height = 600;
+              } else {
+                config->aspect_width  = 600;
+                config->aspect_height = static_cast<int> (600 * 1/aspect_ratio + 0.5);
+              }
             }
-          }
         }
     } else if(arg == "--show-fps") {
       config->show_fps = true;