X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgameconfig.cpp;h=447c58b4e8ca10cd45164cfc5938653f7a03648c;hb=e6a940db5904743e8220491ce10b5107e119a44c;hp=94fa2acae294e17f07242679a23cd5e41b428c4f;hpb=7ae3aef67ad305cb9c6ed584cdac6117da9eba88;p=supertux.git

diff --git a/src/gameconfig.cpp b/src/gameconfig.cpp
index 94fa2acae..447c58b4e 100644
--- a/src/gameconfig.cpp
+++ b/src/gameconfig.cpp
@@ -18,21 +18,18 @@
 //  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;
 
@@ -46,12 +43,6 @@ Config::Config()
 
   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()
@@ -81,10 +72,6 @@ Config::load()
   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");
@@ -112,10 +99,6 @@ Config::save()
   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) {