X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmain.cpp;h=2bfbed28981a347388739cc838f4cc0153f429cd;hb=93c6baa28d9373e797aa969352f0523556b049eb;hp=8aa15323fcebc75b1f2faa0a8187b116d245b6bb;hpb=3b8479b944e306e18cb9cbdf8293fd28f3e6c115;p=supertux.git diff --git a/src/main.cpp b/src/main.cpp index 8aa15323f..2bfbed289 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -20,10 +20,10 @@ #include #include -#include "main.h" +#include "msg.hpp" +#include "main.hpp" #include -#include #include #include #include @@ -32,28 +32,25 @@ #include #include #include -#ifndef WIN32 -#include -#endif +#include #include -#include #include #include -#include "gameconfig.h" -#include "resources.h" -#include "gettext.h" -#include "audio/sound_manager.h" -#include "video/surface.h" -#include "control/joystickkeyboardcontroller.h" -#include "misc.h" -#include "title.h" -#include "game_session.h" -#include "file_system.h" - -#ifdef WIN32 -#define mkdir(dir, mode) mkdir(dir) -#endif +#include "gameconfig.hpp" +#include "resources.hpp" +#include "gettext.hpp" +#include "audio/sound_manager.hpp" +#include "video/surface.hpp" +#include "video/texture_manager.hpp" +#include "control/joystickkeyboardcontroller.hpp" +#include "misc.hpp" +#include "mainloop.hpp" +#include "title.hpp" +#include "game_session.hpp" +#include "file_system.hpp" +#include "physfs/physfs_sdl.hpp" +#include "exceptions.hpp" SDL_Surface* screen = 0; JoystickKeyboardController* main_controller = 0; @@ -65,89 +62,134 @@ static void init_config() try { config->load(); } catch(std::exception& e) { -#ifdef DEBUG - std::cerr << "Couldn't load config file: " << e.what() << "\n"; -#endif + msg_info << "Couldn't load config file: " << e.what() << ", using default settings" << std::endl; } } -static void find_directories() +static void init_tinygettext() { - const char* home = getenv("HOME"); - if(home == 0) { -#ifdef DEBUG - std::cerr << "Couldn't find home directory.\n"; -#endif - home = "."; - } - - user_dir = home; - user_dir += "/.supertux"; + dictionary_manager.add_directory("locale"); + dictionary_manager.set_charset("UTF-8"); +} - // create directories - std::string savedir = user_dir + "/save"; - mkdir(user_dir.c_str(), 0755); - mkdir(savedir.c_str(), 0755); +static void init_physfs(const char* argv0) +{ + if(!PHYSFS_init(argv0)) { + std::stringstream msg; + msg << "Couldn't initialize physfs: " << PHYSFS_getLastError(); + throw std::runtime_error(msg.str()); + } - // try current directory as datadir - if(datadir.empty()) { - if(FileSystem::faccessible("./data/credits.txt")) { - datadir = "./data/"; + // Initialize physfs (this is a slightly modified version of + // PHYSFS_setSaneConfig + const char* application = PACKAGE_NAME; + const char* userdir = PHYSFS_getUserDir(); + const char* dirsep = PHYSFS_getDirSeparator(); + char* writedir = new char[strlen(userdir) + strlen(application) + 2]; + + // Set configuration directory + sprintf(writedir, "%s.%s", userdir, application); + if(!PHYSFS_setWriteDir(writedir)) { + // try to create the directory + char* mkdir = new char[strlen(application) + 2]; + sprintf(mkdir, ".%s", application); + if(!PHYSFS_setWriteDir(userdir) || !PHYSFS_mkdir(mkdir)) { + std::ostringstream msg; + 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 '" + << writedir << "': " << PHYSFS_getLastError(); + delete[] writedir; + throw std::runtime_error(msg.str()); + } + } + PHYSFS_addToSearchPath(writedir, 0); + delete[] writedir; + + // Search for archives and add them to the search path + const char* archiveExt = "zip"; + char** rc = PHYSFS_enumerateFiles("/"); + size_t extlen = strlen(archiveExt); + + for(char** i = rc; *i != 0; ++i) { + size_t l = strlen(*i); + if((l > extlen) && ((*i)[l - extlen - 1] == '.')) { + const char* ext = (*i) + (l - extlen); + if(strcasecmp(ext, archiveExt) == 0) { + const char* d = PHYSFS_getRealDir(*i); + char* str = new char[strlen(d) + strlen(dirsep) + l + 1]; + sprintf(str, "%s%s%s", d, dirsep, *i); + PHYSFS_addToSearchPath(str, 1); + delete[] str; + } + } + } + + PHYSFS_freeList(rc); + + // when started from source dir... + std::string dir = PHYSFS_getBaseDir(); + dir += "/data"; + std::string testfname = dir; + testfname += "/credits.txt"; + bool sourcedir = false; + FILE* f = fopen(testfname.c_str(), "r"); + if(f) { + fclose(f); + if(!PHYSFS_addToSearchPath(dir.c_str(), 1)) { + msg_warning << "Couldn't add '" << dir << "' to physfs searchpath: " << PHYSFS_getLastError() << std::endl; + } else { + sourcedir = true; } } - // Detect datadir with some linux magic - if(datadir.empty()) { - char exe_file[PATH_MAX]; -#ifdef WIN32 - strcpy(exe_file, "."); + 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); #else - if(readlink("/proc/self/exe", exe_file, PATH_MAX) < 0) { -#ifdef DEBUG - std::cerr << "Couldn't read /proc/self/exe \n"; + datadir = APPDATADIR; #endif - strcpy(exe_file, "."); + if(!PHYSFS_addToSearchPath(datadir.c_str(), 1)) { + msg_warning << "Couldn't add '" << datadir << "' to physfs searchpath: " << PHYSFS_getLastError() << std::endl; } #endif - std::string exedir = std::string(dirname(exe_file)) + "/"; - std::string testdir = exedir + "./data/"; - if(access(testdir.c_str(), F_OK) == 0) { - datadir = testdir; - } - - testdir = exedir + "../share/supertux/"; - if(datadir.empty() && access(testdir.c_str(), F_OK) == 0) { - datadir = testdir; - } - } - -#ifdef DATA_PREFIX - // use default location - if(datadir.empty()) { - datadir = DATA_PREFIX; } -#endif - if(datadir.empty()) - throw std::runtime_error("Couldn't find datadir"); -} + // allow symbolic links + PHYSFS_permitSymbolicLinks(1); -static void init_tinygettext() -{ - dictionary_manager.add_directory(datadir + "/locale"); - dictionary_manager.set_charset("UTF-8"); + //show search Path + for(char** i = PHYSFS_getSearchPath(); *i != NULL; i++) + msg_info << "[" << *i << "] is in the search path" << std::endl; } 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 give resolution\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" + " --record-demo FILE LEVEL Record a demo to FILE\n" + " --play-demo FILE LEVEL Play a recorded demo\n" "\n")); } @@ -172,6 +214,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]); @@ -186,15 +232,14 @@ 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(""); + msg_info << PACKAGE_NAME << " " << PACKAGE_VERSION << std::endl; + throw graceful_shutdown(); } else if(arg[0] != '-') { config->start_level = arg; } else { - std::cerr << "Unknown option '" << arg << "'.\n"; - std::cerr << "Use --help to see a list of options.\n"; + msg_warning << "Unknown option '" << arg << "'. Use --help to see a list of options" << std::endl; } } @@ -259,6 +304,9 @@ static void check_gl_error() void init_video() { + if(texture_manager != NULL) + texture_manager->save_textures(); + SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5); SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 5); @@ -282,21 +330,24 @@ void init_video() SDL_WM_SetCaption(PACKAGE_NAME " " PACKAGE_VERSION, 0); // set icon - SDL_Surface* icon = IMG_Load( - get_resource_filename("images/engine/icons/supertux.xpm").c_str()); + SDL_Surface* icon = IMG_Load_RW( + get_physfs_SDLRWops("images/engine/icons/supertux.xpm"), true); if(icon != 0) { SDL_WM_SetIcon(icon, 0); SDL_FreeSurface(icon); } #ifdef DEBUG else { - std::cerr << "Warning: Couldn't find icon 'images/engine/icons/supertux.xpm'.\n"; + msg_warning << "Couldn't find icon 'images/engine/icons/supertux.xpm'" << std::endl; } #endif // setup opengl state and transform glDisable(GL_DEPTH_TEST); glDisable(GL_CULL_FACE); + glEnable(GL_TEXTURE_2D); + glEnable(GL_BLEND); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glViewport(0, 0, screen->w, screen->h); glMatrixMode(GL_PROJECTION); @@ -309,39 +360,23 @@ void init_video() check_gl_error(); - Surface::reload_all(); + if(texture_manager != NULL) + texture_manager->reload_textures(); + else + texture_manager = new TextureManager(); } static void init_audio() { sound_manager = new SoundManager(); - int format = MIX_DEFAULT_FORMAT; - if(Mix_OpenAudio(config->audio_frequency, format, config->audio_channels, - config->audio_chunksize) < 0) { - std::cerr << "Couldn't initialize audio (" - << config->audio_frequency << "HZ, " << config->audio_channels - << " Channels, Format " << format << ", ChunkSize " - << config->audio_chunksize << "): " << SDL_GetError() << "\n"; - return; - } - sound_manager->set_audio_device_available(true); sound_manager->enable_sound(config->sound_enabled); sound_manager->enable_music(config->music_enabled); - - if(Mix_AllocateChannels(config->audio_voices) < 0) { - std::cerr << "Couldn't allocate '" << config->audio_voices << "' audio voices: " - << SDL_GetError() << "\n"; - return; - } } static void quit_audio() { if(sound_manager) { - if(sound_manager->audio_device_available()) - Mix_CloseAudio(); - delete sound_manager; sound_manager = 0; } @@ -354,7 +389,11 @@ void wait_for_event(float min_delay, float max_delay) Uint32 min = (Uint32) (min_delay * 1000); Uint32 max = (Uint32) (max_delay * 1000); - SDL_Delay(min); + Uint32 ticks = SDL_GetTicks(); + while(SDL_GetTicks() - ticks < min) { + SDL_Delay(10); + sound_manager->update(); + } // clear even queue SDL_Event event; @@ -363,12 +402,12 @@ void wait_for_event(float min_delay, float max_delay) /* Handle events: */ bool running = false; - Uint32 ticks = SDL_GetTicks(); + ticks = SDL_GetTicks(); while(running) { 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: @@ -377,61 +416,99 @@ void wait_for_event(float min_delay, float max_delay) } if(SDL_GetTicks() - ticks >= (max - min)) running = false; + sound_manager->update(); SDL_Delay(10); } } +#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) { + msg_info << "Component '" << last_timelog_component << "' finished after " << (current_ticks - last_timelog_ticks) / 1000.0 << " seconds" << std::endl; + } + + last_timelog_ticks = current_ticks; + last_timelog_component = component; +} +#else +static inline void timelog(const char* ) +{ +} +#endif + int main(int argc, char** argv) { -#ifndef DEBUG // we want backtraces in debug mode so don't catch exceptions try { -#endif srand(time(0)); + init_physfs(argv[0]); init_sdl(); + timelog("controller"); main_controller = new JoystickKeyboardController(); - find_directories(); + 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); + + main_loop = new MainLoop(); if(config->start_level != "") { - GameSession session(config->start_level, ST_GL_LOAD_LEVEL_FILE); + // 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); + GameSession* session + = new GameSession( + FileSystem::basename(config->start_level), ST_GL_LOAD_LEVEL_FILE); if(config->start_demo != "") - session.play_demo(config->start_demo); + session->play_demo(config->start_demo); if(config->record_demo != "") - session.record_demo(config->record_demo); - session.run(); + session->record_demo(config->record_demo); + main_loop->push_screen(session); } else { - // normal game - title(); - } - -#ifndef DEBUG + main_loop->push_screen(new TitleScreen()); + } + + main_loop->run(); + + delete main_loop; + main_loop = NULL; + } catch(graceful_shutdown& e) { } catch(std::exception& e) { - std::cerr << "Unexpected exception: " << e.what() << std::endl; + msg_fatal << "Unexpected exception: " << e.what() << std::endl; return 1; } catch(...) { - std::cerr << "Unexpected exception." << std::endl; + msg_fatal << "Unexpected exception" << std::endl; return 1; } -#endif free_menu(); unload_shared(); -#ifdef DEBUG - Surface::debug_check(); -#endif quit_audio(); if(config) config->save(); delete config; delete main_controller; + delete texture_manager; SDL_Quit(); + PHYSFS_deinit(); return 0; }