-// $Id: configfile.cpp 2212 2004-11-28 14:57:45Z matzebraun $
+// $Id$
//
// SuperTux - A Jump'n Run
-// Copyright (C) 2004 Michael George <mike@georgetech.com>
+// Copyright (C) 2006 Matthias Braun <matze@braunis.de>
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <config.h>
-#include "gameconfig.h"
+#include "gameconfig.hpp"
#include <cstdlib>
#include <string>
#include <stdexcept>
-#include <sstream>
-#include <fstream>
-#include "audio/sound_manager.h"
-#include "lisp/parser.h"
-#include "lisp/lisp.h"
-#include "lisp/writer.h"
-#include "control/joystickkeyboardcontroller.h"
-#include "resources.h"
-#include "main.h"
+#include "lisp/parser.hpp"
+#include "lisp/lisp.hpp"
+#include "lisp/writer.hpp"
+#include "control/joystickkeyboardcontroller.hpp"
+#include "resources.hpp"
+#include "main.hpp"
Config* config = 0;
show_fps = false;
sound_enabled = true;
music_enabled = true;
- cheats_enabled = false;
+ console_enabled = false;
+ random_seed = 0; // set by time(), by default (unless in config)
screenwidth = 800;
screenheight = 600;
- use_gl = true;
+ aspectwidth = 4;
+ aspectheight = 3;
- audio_frequency = MIX_DEFAULT_FREQUENCY;
- audio_channels = MIX_DEFAULT_CHANNELS;
- audio_chunksize = 2048;
- audio_voices = MIX_CHANNELS;
+ enable_script_debugger = false;
}
Config::~Config()
throw std::runtime_error("File is not a supertux-config file");
config_lisp->get("show_fps", show_fps);
- config_lisp->get("cheats", cheats_enabled);
+ config_lisp->get("console", console_enabled);
+ 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_video_lisp->get("width", screenwidth);
config_video_lisp->get("height", screenheight);
+ config_video_lisp->get("aspectwidth", aspectwidth);
+ config_video_lisp->get("aspectheight", aspectheight);
}
const lisp::Lisp* config_audio_lisp = config_lisp->get_lisp("audio");
if(config_audio_lisp) {
config_audio_lisp->get("sound_enabled", sound_enabled);
config_audio_lisp->get("music_enabled", music_enabled);
- config_audio_lisp->get("frequency", audio_frequency);
- config_audio_lisp->get("channels", audio_channels);
- config_audio_lisp->get("voices", audio_voices);
- config_audio_lisp->get("chunksize", audio_chunksize);
}
const lisp::Lisp* config_control_lisp = config_lisp->get_lisp("control");
writer.start_list("supertux-config");
writer.write_bool("show_fps", show_fps);
- writer.write_bool("cheats", cheats_enabled);
+ writer.write_bool("console", console_enabled);
writer.start_list("video");
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.end_list("video");
writer.start_list("audio");
writer.write_bool("sound_enabled", sound_enabled);
writer.write_bool("music_enabled", music_enabled);
- writer.write_int("frequency", audio_frequency);
- writer.write_int("channels", audio_channels);
- writer.write_int("voices", audio_voices);
- writer.write_int("chunksize", audio_chunksize);
writer.end_list("audio");
if(main_controller) {
main_controller->write(writer);
writer.end_list("control");
}
-
+
writer.end_list("supertux-config");
}