X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fmain.cpp;h=3f43c6fe3c7ff7dfdc5495e26b311e5697a96cee;hb=d4b281559d45406a5d07cf04d89142cdeb90b114;hp=fabccddff94efdf61fcaafcdcad671e8b156a78b;hpb=a113d3bd1feddd510e3b2852b0d42522735eee40;p=supertux.git diff --git a/src/main.cpp b/src/main.cpp index fabccddff..3f43c6fe3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -25,13 +25,11 @@ #include #include -#include -#include +#include +#include #include #include -#include #include -#include #include #include #include @@ -55,11 +53,15 @@ #include "physfs/physfs_sdl.hpp" #include "random_generator.hpp" #include "worldmap/worldmap.hpp" +#include "binreloc/binreloc.h" SDL_Surface* screen = 0; JoystickKeyboardController* main_controller = 0; TinyGetText::DictionaryManager dictionary_manager; +int SCREEN_WIDTH; +int SCREEN_HEIGHT; + static void init_config() { config = new Config(); @@ -165,20 +167,29 @@ static void init_physfs(const char* argv0) if(f) { fclose(f); if(!PHYSFS_addToSearchPath(dir.c_str(), 1)) { - msg_warning << "Couldn't add '" << dir << "' to physfs searchpath: " << PHYSFS_getLastError() << std::endl; + log_warning << "Couldn't add '" << dir << "' to physfs searchpath: " << PHYSFS_getLastError() << std::endl; } else { sourcedir = true; } } #endif +#ifdef _WIN32 + PHYSFS_addToSearchPath(".\\data", 1); +#endif + if(!sourcedir) { #if defined(APPDATADIR) || defined(ENABLE_BINRELOC) std::string datadir; #ifdef ENABLE_BINRELOC - char* brdatadir = br_strcat(DATADIR, "/" PACKAGE_NAME); - datadir = brdatadir; - free(brdatadir); + + char* dir; + br_init (NULL); + dir = br_find_data_dir(APPDATADIR); + datadir = dir; + datadir += "/" PACKAGE_NAME; + free(dir); + #else datadir = APPDATADIR; #endif @@ -192,8 +203,10 @@ static void init_physfs(const char* argv0) PHYSFS_permitSymbolicLinks(1); //show search Path - for(char** i = PHYSFS_getSearchPath(); *i != NULL; i++) + char** searchpath = PHYSFS_getSearchPath(); + for(char** i = searchpath; *i != NULL; i++) log_info << "[" << *i << "] is in the search path" << std::endl; + PHYSFS_freeList(searchpath); } static void print_usage(const char* argv0) @@ -204,16 +217,43 @@ 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" + " -a, --aspect WIDTH:HEIGHT Run SuperTux with given aspect ratio\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" + " --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" "\n")); } +/** + * Options that should be evaluated prior to any initializations at all go here + */ +static bool pre_parse_commandline(int argc, char** argv) +{ + for(int i = 1; i < argc; ++i) { + std::string arg = argv[i]; + + if(arg == "--help") { + print_usage(argv[0]); + return true; + } else if(arg == "--version") { + std::cout << PACKAGE_NAME << " " << PACKAGE_VERSION << std::endl; + return true; + } + } + + return false; +} + +/** + * Options that should be evaluated after config is read go here + */ static bool parse_commandline(int argc, char** argv) { for(int i = 1; i < argc; ++i) { @@ -233,8 +273,24 @@ static bool parse_commandline(int argc, char** argv) print_usage(argv[0]); throw std::runtime_error("Invalid geometry spec, should be WIDTHxHEIGHT"); } + } else if(arg == "--aspect" || arg == "-a") { + if(i+1 >= argc) { + print_usage(argv[0]); + throw std::runtime_error("Need to specify a parameter for aspect switch"); + } + if(sscanf(argv[++i], "%d:%d", &config->aspectwidth, &config->aspectheight) + != 2) { + print_usage(argv[0]); + throw std::runtime_error("Invalid aspect spec, should be WIDTH:HEIGHT"); + } } else if(arg == "--show-fps") { config->show_fps = true; + } else if(arg == "--no-show-fps") { + config->show_fps = false; + } else if(arg == "--console") { + config->console_enabled = true; + } else if(arg == "--noconsole") { + config->console_enabled = false; } else if(arg == "--disable-sfx") { config->sound_enabled = false; } else if(arg == "--disable-music") { @@ -253,16 +309,11 @@ static bool parse_commandline(int argc, char** argv) config->record_demo = argv[++i]; } else if(arg == "-d") { config->enable_script_debugger = true; - } else if(arg == "--help") { - print_usage(argv[0]); - return true; - } else if(arg == "--version") { - log_info << PACKAGE_NAME << " " << PACKAGE_VERSION << std::endl; - return true; } else if(arg[0] != '-') { config->start_level = arg; } else { log_warning << "Unknown option '" << arg << "'. Use --help to see a list of options" << std::endl; + return true; } } @@ -291,11 +342,10 @@ static void init_sdl() static void init_rand() { - const char *how = config->random_seed? ", user fixed.": ", from time()."; - config->random_seed = systemRandom.srand(config->random_seed); - log_info << "Using random seed " << config->random_seed << how << std::endl; + //const char *how = config->random_seed? ", user fixed.": ", from time()."; + //log_info << "Using random seed " << config->random_seed << how << std::endl; } void init_video() @@ -338,6 +388,16 @@ void init_video() } #endif + // use aspect ratio to calculate logical resolution + if (config->aspectwidth > config->aspectheight) { + SCREEN_HEIGHT=600; + SCREEN_WIDTH=600*config->aspectwidth/config->aspectheight; + } + else { + SCREEN_WIDTH=600; + SCREEN_HEIGHT=600*config->aspectheight/config->aspectwidth; + } + // setup opengl state and transform glDisable(GL_DEPTH_TEST); glDisable(GL_CULL_FACE); @@ -349,7 +409,7 @@ void init_video() glMatrixMode(GL_PROJECTION); glLoadIdentity(); // logical resolution here not real monitor resolution - glOrtho(0, 800, 600, 0, -1.0, 1.0); + glOrtho(0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, -1.0, 1.0); glMatrixMode(GL_MODELVIEW); glLoadIdentity(); glTranslatef(0, 0, 0); @@ -443,7 +503,13 @@ int main(int argc, char** argv) { int result = 0; +#ifndef NO_CATCH try { +#endif + + if(pre_parse_commandline(argc, argv)) + return 0; + Console::instance = new Console(); init_physfs(argv[0]); init_sdl(); @@ -503,7 +569,7 @@ int main(int argc, char** argv) //init_rand(); PAK: this call might subsume the above 3, but I'm chicken! main_loop->run(); - +#ifndef NO_CATCH } catch(std::exception& e) { log_fatal << "Unexpected exception: " << e.what() << std::endl; result = 1; @@ -511,6 +577,7 @@ int main(int argc, char** argv) log_fatal << "Unexpected exception" << std::endl; result = 1; } +#endif delete main_loop; main_loop = NULL;