No more segfaults when trying to spawn bullets of unknown type

[supertux.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 0b269b7..ed1317e 100644 (file)
--- 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;
@@ -399,19 +407,6 @@ static void init_rand()
 
 void init_video()
 {
-  static int desktop_width = 0;
-  static int desktop_height = 0;
-
-/* unfortunately only newer SDLs have these infos */
-#if SDL_MAJOR_VERSION > 1 || SDL_MINOR_VERSION > 2 || (SDL_MINOR_VERSION == 2 && SDL_PATCHLEVEL >= 10)
-  /* find which resolution the user normally uses */
-  if(desktop_width == 0) {
-    const SDL_VideoInfo *info = SDL_GetVideoInfo();
-    desktop_width  = info->current_w;
-    desktop_height = info->current_h;
-  }
-#endif
-  
   // FIXME: Add something here
   SCREEN_WIDTH  = 800;
   SCREEN_HEIGHT = 600;
@@ -422,19 +417,25 @@ void init_video()
   SDL_WM_SetCaption(PACKAGE_NAME " " PACKAGE_VERSION, 0);
 
   // set icon
-  #ifdef MACOSX
+#ifdef MACOSX
   const char* icon_fname = "images/engine/icons/supertux-256x256.png";
-  #else
+#else
   const char* icon_fname = "images/engine/icons/supertux.xpm";
-  #endif
-  SDL_Surface* icon = IMG_Load_RW(get_physfs_SDLRWops(icon_fname), true);
+#endif
+  SDL_Surface* icon;
+  try {
+    icon = IMG_Load_RW(get_physfs_SDLRWops(icon_fname), true);
+  } catch (const std::runtime_error& err) {
+    icon = 0;
+    log_warning << "Couldn't load icon '" << icon_fname << "': " << err.what() << std::endl;
+  }
   if(icon != 0) {
     SDL_WM_SetIcon(icon, 0);
     SDL_FreeSurface(icon);
   }
 #ifdef DEBUG
   else {
-    log_warning << "Couldn't find icon '" << icon_fname << "'" << std::endl;
+    log_warning << "Couldn't load icon '" << icon_fname << "'" << std::endl;
   }
 #endif
 
@@ -540,26 +541,36 @@ int main(int argc, char** argv)
 
     timelog("controller");
     main_controller = new JoystickKeyboardController();
+
     timelog("config");
     init_config();
+
     timelog("addons");
     AddonManager::get_instance().load_addons();
+
     timelog("tinygettext");
     init_tinygettext();
+
     timelog("commandline");
     if(parse_commandline(argc, argv))
       return 0;
+
     timelog("audio");
     init_audio();
+
     timelog("video");
     DrawingContext context;
     context_pointer = &context;
     init_video();
+
     Console::instance->init_graphics();
+
     timelog("scripting");
     Scripting::init_squirrel(config->enable_script_debugger);
+
     timelog("resources");
     load_shared();
+
     timelog(0);
 
     main_loop = new MainLoop();