fullscreen_size(800, 600),
window_size(800, 600),
aspect_size(0, 0), // auto detect
- magnification(1.0f),
+ magnification(0.0f),
use_fullscreen(false),
- video(AUTO_VIDEO),
+ video(VideoSystem::AUTO_VIDEO),
try_vsync(true),
show_fps(false),
sound_enabled(true),
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_size.width);
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");
}
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 && g_jk_controller) {
+ g_jk_controller->read(*config_control_lisp);
}
const lisp::Lisp* config_addons_lisp = config_lisp->get_lisp("addons");
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_size.width);
writer.write("aspect_width", aspect_size.width);
writer.write("aspect_height", aspect_size.height);
+
+ writer.write("magnification", magnification);
writer.end_list("video");
writer.write("music_enabled", music_enabled);
writer.end_list("audio");
- if(g_main_controller) {
+ if(g_jk_controller) {
writer.start_list("control");
- g_main_controller->write(writer);
+ g_jk_controller->write(writer);
writer.end_list("control");
}