X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgameconfig.cpp;h=38250118c4702dbd07a7588101411ad4d88ff4b9;hb=44a22ced3db79b25504d506e74e4e31d63446f1a;hp=5e83724e53b3e7f97b95af3cd886995810b46d27;hpb=82895aabbae07b59a19e09a61ca94cd7b1603702;p=supertux.git

diff --git a/src/gameconfig.cpp b/src/gameconfig.cpp
index 5e83724e5..38250118c 100644
--- a/src/gameconfig.cpp
+++ b/src/gameconfig.cpp
@@ -35,7 +35,10 @@ Config* config = 0;
 
 Config::Config()
 {
-  use_fullscreen = true;
+  profile = 1;
+  use_fullscreen = false;
+  video = AUTO_VIDEO;
+  try_vsync = true;
   show_fps = false;
   sound_enabled = true;
   music_enabled = true;
@@ -44,10 +47,11 @@ Config::Config()
 
   screenwidth = 800;
   screenheight = 600;
-  aspectwidth = 4;
-  aspectheight = 3;
+  aspect_ratio = -1;       // autodetect
 
   enable_script_debugger = false;
+
+  locale = ""; // autodetect 
 }
 
 Config::~Config()
@@ -65,15 +69,19 @@ 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);
+    std::string video_string;
+    config_video_lisp->get("video", video_string);
+    video = get_video_system(video_string);
+    config_video_lisp->get("vsync", try_vsync);
     config_video_lisp->get("width", screenwidth);
     config_video_lisp->get("height", screenheight);
-    config_video_lisp->get("aspectwidth", aspectwidth);
-    config_video_lisp->get("aspectheight", aspectheight);
+    config_video_lisp->get("aspect_ratio", aspect_ratio);
   }
 
   const lisp::Lisp* config_audio_lisp = config_lisp->get_lisp("audio");
@@ -97,13 +105,15 @@ 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_bool("vsync", try_vsync);
   writer.write_int("width", screenwidth);
   writer.write_int("height", screenheight);
-  writer.write_int("aspectwidth", aspectwidth);
-  writer.write_int("aspectheight", aspectheight);
+  writer.write_float("aspect_ratio", aspect_ratio);
   writer.end_list("video");
 
   writer.start_list("audio");