#include "gameconfig.hpp"
-#include <cstdlib>
+#include <stdlib.h>
#include <string>
#include <stdexcept>
screenwidth = 800;
screenheight = 600;
- aspectwidth = 4;
- aspectheight = 3;
+ 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)
config_video_lisp->get("fullscreen", use_fullscreen);
config_video_lisp->get("width", screenwidth);
config_video_lisp->get("height", screenheight);
- config_video_lisp->get("aspectwidth", aspectwidth);
- config_video_lisp->get("aspectheight", aspectheight);
+ config_video_lisp->get("aspect_ratio", aspect_ratio);
}
const lisp::Lisp* config_audio_lisp = config_lisp->get_lisp("audio");
writer.write_bool("fullscreen", use_fullscreen);
writer.write_int("width", screenwidth);
writer.write_int("height", screenheight);
- writer.write_int("aspectwidth", aspectwidth);
- writer.write_int("aspectheight", aspectheight);
+ writer.write_float("aspect_ratio", aspect_ratio);
writer.end_list("video");
writer.start_list("audio");