Pause music when pressing ESC during a level and resume it when exiting the pause...

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

diff --git a/src/supertux/gameconfig.cpp b/src/supertux/gameconfig.cpp
index 13408a7..c7d7778 100644 (file)
--- a/src/supertux/gameconfig.cpp
+++ b/src/supertux/gameconfig.cpp
@@ -21,15 +21,17 @@
 #include "addon/addon_manager.hpp"
 #include "control/input_manager.hpp"
 #include "lisp/writer.hpp"
+#include "lisp/list_iterator.hpp"
 #include "lisp/parser.hpp"
 #include "util/reader.hpp"
+#include "util/log.hpp"
 #include "supertux/globals.hpp"
 
 Config::Config() :
   profile(1),
   fullscreen_size(0, 0),
   fullscreen_refresh_rate(0),
-  window_size(800, 600),
+  window_size(1280, 800),
   aspect_size(0, 0), // auto detect
   magnification(0.0f),
   use_fullscreen(false),
@@ -47,7 +49,7 @@ Config::Config() :
   locale(),
   keyboard_config(),
   joystick_config(),
-  disabled_addon_filenames(),
+  addons(),
   developer_mode(false)
 {
 }
@@ -108,20 +110,38 @@ Config::load()
     const lisp::Lisp* keymap_lisp = config_control_lisp->get_lisp("keymap");
     if (keymap_lisp)
     {
-      keyboard_config.read(*config_control_lisp);
+      keyboard_config.read(*keymap_lisp);
     }
 
     const lisp::Lisp* joystick_lisp = config_control_lisp->get_lisp("joystick");
     if (joystick_lisp)
     {
-      joystick_config.read(joystick_lisp);
+      joystick_config.read(*joystick_lisp);
     }
   }
 
   const lisp::Lisp* config_addons_lisp = config_lisp->get_lisp("addons");
   if (config_addons_lisp)
   {
-    config_addons_lisp->get("disabled-addons", disabled_addon_filenames);
+    lisp::ListIterator iter(config_addons_lisp);
+    while(iter.next())
+    {
+      const std::string& token = iter.item();
+      if (token == "addon")
+      {
+        std::string id;
+        bool enabled = false;
+        if (iter.lisp()->get("id", id) &&
+            iter.lisp()->get("enabled", enabled))
+        {
+          addons.push_back({id, enabled});
+        }
+      }
+      else
+      {
+        log_warning << "Unknown token in config file: " << token << std::endl;
+      }
+    }
   }
 }
 
@@ -175,7 +195,13 @@ Config::save()
   writer.end_list("control");
 
   writer.start_list("addons");
-  writer.write("disabled-addons", disabled_addon_filenames);
+  for(auto addon : addons)
+  {
+    writer.start_list("addon");
+    writer.write("id", addon.id);
+    writer.write("enabled", addon.enabled);
+    writer.end_list("addon");
+  }
   writer.end_list("addons");
 
   writer.end_list("supertux-config");