Command line switch -d, --default to reset video settings to default values.

[supertux.git] / src / gameconfig.cpp

diff --git a/src/gameconfig.cpp b/src/gameconfig.cpp
index 5e83724..2b8929e 100644 (file)
--- a/src/gameconfig.cpp
+++ b/src/gameconfig.cpp
@@ -35,7 +35,9 @@ Config* config = 0;
 
 Config::Config()
 {
-  use_fullscreen = true;
+  use_fullscreen = false;
+  video = AUTO_VIDEO;
+  try_vsync = true;
   show_fps = false;
   sound_enabled = true;
   music_enabled = true;
@@ -44,10 +46,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 +68,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 +104,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");