X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgameconfig.cpp;h=49728045ff1a22cb3c30123d3953680bfd8cfa6e;hb=99cf62c2d44b4555e9761f1c8f1b10cf880c33fb;hp=a1a8a3da48591bf29df8f06faf87810ccf91a578;hpb=b25f7af383f89c081442725216f2eba38228a5e3;p=supertux.git diff --git a/src/gameconfig.cpp b/src/gameconfig.cpp index a1a8a3da4..49728045f 100644 --- a/src/gameconfig.cpp +++ b/src/gameconfig.cpp @@ -36,6 +36,8 @@ Config* config = 0; Config::Config() { use_fullscreen = true; + //video = AUTO_VIDEO; + video = "auto"; try_vsync = true; show_fps = false; sound_enabled = true; @@ -48,6 +50,8 @@ Config::Config() aspect_ratio = -1; // autodetect enable_script_debugger = false; + + locale = ""; // autodetect } Config::~Config() @@ -65,12 +69,17 @@ Config::load() config_lisp->get("show_fps", show_fps); config_lisp->get("console", console_enabled); + config_lisp->get("locale", locale); config_lisp->get("random_seed", random_seed); const lisp::Lisp* config_video_lisp = config_lisp->get_lisp("video"); if(config_video_lisp) { config_video_lisp->get("fullscreen", use_fullscreen); - config_video_lisp->get("vsync", try_vsync); + //std::string video_string; + //config_video_lisp->get("video", video_string); + //video = get_video_system(video_string); + config_video_lisp->get("video", video); + config_video_lisp->get("vsync", try_vsync); config_video_lisp->get("width", screenwidth); config_video_lisp->get("height", screenheight); config_video_lisp->get("aspect_ratio", aspect_ratio); @@ -97,9 +106,12 @@ Config::save() writer.write_bool("show_fps", show_fps); writer.write_bool("console", console_enabled); + writer.write_string("locale", locale); writer.start_list("video"); writer.write_bool("fullscreen", use_fullscreen); + //writer.write_string("video", get_video_string(video)); + writer.write_string("video", video); writer.write_bool("vsync", try_vsync); writer.write_int("width", screenwidth); writer.write_int("height", screenheight);