projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add-on Manager rewrite
[supertux.git]
/
src
/
gameconfig.cpp
diff --git
a/src/gameconfig.cpp
b/src/gameconfig.cpp
index
eedc884
..
c717af5
100644
(file)
--- a/
src/gameconfig.cpp
+++ b/
src/gameconfig.cpp
@@
-30,12
+30,16
@@
#include "control/joystickkeyboardcontroller.hpp"
#include "resources.hpp"
#include "main.hpp"
#include "control/joystickkeyboardcontroller.hpp"
#include "resources.hpp"
#include "main.hpp"
+#include "addon/addon_manager.hpp"
Config* config = 0;
Config::Config()
{
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;
show_fps = false;
sound_enabled = true;
music_enabled = true;
@@
-44,9
+48,13
@@
Config::Config()
screenwidth = 800;
screenheight = 600;
screenwidth = 800;
screenheight = 600;
- aspect_ratio = -1; // autodetect
+
+ aspect_width = 800;
+ aspect_height = 600;
enable_script_debugger = false;
enable_script_debugger = false;
+
+ locale = ""; // autodetect
}
Config::~Config()
}
Config::~Config()
@@
-64,14
+72,20
@@
Config::load()
config_lisp->get("show_fps", show_fps);
config_lisp->get("console", console_enabled);
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_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("width", screenwidth);
config_video_lisp->get("height", screenheight);
- config_video_lisp->get("aspect_ratio", aspect_ratio);
+ 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");
}
const lisp::Lisp* config_audio_lisp = config_lisp->get_lisp("audio");
@@
-84,6
+98,11
@@
Config::load()
if(config_control_lisp && main_controller) {
main_controller->read(*config_control_lisp);
}
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
}
void
@@
-95,12
+114,16
@@
Config::save()
writer.write_bool("show_fps", show_fps);
writer.write_bool("console", console_enabled);
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.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_int("width", screenwidth);
writer.write_int("height", screenheight);
- writer.write_float("aspect_ratio", aspect_ratio);
+ writer.write_float("aspect_width", aspect_width);
+ writer.write_float("aspect_height", aspect_height);
writer.end_list("video");
writer.start_list("audio");
writer.end_list("video");
writer.start_list("audio");
@@
-114,5
+137,9
@@
Config::save()
writer.end_list("control");
}
writer.end_list("control");
}
+ writer.start_list("addons");
+ AddonManager::get_instance().write_config(writer);
+ writer.end_list("addons");
+
writer.end_list("supertux-config");
}
writer.end_list("supertux-config");
}