Convert cnames back to .h

[supertux.git] / src / gameconfig.cpp

diff --git a/src/gameconfig.cpp b/src/gameconfig.cpp
index 416d104..5e83724 100644 (file)
--- a/src/gameconfig.cpp
+++ b/src/gameconfig.cpp
@@ -20,7 +20,7 @@
 
 #include "gameconfig.hpp"
 
-#include <cstdlib>
+#include <stdlib.h>
 #include <string>
 #include <stdexcept>
 
@@ -39,10 +39,13 @@ Config::Config()
   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;
+  aspectwidth = 4;
+  aspectheight = 3;
 
   enable_script_debugger = false;
 }
@@ -54,20 +57,23 @@ void
 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)
     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");
@@ -90,12 +96,14 @@ Config::save()
   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");
@@ -108,6 +116,6 @@ Config::save()
     main_controller->write(writer);
     writer.end_list("control");
   }
-  
+
   writer.end_list("supertux-config");
 }