Turned AddonManager into a Currenton

[supertux.git] / src / supertux / gameconfig.cpp

diff --git a/src/supertux/gameconfig.cpp b/src/supertux/gameconfig.cpp
index 25679ae..8df30bb 100644 (file)
--- a/src/supertux/gameconfig.cpp
+++ b/src/supertux/gameconfig.cpp
@@ -19,40 +19,33 @@
 #include <stdexcept>
 
 #include "addon/addon_manager.hpp"
-#include "control/joystickkeyboardcontroller.hpp"
-#include "lisp/lisp.hpp"
+#include "control/input_manager.hpp"
 #include "lisp/writer.hpp"
 #include "lisp/parser.hpp"
-#include "supertux/main.hpp"
-
-Config* g_config = 0;
-
-Config::Config()
+#include "util/reader.hpp"
+#include "supertux/globals.hpp"
+
+Config::Config() :
+  profile(1),
+  fullscreen_size(0, 0),
+  fullscreen_refresh_rate(0),
+  window_size(800, 600),
+  aspect_size(0, 0), // auto detect
+  magnification(0.0f),
+  use_fullscreen(false),
+  video(VideoSystem::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)
+  start_level(),
+  enable_script_debugger(false),
+  start_demo(),
+  record_demo(),
+  locale()
 {
-  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)
-
-  window_width  = 800;
-  window_height = 600;
-
-  fullscreen_width  = 800;
-  fullscreen_height = 600;
-
-  magnification = 1.0f;
-
-  aspect_width  = 0; // auto detect
-  aspect_height = 0;
-
-  enable_script_debugger = false;
-
-  locale = ""; // autodetect 
 }
 
 Config::~Config()
@@ -66,29 +59,36 @@ Config::load()
 
   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("profile", profile);
   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) {
+  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);
+    video = VideoSystem::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("fullscreen_width",  fullscreen_size.width);
+    config_video_lisp->get("fullscreen_height", fullscreen_size.height);
+    config_video_lisp->get("fullscreen_refresh_rate", fullscreen_refresh_rate);
 
-    config_video_lisp->get("window_width",  window_width);
-    config_video_lisp->get("window_height", window_height);
+    config_video_lisp->get("window_width",  window_size.width);
+    config_video_lisp->get("window_height", window_size.height);
 
-    config_video_lisp->get("aspect_width",  aspect_width);
-    config_video_lisp->get("aspect_height", aspect_height);
+    config_video_lisp->get("aspect_width",  aspect_size.width);
+    config_video_lisp->get("aspect_height", aspect_size.height);
+
+    config_video_lisp->get("magnification", magnification);
   }
 
   const lisp::Lisp* config_audio_lisp = config_lisp->get_lisp("audio");
@@ -98,13 +98,15 @@ Config::load()
   }
 
   const lisp::Lisp* config_control_lisp = config_lisp->get_lisp("control");
-  if(config_control_lisp && g_main_controller) {
-    g_main_controller->read(*config_control_lisp);
+  if(config_control_lisp && InputManager::current())
+  {
+    InputManager::current()->read(*config_control_lisp);
   }
 
   const lisp::Lisp* config_addons_lisp = config_lisp->get_lisp("addons");
-  if(config_addons_lisp) {
-    AddonManager::get_instance().read(*config_addons_lisp);
+  if(config_addons_lisp && AddonManager::current())
+  {
+    AddonManager::current()->read(*config_addons_lisp);
   }
 }
 
@@ -115,23 +117,27 @@ Config::save()
 
   writer.start_list("supertux-config");
 
+  writer.write("profile", profile);
   writer.write("show_fps", show_fps);
   writer.write("console", console_enabled);
   writer.write("locale", locale);
 
   writer.start_list("video");
   writer.write("fullscreen", use_fullscreen);
-  writer.write("video", get_video_string(video));
+  writer.write("video", VideoSystem::get_video_string(video));
   writer.write("vsync", try_vsync);
 
-  writer.write("fullscreen_width",  fullscreen_width);
-  writer.write("fullscreen_height", fullscreen_height);
+  writer.write("fullscreen_width",  fullscreen_size.width);
+  writer.write("fullscreen_height", fullscreen_size.height);
+  writer.write("fullscreen_refresh_rate", fullscreen_refresh_rate);
+
+  writer.write("window_width",  window_size.width);
+  writer.write("window_height", window_size.height);
 
-  writer.write("window_width",  window_width);
-  writer.write("window_height", window_height);
+  writer.write("aspect_width",  aspect_size.width);
+  writer.write("aspect_height", aspect_size.height);
 
-  writer.write("aspect_width",  aspect_width);
-  writer.write("aspect_height", aspect_height);
+  writer.write("magnification", magnification);
 
   writer.end_list("video");
 
@@ -140,15 +146,19 @@ Config::save()
   writer.write("music_enabled", music_enabled);
   writer.end_list("audio");
 
-  if(g_main_controller) {
+  if (InputManager::current())
+  {
     writer.start_list("control");
-    g_main_controller->write(writer);
+    InputManager::current()->write(writer);
     writer.end_list("control");
   }
 
-  writer.start_list("addons");
-  AddonManager::get_instance().write(writer);
-  writer.end_list("addons");
+  if (AddonManager::current())
+  {
+    writer.start_list("addons");
+    AddonManager::current()->write(writer);
+    writer.end_list("addons");
+  }
 
   writer.end_list("supertux-config");
 }