projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
also test for .exe progs on win32
[supertux.git]
/
src
/
gameconfig.cpp
diff --git
a/src/gameconfig.cpp
b/src/gameconfig.cpp
index
2387c8c
..
1e753b2
100644
(file)
--- a/
src/gameconfig.cpp
+++ b/
src/gameconfig.cpp
@@
-18,7
+18,7
@@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <config.h>
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <config.h>
-#include "gameconfig.h"
+#include "gameconfig.h
pp
"
#include <cstdlib>
#include <string>
#include <cstdlib>
#include <string>
@@
-26,13
+26,12
@@
#include <sstream>
#include <fstream>
#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;
Config* config = 0;
@@
-47,11
+46,6
@@
Config::Config()
screenwidth = 800;
screenheight = 600;
use_gl = true;
screenwidth = 800;
screenheight = 600;
use_gl = true;
-
- audio_frequency = MIX_DEFAULT_FREQUENCY;
- audio_channels = MIX_DEFAULT_CHANNELS;
- audio_chunksize = 2048;
- audio_voices = MIX_CHANNELS;
}
Config::~Config()
}
Config::~Config()
@@
-61,7
+55,7
@@
void
Config::load()
{
lisp::Parser parser;
Config::load()
{
lisp::Parser parser;
- std::auto_ptr<lisp::Lisp> root (parser.parse(
user_dir + "/
config"));
+ std::auto_ptr<lisp::Lisp> root (parser.parse(
"
config"));
const lisp::Lisp* config_lisp = root->get_lisp("supertux-config");
if(!config_lisp)
const lisp::Lisp* config_lisp = root->get_lisp("supertux-config");
if(!config_lisp)
@@
-81,10
+75,6
@@
Config::load()
if(config_audio_lisp) {
config_audio_lisp->get("sound_enabled", sound_enabled);
config_audio_lisp->get("music_enabled", music_enabled);
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");
}
const lisp::Lisp* config_control_lisp = config_lisp->get_lisp("control");
@@
-96,14
+86,7
@@
Config::load()
void
Config::save()
{
void
Config::save()
{
- std::string configfile = user_dir + "/config";
- std::ofstream file( (user_dir + "/config").c_str() );
- if(!file.good()) {
- std::stringstream msg;
- msg << "Couldn't write config file '" << configfile << "'";
- throw std::runtime_error(msg.str());
- }
- lisp::Writer writer(file);
+ lisp::Writer writer("config");
writer.start_list("supertux-config");
writer.start_list("supertux-config");
@@
-119,10
+102,6
@@
Config::save()
writer.start_list("audio");
writer.write_bool("sound_enabled", sound_enabled);
writer.write_bool("music_enabled", music_enabled);
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) {
writer.end_list("audio");
if(main_controller) {