X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fmain.cpp;h=84160c7f0505185d0d3bf6a9eb7db2f5b3f5566d;hb=1c9e52d43a80d1f3ec5aadbb04ef1e14bb775acb;hp=38180b544ed0d45f9a3c36eadefd23fd542bc981;hpb=68880ecf8bac747aae18ba3637ef8d38963ee5da;p=supertux.git diff --git a/src/main.cpp b/src/main.cpp index 38180b544..84160c7f0 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -33,7 +33,6 @@ #include #include #include -#include #include "gameconfig.hpp" #include "resources.hpp" @@ -41,6 +40,7 @@ #include "audio/sound_manager.hpp" #include "video/surface.hpp" #include "video/texture_manager.hpp" +#include "video/drawing_context.hpp" #include "video/glutil.hpp" #include "control/joystickkeyboardcontroller.hpp" #include "options_menu.hpp" @@ -55,7 +55,8 @@ #include "worldmap/worldmap.hpp" #include "binreloc/binreloc.h" -SDL_Surface* screen = 0; +namespace { DrawingContext *context_pointer; } +SDL_Surface *screen; JoystickKeyboardController* main_controller = 0; TinyGetText::DictionaryManager dictionary_manager; @@ -76,6 +77,11 @@ static void init_tinygettext() { dictionary_manager.add_directory("locale"); dictionary_manager.set_charset("UTF-8"); + + // Config setting "locale" overrides language detection + if (config->locale != "") { + dictionary_manager.set_language( config->locale ); + } } static void init_physfs(const char* argv0) @@ -187,12 +193,13 @@ static void init_physfs(const char* argv0) br_init (NULL); dir = br_find_data_dir(APPDATADIR); datadir = dir; - datadir += "/" PACKAGE_NAME; free(dir); #else datadir = APPDATADIR; #endif + datadir += "/"; + datadir += application; if(!PHYSFS_addToSearchPath(datadir.c_str(), 1)) { log_warning << "Couldn't add '" << datadir << "' to physfs searchpath: " << PHYSFS_getLastError() << std::endl; } @@ -239,10 +246,7 @@ 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") { + if(arg == "--version") { std::cout << PACKAGE_NAME << " " << PACKAGE_VERSION << std::endl; return true; } @@ -259,7 +263,10 @@ static bool parse_commandline(int argc, char** argv) for(int i = 1; i < argc; ++i) { std::string arg = argv[i]; - if(arg == "--fullscreen" || arg == "-f") { + if(arg == "--help") { + print_usage(argv[0]); + return true; + } else if(arg == "--fullscreen" || arg == "-f") { config->use_fullscreen = true; } else if(arg == "--window" || arg == "-w") { config->use_fullscreen = false; @@ -360,9 +367,6 @@ void init_video() static int desktop_width = 0; static int desktop_height = 0; - if(texture_manager != NULL) - texture_manager->save_textures(); - /* 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 */ @@ -371,33 +375,31 @@ void init_video() 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); + double aspect_ratio = config->aspect_ratio; - int flags = SDL_OPENGL; - if(config->use_fullscreen) - flags |= SDL_FULLSCREEN; - int width = config->screenwidth; - int height = config->screenheight; - int bpp = 0; + // 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; + } + } - screen = SDL_SetVideoMode(width, height, bpp, flags); - if(screen == 0) { - std::stringstream msg; - msg << "Couldn't set video mode (" << width << "x" << height - << "-" << bpp << "bpp): " << SDL_GetError(); - throw std::runtime_error(msg.str()); + // use aspect ratio to calculate logical resolution + if (aspect_ratio > 1) { + SCREEN_WIDTH = static_cast (600 * aspect_ratio + 0.5); + SCREEN_HEIGHT = 600; + } else { + SCREEN_WIDTH = 600; + SCREEN_HEIGHT = static_cast (600 * 1/aspect_ratio + 0.5); } + context_pointer->init_renderer(); + screen = SDL_GetVideoSurface(); + SDL_WM_SetCaption(PACKAGE_NAME " " PACKAGE_VERSION, 0); // set icon @@ -415,48 +417,7 @@ void init_video() 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); - 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, SCREEN_WIDTH, SCREEN_HEIGHT, 0, -1.0, 1.0); - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); - glTranslatef(0, 0, 0); - - check_gl_error("Setting up view matrices"); - - if(texture_manager != NULL) - texture_manager->reload_textures(); - else - texture_manager = new TextureManager(); + log_info << (config->use_fullscreen?"fullscreen ":"window ") << SCREEN_WIDTH << "x" << SCREEN_HEIGHT << " Ratio: " << aspect_ratio << "\n"; } static void init_audio() @@ -563,6 +524,8 @@ int main(int argc, char** argv) timelog("audio"); init_audio(); timelog("video"); + DrawingContext context; + context_pointer = &context; init_video(); Console::instance->init_graphics(); timelog("scripting"); @@ -605,7 +568,7 @@ int main(int argc, char** argv) } //init_rand(); PAK: this call might subsume the above 3, but I'm chicken! - main_loop->run(); + main_loop->run(context); #ifndef NO_CATCH } catch(std::exception& e) { log_fatal << "Unexpected exception: " << e.what() << std::endl; @@ -619,7 +582,6 @@ int main(int argc, char** argv) delete main_loop; main_loop = NULL; - free_options_menu(); unload_shared(); quit_audio();