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 a3de325..2b8929e 100644 (file)
--- a/src/gameconfig.cpp
+++ b/src/gameconfig.cpp
@@ -20,7 +20,7 @@
 
 #include "gameconfig.hpp"
 
-#include <cstdlib>
+#include <stdlib.h>
 #include <string>
 #include <stdexcept>
 
@@ -35,14 +35,22 @@ 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;
-  cheats_enabled = false;
+  console_enabled = false;
+  random_seed = 0;          // set by time(), by default (unless in config)
 
   screenwidth = 800;
   screenheight = 600;
+  aspect_ratio = -1;       // autodetect
+
+  enable_script_debugger = false;
+
+  locale = ""; // autodetect 
 }
 
 Config::~Config()
@@ -52,20 +60,27 @@ void
 Config::load()
 {
   lisp::Parser parser;
-  std::auto_ptr<lisp::Lisp> root (parser.parse("config"));
+  const lisp::Lisp* root = parser.parse("config");
 
   const lisp::Lisp* config_lisp = root->get_lisp("supertux-config");
   if(!config_lisp)
     throw std::runtime_error("File is not a supertux-config file");
 
   config_lisp->get("show_fps", show_fps);
-  config_lisp->get("cheats", cheats_enabled);
+  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("aspect_ratio", aspect_ratio);
   }
 
   const lisp::Lisp* config_audio_lisp = config_lisp->get_lisp("audio");
@@ -88,12 +103,16 @@ Config::save()
   writer.start_list("supertux-config");
 
   writer.write_bool("show_fps", show_fps);
-  writer.write_bool("cheats", cheats_enabled);
+  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_float("aspect_ratio", aspect_ratio);
   writer.end_list("video");
 
   writer.start_list("audio");
@@ -106,6 +125,6 @@ Config::save()
     main_controller->write(writer);
     writer.end_list("control");
   }
-  
+
   writer.end_list("supertux-config");
 }