X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fmain.cpp;h=38180b544ed0d45f9a3c36eadefd23fd542bc981;hb=5e0bb78e0d7679399eb0f687ecaf93a91cfcb577;hp=94045d612deedbc779b87a5891a5c9b1c6551573;hpb=7f92c5b8bc9664336901ac56885c426341340375;p=supertux.git diff --git a/src/main.cpp b/src/main.cpp index 94045d612..38180b544 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(); @@ -86,7 +88,7 @@ static void init_physfs(const char* argv0) // Initialize physfs (this is a slightly modified version of // PHYSFS_setSaneConfig - const char* application = PACKAGE_NAME; + const char* application = "supertux2"; //instead of PACKAGE_NAME so we can coexist with MS1 const char* userdir = PHYSFS_getUserDir(); const char* dirsep = PHYSFS_getDirSeparator(); char* writedir = new char[strlen(userdir) + strlen(application) + 2]; @@ -99,17 +101,17 @@ static void init_physfs(const char* argv0) sprintf(mkdir, ".%s", application); if(!PHYSFS_setWriteDir(userdir) || !PHYSFS_mkdir(mkdir)) { std::ostringstream msg; - msg << "Failed creating configuration directory '" + msg << "Failed creating configuration directory '" << writedir << "': " << PHYSFS_getLastError(); delete[] writedir; delete[] mkdir; throw std::runtime_error(msg.str()); } delete[] mkdir; - + if(!PHYSFS_setWriteDir(writedir)) { std::ostringstream msg; - msg << "Failed to use configuration directory '" + msg << "Failed to use configuration directory '" << writedir << "': " << PHYSFS_getLastError(); delete[] writedir; throw std::runtime_error(msg.str()); @@ -136,7 +138,7 @@ static void init_physfs(const char* argv0) } } } - + PHYSFS_freeList(rc); // when started from source dir... @@ -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,31 @@ 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(strcasecmp(argv[i+1], "auto") == 0) { + i++; + config->aspect_ratio = -1; + } else { + int aspect_width, aspect_height; + 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"); + } + config->aspect_ratio = static_cast(aspect_width) / + static_cast(aspect_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 +316,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,23 +349,40 @@ 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() { + static int desktop_width = 0; + static int desktop_height = 0; + if(texture_manager != NULL) texture_manager->save_textures(); - - SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); + +/* 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; + } + + if(config->try_vsync) { + /* we want vsync for smooth scrolling */ + SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, 1); + } +#endif + + SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5); SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 5); SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 5); - + int flags = SDL_OPENGL; if(config->use_fullscreen) flags |= SDL_FULLSCREEN; @@ -338,6 +413,28 @@ void init_video() } #endif + SDL_ShowCursor(0); + + double aspect_ratio = config->aspect_ratio; + + // try to guess aspect ratio of monitor if needed + if (aspect_ratio <= 0) { + if(config->use_fullscreen && desktop_width > 0) { + aspect_ratio = static_cast(desktop_width) / static_cast(desktop_height); + } else { + aspect_ratio = 4.0 / 3.0; + } + } + + // use aspect ratio to calculate logical resolution + if (aspect_ratio > 1) { + SCREEN_WIDTH = static_cast (600 * aspect_ratio); + SCREEN_HEIGHT = 600; + } else { + SCREEN_WIDTH = 600; + SCREEN_HEIGHT = static_cast (600 * 1/aspect_ratio); + } + // setup opengl state and transform glDisable(GL_DEPTH_TEST); glDisable(GL_CULL_FACE); @@ -349,7 +446,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); @@ -365,7 +462,7 @@ void init_video() static void init_audio() { sound_manager = new SoundManager(); - + sound_manager->enable_sound(config->sound_enabled); sound_manager->enable_music(config->music_enabled); } @@ -381,7 +478,7 @@ static void quit_audio() void wait_for_event(float min_delay, float max_delay) { assert(min_delay <= max_delay); - + Uint32 min = (Uint32) (min_delay * 1000); Uint32 max = (Uint32) (max_delay * 1000); @@ -425,7 +522,7 @@ static const char* last_timelog_component = 0; static inline void timelog(const char* component) { Uint32 current_ticks = SDL_GetTicks(); - + if(last_timelog_component != 0) { log_info << "Component '" << last_timelog_component << "' finished after " << (current_ticks - last_timelog_ticks) / 1000.0 << " seconds" << std::endl; } @@ -439,18 +536,23 @@ static inline void timelog(const char* ) } #endif -int main(int argc, char** argv) +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(); -// srand(time(0)); // this breaks repeatability in random numbers init_physfs(argv[0]); init_sdl(); - + timelog("controller"); - main_controller = new JoystickKeyboardController(); + main_controller = new JoystickKeyboardController(); timelog("config"); init_config(); timelog("tinygettext"); @@ -462,30 +564,34 @@ int main(int argc, char** argv) init_audio(); timelog("video"); init_video(); - Console::instance->init_graphics(); + Console::instance->init_graphics(); timelog("scripting"); Scripting::init_squirrel(config->enable_script_debugger); timelog("resources"); - load_shared(); + load_shared(); timelog(0); - main_loop = new MainLoop(); + main_loop = new MainLoop(); if(config->start_level != "") { // we have a normal path specified at commandline not physfs paths. // So we simply mount that path here... std::string dir = FileSystem::dirname(config->start_level); PHYSFS_addToSearchPath(dir.c_str(), true); - init_rand(); // play_demo sets seed, record_demo uses it - if(config->start_level.size() > 4 && config->start_level.compare(config->start_level.size() - 5, 5, ".stwm") == 0) { + init_rand(); main_loop->push_screen(new WorldMapNS::WorldMap( FileSystem::basename(config->start_level))); } else { + init_rand();//If level uses random eg. for + // rain particles before we do this: std::auto_ptr session ( new GameSession(FileSystem::basename(config->start_level))); - + + config->random_seed =session->get_demo_random_seed(config->start_demo); + init_rand();//initialise generator with seed from session + if(config->start_demo != "") session->play_demo(config->start_demo); @@ -498,8 +604,9 @@ int main(int argc, char** argv) main_loop->push_screen(new TitleScreen()); } + //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; @@ -507,6 +614,7 @@ int main(int argc, char** argv) log_fatal << "Unexpected exception" << std::endl; result = 1; } +#endif delete main_loop; main_loop = NULL; @@ -528,6 +636,6 @@ int main(int argc, char** argv) texture_manager = NULL; SDL_Quit(); PHYSFS_deinit(); - + return result; }