Changed collision code, we now have several collision groups:

[supertux.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index f89805d..ae2dad1 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -62,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";
   }
 }
 
@@ -187,6 +186,8 @@ static void print_usage(const char* argv0)
             "  -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"
@@ -216,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]);