X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fmain.cpp;h=84b0e968806fa8d6316759ca5e006150151d285c;hb=1bfcf5a82ac306fa5380c4db2be5109b61fac58e;hp=950da90dc66a25f07bb2b37ab9b917d8718d2aba;hpb=bebf5edbad6dd552eecc6acba93dca178286381e;p=supertux.git diff --git a/src/main.cpp b/src/main.cpp index 950da90dc..84b0e9688 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -20,7 +20,7 @@ #include #include -#include "main.h" +#include "main.hpp" #include #include @@ -32,28 +32,23 @@ #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 "control/joystickkeyboardcontroller.hpp" +#include "misc.hpp" +#include "title.hpp" +#include "game_session.hpp" +#include "file_system.hpp" +#include "physfs/physfs_sdl.hpp" SDL_Surface* screen = 0; JoystickKeyboardController* main_controller = 0; @@ -71,73 +66,115 @@ static void init_config() } } -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)) { + std::cout << "Warning: Couldn't add '" << dir + << "' to physfs searchpath: " << PHYSFS_getLastError() << "\n"; + } else { + sourcedir = true; } } - // Detect datadir with some linux magic - if(datadir.empty()) { - std::string exedir; -#ifdef WIN32 - exedir = "."; + 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 - char exe_file[PATH_MAX]; - if(readlink("/proc/self/exe", exe_file, PATH_MAX) >= 0) { - exedir = std::string(dirname(exe_file)); - } else { -#ifdef DEBUG - std::cerr << "Couldn't read /proc/self/exe \n"; + datadir = APPDATADIR; #endif - exedir = "."; + if(!PHYSFS_addToSearchPath(datadir.c_str(), 1)) { + std::cout << "Couldn't add '" << datadir + << "' to physfs searchpath: " << PHYSFS_getLastError() << "\n"; } #endif - 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++) + printf("[%s] is in the search path.\n", *i); } static void print_usage(const char* argv0) @@ -145,11 +182,14 @@ static void print_usage(const char* 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" " --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")); } @@ -284,8 +324,8 @@ 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); @@ -318,32 +358,13 @@ 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; } @@ -356,7 +377,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; @@ -365,7 +390,7 @@ 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) { @@ -379,19 +404,18 @@ void wait_for_event(float min_delay, float max_delay) } if(SDL_GetTicks() - ticks >= (max - min)) running = false; + sound_manager->update(); SDL_Delay(10); } } 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(); main_controller = new JoystickKeyboardController(); - find_directories(); init_config(); init_tinygettext(); parse_commandline(argc, argv); @@ -401,7 +425,12 @@ int main(int argc, char** argv) setup_menu(); load_shared(); 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( + FileSystem::basename(config->start_level), ST_GL_LOAD_LEVEL_FILE); if(config->start_demo != "") session.play_demo(config->start_demo); if(config->record_demo != "") @@ -411,8 +440,6 @@ int main(int argc, char** argv) // normal game title(); } - -#ifndef DEBUG } catch(std::exception& e) { std::cerr << "Unexpected exception: " << e.what() << std::endl; return 1; @@ -420,7 +447,6 @@ int main(int argc, char** argv) std::cerr << "Unexpected exception." << std::endl; return 1; } -#endif free_menu(); unload_shared(); @@ -434,6 +460,7 @@ int main(int argc, char** argv) delete config; delete main_controller; SDL_Quit(); + PHYSFS_deinit(); return 0; }