#include "gameconfig.hpp"
-#include <cstdlib>
+#include <stdlib.h>
#include <string>
#include <stdexcept>
Config::Config()
{
use_fullscreen = true;
+ try_vsync = true;
show_fps = false;
sound_enabled = true;
music_enabled = true;
screenwidth = 800;
screenheight = 600;
+ aspect_ratio = -1; // autodetect
enable_script_debugger = false;
}
Config::load()
{
lisp::Parser parser;
- std::auto_ptr<lisp::Lisp> root (parser.parse("config"));
+ const lisp::Lisp* root = parser.parse("config");
const lisp::Lisp* config_lisp = root->get_lisp("supertux-config");
if(!config_lisp)
const lisp::Lisp* config_video_lisp = config_lisp->get_lisp("video");
if(config_video_lisp) {
config_video_lisp->get("fullscreen", use_fullscreen);
+ config_video_lisp->get("vsync", try_vsync);
config_video_lisp->get("width", screenwidth);
config_video_lisp->get("height", screenheight);
+ config_video_lisp->get("aspect_ratio", aspect_ratio);
}
const lisp::Lisp* config_audio_lisp = config_lisp->get_lisp("audio");
writer.start_list("video");
writer.write_bool("fullscreen", use_fullscreen);
+ writer.write_bool("vsync", try_vsync);
writer.write_int("width", screenwidth);
writer.write_int("height", screenheight);
+ writer.write_float("aspect_ratio", aspect_ratio);
writer.end_list("video");
writer.start_list("audio");