X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgameconfig.cpp;h=728b2b838f546937cc9764291a7c9cf4fbf9ad5e;hb=20b1c27dacf592c4f82fa8772d135ca9b7375d45;hp=9c95946cdced16f6a020c895c12e4319e662fb14;hpb=959f514b78262ae6b276821bc61864fa6967b97c;p=supertux.git

diff --git a/src/gameconfig.cpp b/src/gameconfig.cpp
index 9c95946cd..728b2b838 100644
--- a/src/gameconfig.cpp
+++ b/src/gameconfig.cpp
@@ -20,7 +20,7 @@
 
 #include "gameconfig.hpp"
 
-#include <cstdlib>
+#include <stdlib.h>
 #include <string>
 #include <stdexcept>
 
@@ -30,22 +30,36 @@
 #include "control/joystickkeyboardcontroller.hpp"
 #include "resources.hpp"
 #include "main.hpp"
+#include "addon/addon_manager.hpp"
 
 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;
   console_enabled = false;
   random_seed = 0;          // set by time(), by default (unless in config)
 
-  screenwidth = 800;
-  screenheight = 600;
+  window_width  = 800;
+  window_height = 600;
+
+  fullscreen_width  = 800;
+  fullscreen_height = 600;
+
+  magnification = 1.0f;
+
+  aspect_width  = 4;
+  aspect_height = 3;
 
   enable_script_debugger = false;
+
+  locale = ""; // autodetect 
 }
 
 Config::~Config()
@@ -55,7 +69,7 @@ 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)
@@ -63,13 +77,25 @@ 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("width", screenwidth);
-    config_video_lisp->get("height", screenheight);
+    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("fullscreen_width",  fullscreen_width);
+    config_video_lisp->get("fullscreen_height", fullscreen_height);
+
+    config_video_lisp->get("window_width",  window_width);
+    config_video_lisp->get("window_height", window_height);
+
+    config_video_lisp->get("aspect_width",  aspect_width);
+    config_video_lisp->get("aspect_height", aspect_height);
   }
 
   const lisp::Lisp* config_audio_lisp = config_lisp->get_lisp("audio");
@@ -82,6 +108,11 @@ Config::load()
   if(config_control_lisp && main_controller) {
     main_controller->read(*config_control_lisp);
   }
+
+  const lisp::Lisp* config_addons_lisp = config_lisp->get_lisp("addons");
+  if(config_addons_lisp) {
+    AddonManager::get_instance().read_config(*config_addons_lisp);
+  }
 }
 
 void
@@ -93,11 +124,22 @@ 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_int("width", screenwidth);
-  writer.write_int("height", screenheight);
+  writer.write_string("video", get_video_string(video));
+  writer.write_bool("vsync", try_vsync);
+
+  writer.write_int("fullscreen_width",  fullscreen_width);
+  writer.write_int("fullscreen_height", fullscreen_height);
+
+  writer.write_int("window_width",  window_width);
+  writer.write_int("window_height", window_height);
+
+  writer.write_int("aspect_width",  aspect_width);
+  writer.write_int("aspect_height", aspect_height);
+
   writer.end_list("video");
 
   writer.start_list("audio");
@@ -111,5 +153,9 @@ Config::save()
     writer.end_list("control");
   }
 
+  writer.start_list("addons");
+  AddonManager::get_instance().write_config(writer);
+  writer.end_list("addons");
+
   writer.end_list("supertux-config");
 }