#include "addon/addon_manager.hpp"
#include "control/joystickkeyboardcontroller.hpp"
-#include "lisp/lisp.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(800, 600),
+ window_size(800, 600),
+ aspect_size(0, 0), // auto detect
+ magnification(1.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()
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("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);
}
const lisp::Lisp* config_audio_lisp = config_lisp->get_lisp("audio");
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("window_width", window_width);
- writer.write("window_height", window_height);
+ writer.write("window_width", window_size.width);
+ writer.write("window_height", window_size.height);
- writer.write("aspect_width", aspect_width);
- writer.write("aspect_height", aspect_height);
+ writer.write("aspect_width", aspect_size.width);
+ writer.write("aspect_height", aspect_size.height);
writer.end_list("video");