Finite sprite animations now stop at last frame, not first.

[supertux.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index caf7812..3925f75 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -50,6 +50,7 @@
 #include "game_session.hpp"
 #include "file_system.hpp"
 #include "physfs/physfs_sdl.hpp"
+#include "exceptions.hpp"
 
 SDL_Surface* screen = 0;
 JoystickKeyboardController* main_controller = 0;
@@ -61,9 +62,8 @@ static void init_config()
   try {
     config->load();
   } catch(std::exception& e) {
-#ifdef DEBUG
     std::cerr << "Couldn't load config file: " << e.what() << "\n";
-#endif
+    std::cerr << "Using default settings.\n";
   }
 }
 
@@ -180,12 +180,14 @@ static void init_physfs(const char* argv0)
 
 static void print_usage(const char* argv0)
 {
-  fprintf(stderr, _("Usage: %s [OPTIONS] LEVELFILE\n\n"), argv0);
+  fprintf(stderr, _("Usage: %s [OPTIONS] [LEVELFILE]\n\n"), argv0);
   fprintf(stderr,
           _("Options:\n"
             "  -f, --fullscreen             Run in fullscreen mode\n"
             "  -w, --window                 Run in window mode\n"
             "  -g, --geometry WIDTHxHEIGHT  Run SuperTux in given resolution\n"
+            "  --disable-sfx                Disable sound effects\n"
+            "  --disable-music              Disable music\n"
             "  --help                       Show this help message\n"
             "  --version                    Display SuperTux version and quit\n"
             "  --show-fps                   Display framerate in levels\n"
@@ -215,6 +217,10 @@ static void parse_commandline(int argc, char** argv)
       }
     } else if(arg == "--show-fps") {
       config->show_fps = true;
+    } else if(arg == "--disable-sfx") {
+      config->sound_enabled = false;
+    } else if(arg == "--disable-music") {
+      config->music_enabled = false;
     } else if(arg == "--play-demo") {
       if(i+1 >= argc) {
         print_usage(argv[0]);
@@ -229,10 +235,10 @@ static void parse_commandline(int argc, char** argv)
       config->record_demo = argv[++i];
     } else if(arg == "--help") {
       print_usage(argv[0]);
-      throw std::runtime_error("");
+      throw graceful_shutdown();
     } else if(arg == "--version") {
       std::cerr << PACKAGE_NAME << " " << PACKAGE_VERSION << "\n";
-      throw std::runtime_error("");
+      throw graceful_shutdown();
     } else if(arg[0] != '-') {
       config->start_level = arg;
     } else {
@@ -405,7 +411,7 @@ void wait_for_event(float min_delay, float max_delay)
     while(SDL_PollEvent(&event)) {
       switch(event.type) {
         case SDL_QUIT:
-          throw std::runtime_error("received window close");
+          throw graceful_shutdown();
         case SDL_KEYDOWN:
         case SDL_JOYBUTTONDOWN:
         case SDL_MOUSEBUTTONDOWN:
@@ -419,21 +425,52 @@ void wait_for_event(float min_delay, float max_delay)
   }
 }
 
+#ifdef DEBUG
+static Uint32 last_timelog_ticks = 0;
+static const char* last_timelog_component = 0;
+
+static inline void timelog(const char* component)
+{
+  Uint32 current_ticks = SDL_GetTicks();
+  
+  if(last_timelog_component != 0) {
+    printf("Component '%s' finished after %f seconds\n",
+        last_timelog_component, (current_ticks - last_timelog_ticks) / 1000.0);
+  }
+
+  last_timelog_ticks = current_ticks;
+  last_timelog_component = component;
+}
+#else
+static inline void timelog(const char* )
+{
+}
+#endif
+
 int main(int argc, char** argv) 
 {
   try {
     srand(time(0));
     init_physfs(argv[0]);
     init_sdl();
+    timelog("controller");
     main_controller = new JoystickKeyboardController();    
+    timelog("config");
     init_config();
+    timelog("tinygettext");
     init_tinygettext();
+    timelog("commandline");
     parse_commandline(argc, argv);
+    timelog("audio");
     init_audio();
+    timelog("video");
     init_video();
 
+    timelog("menu");
     setup_menu();
+    timelog("resources");
     load_shared();
+    timelog(0);
     if(config->start_level != "") {
       // we have a normal path specified at commandline not physfs paths.
       // So we simply mount that path here...
@@ -449,7 +486,8 @@ int main(int argc, char** argv)
     } else {
       // normal game
       title();
-    }    
+    }
+  } catch(graceful_shutdown& e) {
   } catch(std::exception& e) {
     std::cerr << "Unexpected exception: " << e.what() << std::endl;
     return 1;