#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),
record_demo(),
locale(),
keyboard_config(),
- joystick_config()
+ joystick_config(),
+ addons(),
+ developer_mode(false)
{
}
config_lisp->get("profile", profile);
config_lisp->get("show_fps", show_fps);
config_lisp->get("console", console_enabled);
+ config_lisp->get("developer", developer_mode);
config_lisp->get("locale", locale);
config_lisp->get("random_seed", random_seed);
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 && AddonManager::current())
+ if (config_addons_lisp)
{
- AddonManager::current()->read(*config_addons_lisp);
+ 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;
+ }
+ }
}
}
writer.write("profile", profile);
writer.write("show_fps", show_fps);
writer.write("console", console_enabled);
+ writer.write("developer", developer_mode);
writer.write("locale", locale);
writer.start_list("video");
}
writer.end_list("control");
- if (AddonManager::current())
+ writer.start_list("addons");
+ for(auto addon : addons)
{
- writer.start_list("addons");
- AddonManager::current()->write(writer);
- writer.end_list("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");
}