X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fmain.cpp;h=8a8dc7c662ca5c29e137e56365892721ab3cac2c;hb=198f758764fff064a47630b5d0f1e3d6aabe95a8;hp=96e51e4b97ffdcdb452b24a346bc5b2961e5dfbc;hpb=c3c41a343669d375aaa674c7f3ac35f08f24703e;p=supertux.git diff --git a/src/main.cpp b/src/main.cpp index 96e51e4b9..8a8dc7c66 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -225,14 +225,15 @@ static void print_usage(const char* argv0) " -d, --default Reset video settings to default values\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" + " -h, --help Show this help message\n" + " -v, --version Show SuperTux version and quit\n" " --console Enable ingame scripting console\n" " --noconsole Disable ingame scripting console\n" " --show-fps Display framerate in levels\n" " --no-show-fps Do not display framerate in levels\n" " --record-demo FILE LEVEL Record a demo to FILE\n" " --play-demo FILE LEVEL Play a recorded demo\n" + " -s, --debug-scripts Enable script debugger.\n" "\n")); } @@ -244,7 +245,7 @@ static bool pre_parse_commandline(int argc, char** argv) for(int i = 1; i < argc; ++i) { std::string arg = argv[i]; - if(arg == "--version") { + if(arg == "--version" || arg == "-v") { std::cout << PACKAGE_NAME << " " << PACKAGE_VERSION << std::endl; return true; } @@ -261,7 +262,7 @@ static bool parse_commandline(int argc, char** argv) for(int i = 1; i < argc; ++i) { std::string arg = argv[i]; - if(arg == "--help") { + if(arg == "--help" || arg == "-h") { print_usage(argv[0]); return true; } else if(arg == "--fullscreen" || arg == "-f") { @@ -275,8 +276,8 @@ static bool parse_commandline(int argc, char** argv) config->fullscreen_width = 800; config->fullscreen_height = 600; - config->aspect_width = 4; - config->aspect_height = 3; + config->aspect_width = 0; // auto detect + config->aspect_height = 0; } else if(arg == "--window" || arg == "-w") { config->use_fullscreen = false; @@ -285,7 +286,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 +310,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(config->aspect_width) / - static_cast(config->aspect_height); - - // use aspect ratio to calculate logical resolution - if (aspect_ratio > 1) { - config->aspect_width = static_cast (600 * aspect_ratio + 0.5); - config->aspect_height = 600; - } else { - config->aspect_width = 600; - config->aspect_height = static_cast (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(config->aspect_width) / + static_cast(config->aspect_height); + + // use aspect ratio to calculate logical resolution + if (aspect_ratio > 1) { + config->aspect_width = static_cast (600 * aspect_ratio + 0.5); + config->aspect_height = 600; + } else { + config->aspect_width = 600; + config->aspect_height = static_cast (600 * 1/aspect_ratio + 0.5); + } } - } } } else if(arg == "--show-fps") { config->show_fps = true; @@ -356,7 +365,7 @@ static bool parse_commandline(int argc, char** argv) throw std::runtime_error("Need to specify a demo filename"); } config->record_demo = argv[++i]; - } else if(arg == "-d") { + } else if(arg == "--debug-scripts" || arg == "-s") { config->enable_script_debugger = true; } else if(arg[0] != '-') { config->start_level = arg; @@ -409,19 +418,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 @@ -514,7 +529,7 @@ int main(int argc, char** argv) { int result = 0; -#ifndef NO_CATCH +#ifndef DEBUG try { #endif @@ -527,26 +542,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(); @@ -584,7 +609,7 @@ int main(int argc, char** argv) //init_rand(); PAK: this call might subsume the above 3, but I'm chicken! main_loop->run(context); -#ifndef NO_CATCH +#ifndef DEBUG } catch(std::exception& e) { log_fatal << "Unexpected exception: " << e.what() << std::endl; result = 1;