X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fmain.cpp;h=4294f6881ff66fa1d21f747cfabfd725a716e527;hb=82895aabbae07b59a19e09a61ca94cd7b1603702;hp=2437bedfadcb3a99d77e672ce475fa0b725a9d6a;hpb=5b7f9214cb929399f1a855ef5807018a9447d510;p=supertux.git diff --git a/src/main.cpp b/src/main.cpp index 2437bedfa..4294f6881 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,7 +1,7 @@ // $Id$ -// +// // SuperTux -// Copyright (C) 2005 Matthias Braun +// Copyright (C) 2006 Matthias Braun // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -12,7 +12,7 @@ // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA @@ -20,49 +20,55 @@ #include #include +#include "log.hpp" #include "main.hpp" #include -#include #include -#include -#include +#include +#include #include #include -#include #include -#include #include #include -#include #include -#include +#include #include "gameconfig.hpp" #include "resources.hpp" #include "gettext.hpp" #include "audio/sound_manager.hpp" #include "video/surface.hpp" +#include "video/texture_manager.hpp" +#include "video/glutil.hpp" #include "control/joystickkeyboardcontroller.hpp" -#include "misc.hpp" +#include "options_menu.hpp" +#include "mainloop.hpp" #include "title.hpp" #include "game_session.hpp" +#include "scripting/level.hpp" +#include "scripting/squirrel_util.hpp" #include "file_system.hpp" #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(); try { config->load(); } catch(std::exception& e) { -#ifdef DEBUG - std::cerr << "Couldn't load config file: " << e.what() << "\n"; -#endif + log_info << "Couldn't load config file: " << e.what() << ", using default settings" << std::endl; } } @@ -82,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]; @@ -95,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()); @@ -132,7 +138,7 @@ static void init_physfs(const char* argv0) } } } - + PHYSFS_freeList(rc); // when started from source dir... @@ -145,26 +151,50 @@ static void init_physfs(const char* argv0) if(f) { fclose(f); if(!PHYSFS_addToSearchPath(dir.c_str(), 1)) { - std::cout << "Warning: Couldn't add '" << dir - << "' to physfs searchpath: " << PHYSFS_getLastError() << "\n"; + log_warning << "Couldn't add '" << dir << "' to physfs searchpath: " << PHYSFS_getLastError() << std::endl; + } else { + sourcedir = true; + } + } + +#ifdef MACOSX + // when started from Application file on Mac OS X... + dir = PHYSFS_getBaseDir(); + dir += "SuperTux.app/Contents/Resources/data"; + testfname = dir + "/credits.txt"; + sourcedir = false; + f = fopen(testfname.c_str(), "r"); + if(f) { + fclose(f); + if(!PHYSFS_addToSearchPath(dir.c_str(), 1)) { + 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 if(!PHYSFS_addToSearchPath(datadir.c_str(), 1)) { - std::cout << "Couldn't add '" << datadir - << "' to physfs searchpath: " << PHYSFS_getLastError() << "\n"; + log_warning << "Couldn't add '" << datadir << "' to physfs searchpath: " << PHYSFS_getLastError() << std::endl; } #endif } @@ -173,24 +203,58 @@ static void init_physfs(const char* argv0) PHYSFS_permitSymbolicLinks(1); //show search Path - for(char** i = PHYSFS_getSearchPath(); *i != NULL; i++) - printf("[%s] is in the search path.\n", *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) { - 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" + " -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")); } -static void parse_commandline(int argc, char** argv) +/** + * 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) { std::string arg = argv[i]; @@ -209,8 +273,28 @@ static void 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") { + config->music_enabled = false; } else if(arg == "--play-demo") { if(i+1 >= argc) { print_usage(argv[0]); @@ -223,30 +307,28 @@ static void parse_commandline(int argc, char** argv) throw std::runtime_error("Need to specify a demo filename"); } config->record_demo = argv[++i]; - } else if(arg == "--help") { - print_usage(argv[0]); - throw std::runtime_error(""); - } else if(arg == "--version") { - std::cerr << PACKAGE_NAME << " " << PACKAGE_VERSION << "\n"; - throw std::runtime_error(""); + } else if(arg == "-d") { + config->enable_script_debugger = true; } 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"; + log_warning << "Unknown option '" << arg << "'. Use --help to see a list of options" << std::endl; + return true; } } - // TODO joystick switchyes... + return false; } static void init_sdl() { - if(SDL_Init(SDL_INIT_EVERYTHING) < 0) { + if(SDL_Init(SDL_INIT_TIMER | SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) < 0) { std::stringstream msg; msg << "Couldn't initialize SDL: " << SDL_GetError(); throw std::runtime_error(msg.str()); } + // just to be sure + atexit(SDL_Quit); SDL_EnableUNICODE(1); @@ -258,51 +340,25 @@ static void init_sdl() ; } -static void check_gl_error() +static void init_rand() { - GLenum glerror = glGetError(); - std::string errormsg; - - if(glerror != GL_NO_ERROR) { - switch(glerror) { - case GL_INVALID_ENUM: - errormsg = "Invalid enumeration value"; - break; - case GL_INVALID_VALUE: - errormsg = "Numeric argzment out of range"; - break; - case GL_INVALID_OPERATION: - errormsg = "Invalid operation"; - break; - case GL_STACK_OVERFLOW: - errormsg = "stack overflow"; - break; - case GL_STACK_UNDERFLOW: - errormsg = "stack underflow"; - break; - case GL_OUT_OF_MEMORY: - errormsg = "out of memory"; - break; - case GL_TABLE_TOO_LARGE: - errormsg = "table too large"; - break; - default: - errormsg = "unknown error number"; - break; - } - std::stringstream msg; - msg << "OpenGL Error: " << errormsg; - throw std::runtime_error(msg.str()); - } + 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; } void init_video() { - SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); + 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); SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 5); - + int flags = SDL_OPENGL; if(config->use_fullscreen) flags |= SDL_FULLSCREEN; @@ -329,66 +385,87 @@ void init_video() } #ifdef DEBUG else { - std::cerr << "Warning: Couldn't find icon 'images/engine/icons/supertux.xpm'.\n"; + log_warning << "Couldn't find icon 'images/engine/icons/supertux.xpm'" << std::endl; } #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); + 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); 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); - check_gl_error(); + check_gl_error("Setting up view matrices"); - Surface::reload_all(); + if(texture_manager != NULL) + texture_manager->reload_textures(); + else + texture_manager = new TextureManager(); } static void init_audio() { sound_manager = new SoundManager(); - + sound_manager->enable_sound(config->sound_enabled); sound_manager->enable_music(config->music_enabled); } static void quit_audio() { - if(sound_manager) { + if(sound_manager != NULL) { delete sound_manager; - sound_manager = 0; + sound_manager = NULL; } } 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); - SDL_Delay(min); + Uint32 ticks = SDL_GetTicks(); + while(SDL_GetTicks() - ticks < min) { + SDL_Delay(10); + sound_manager->update(); + } - // clear even queue + // clear event queue SDL_Event event; while (SDL_PollEvent(&event)) {} /* 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"); + main_loop->quit(); + break; case SDL_KEYDOWN: case SDL_JOYBUTTONDOWN: case SDL_MOUSEBUTTONDOWN: @@ -402,58 +479,127 @@ void wait_for_event(float min_delay, float max_delay) } } -int main(int argc, char** argv) +#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) { + log_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) +{ + int result = 0; + +#ifndef NO_CATCH try { - srand(time(0)); +#endif + + if(pre_parse_commandline(argc, argv)) + return 0; + + Console::instance = new Console(); init_physfs(argv[0]); init_sdl(); - main_controller = new JoystickKeyboardController(); + + timelog("controller"); + main_controller = new JoystickKeyboardController(); + timelog("config"); init_config(); + timelog("tinygettext"); init_tinygettext(); - parse_commandline(argc, argv); + timelog("commandline"); + if(parse_commandline(argc, argv)) + return 0; + timelog("audio"); init_audio(); + timelog("video"); init_video(); - - setup_menu(); + Console::instance->init_graphics(); + timelog("scripting"); + Scripting::init_squirrel(config->enable_script_debugger); + timelog("resources"); load_shared(); + timelog(0); + + 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); - 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 != "") - session.record_demo(config->record_demo); - session.run(); + + 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); + + if(config->record_demo != "") + session->record_demo(config->record_demo); + main_loop->push_screen(session.release()); + } } else { - // normal game - title(); - } + init_rand(); + 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) { - std::cerr << "Unexpected exception: " << e.what() << std::endl; - return 1; + log_fatal << "Unexpected exception: " << e.what() << std::endl; + result = 1; } catch(...) { - std::cerr << "Unexpected exception." << std::endl; - return 1; + log_fatal << "Unexpected exception" << std::endl; + result = 1; } +#endif + + delete main_loop; + main_loop = NULL; - free_menu(); + free_options_menu(); unload_shared(); -#ifdef DEBUG - Surface::debug_check(); -#endif quit_audio(); if(config) config->save(); delete config; + config = NULL; delete main_controller; + main_controller = NULL; + delete Console::instance; + Console::instance = NULL; + Scripting::exit_squirrel(); + delete texture_manager; + texture_manager = NULL; SDL_Quit(); PHYSFS_deinit(); - - return 0; + + return result; }