X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fmain.cpp;h=730809896566ca4a625acb93d59b7a093eb491d0;hb=ad961cb86ef28feed73e1f524fda692ed58d4e5e;hp=8f4569e1c030f9cfdfdd86ac00d976e0e5d73b65;hpb=eef176c312c7e3f9144a82670f648955f04b525c;p=supertux.git diff --git a/src/main.cpp b/src/main.cpp index 8f4569e1c..730809896 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include @@ -43,22 +42,27 @@ #include "audio/sound_manager.hpp" #include "video/surface.hpp" #include "video/texture_manager.hpp" +#include "video/glutil.hpp" #include "control/joystickkeyboardcontroller.hpp" #include "options_menu.hpp" #include "mainloop.hpp" #include "title.hpp" #include "game_session.hpp" -#include "script_manager.hpp" -#include "scripting/sound.hpp" #include "scripting/level.hpp" -#include "scripting/wrapper_util.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(); @@ -85,7 +89,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]; @@ -98,17 +102,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()); @@ -135,7 +139,7 @@ static void init_physfs(const char* argv0) } } } - + PHYSFS_freeList(rc); // when started from source dir... @@ -164,20 +168,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 @@ -203,16 +216,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) { @@ -232,8 +272,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") { @@ -250,16 +306,13 @@ static bool 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]); - return true; - } else if(arg == "--version") { - log_info << PACKAGE_NAME << " " << PACKAGE_VERSION << std::endl; - return true; + } else if(arg == "-d") { + config->enable_script_debugger = 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; } } @@ -286,56 +339,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; -#ifdef GL_TABLE_TOO_LARGE - case GL_TABLE_TOO_LARGE: - errormsg = "table too large"; - break; -#endif - 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() { if(texture_manager != NULL) texture_manager->save_textures(); - - SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); + + 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; @@ -366,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); @@ -377,12 +409,12 @@ 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); - check_gl_error(); + check_gl_error("Setting up view matrices"); if(texture_manager != NULL) texture_manager->reload_textures(); @@ -393,22 +425,11 @@ 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); } -static void init_scripting() -{ - ScriptManager::instance = new ScriptManager(); - - HSQUIRRELVM vm = ScriptManager::instance->get_vm(); - sq_pushroottable(vm); - expose_object(vm, -1, new Scripting::Sound(), "Sound", true); - expose_object(vm, -1, new Scripting::Level(), "Level", true); - sq_pop(vm, 1); -} - static void quit_audio() { if(sound_manager != NULL) { @@ -420,7 +441,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); @@ -464,7 +485,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; } @@ -478,19 +499,21 @@ static inline void timelog(const char* ) } #endif -int main(int argc, char** argv) +int main(int argc, char** argv) { int result = 0; - + try { - srand(time(0)); + + if(pre_parse_commandline(argc, argv)) + return 0; + + Console::instance = new Console(); init_physfs(argv[0]); init_sdl(); - - log_fatal << "Test" << std::endl; - + timelog("controller"); - main_controller = new JoystickKeyboardController(); + main_controller = new JoystickKeyboardController(); timelog("config"); init_config(); timelog("tinygettext"); @@ -502,31 +525,47 @@ int main(int argc, char** argv) init_audio(); timelog("video"); init_video(); - Console::instance = new Console(); + Console::instance->init_graphics(); timelog("scripting"); - init_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); - std::auto_ptr session - (new GameSession(FileSystem::basename(config->start_level))); - 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()); + + 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 { + 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(); } catch(std::exception& e) { log_fatal << "Unexpected exception: " << e.what() << std::endl; @@ -551,12 +590,11 @@ int main(int argc, char** argv) main_controller = NULL; delete Console::instance; Console::instance = NULL; - delete ScriptManager::instance; - ScriptManager::instance = NULL; + Scripting::exit_squirrel(); delete texture_manager; texture_manager = NULL; SDL_Quit(); PHYSFS_deinit(); - + return result; }