New grow and skid sounds from remaxim

[supertux.git] / src / gameconfig.cpp

diff --git a/src/gameconfig.cpp b/src/gameconfig.cpp
index c717af5..8180034 100644 (file)
--- a/src/gameconfig.cpp
+++ b/src/gameconfig.cpp
@@ -46,11 +46,16 @@ Config::Config()
   console_enabled = false;
   random_seed = 0;          // set by time(), by default (unless in config)
 
-  screenwidth = 800;
-  screenheight = 600;
-  
-  aspect_width  = 800;
-  aspect_height = 600;
+  window_width  = 800;
+  window_height = 600;
+
+  fullscreen_width  = 800;
+  fullscreen_height = 600;
+
+  magnification = 1.0f;
+
+  aspect_width  = 0; // auto detect
+  aspect_height = 0;
 
   enable_script_debugger = false;
 
@@ -82,8 +87,13 @@ Config::load()
     config_video_lisp->get("video", video_string);
     video = get_video_system(video_string);
     config_video_lisp->get("vsync", try_vsync);
-    config_video_lisp->get("width", screenwidth);
-    config_video_lisp->get("height", screenheight);
+
+    config_video_lisp->get("fullscreen_width",  fullscreen_width);
+    config_video_lisp->get("fullscreen_height", fullscreen_height);
+
+    config_video_lisp->get("window_width",  window_width);
+    config_video_lisp->get("window_height", window_height);
+
     config_video_lisp->get("aspect_width",  aspect_width);
     config_video_lisp->get("aspect_height", aspect_height);
   }
@@ -101,7 +111,7 @@ Config::load()
 
   const lisp::Lisp* config_addons_lisp = config_lisp->get_lisp("addons");
   if(config_addons_lisp) {
-    AddonManager::get_instance().read_config(*config_addons_lisp);
+    AddonManager::get_instance().read(*config_addons_lisp);
   }
 }
 
@@ -112,23 +122,29 @@ Config::save()
 
   writer.start_list("supertux-config");
 
-  writer.write_bool("show_fps", show_fps);
-  writer.write_bool("console", console_enabled);
-  writer.write_string("locale", locale);
+  writer.write("show_fps", show_fps);
+  writer.write("console", console_enabled);
+  writer.write("locale", locale);
 
   writer.start_list("video");
-  writer.write_bool("fullscreen", use_fullscreen);
-  writer.write_string("video", get_video_string(video));
-  writer.write_bool("vsync", try_vsync);
-  writer.write_int("width", screenwidth);
-  writer.write_int("height", screenheight);
-  writer.write_float("aspect_width",  aspect_width);
-  writer.write_float("aspect_height", aspect_height);
+  writer.write("fullscreen", use_fullscreen);
+  writer.write("video", get_video_string(video));
+  writer.write("vsync", try_vsync);
+
+  writer.write("fullscreen_width",  fullscreen_width);
+  writer.write("fullscreen_height", fullscreen_height);
+
+  writer.write("window_width",  window_width);
+  writer.write("window_height", window_height);
+
+  writer.write("aspect_width",  aspect_width);
+  writer.write("aspect_height", aspect_height);
+
   writer.end_list("video");
 
   writer.start_list("audio");
-  writer.write_bool("sound_enabled", sound_enabled);
-  writer.write_bool("music_enabled", music_enabled);
+  writer.write("sound_enabled", sound_enabled);
+  writer.write("music_enabled", music_enabled);
   writer.end_list("audio");
 
   if(main_controller) {
@@ -138,7 +154,7 @@ Config::save()
   }
 
   writer.start_list("addons");
-  AddonManager::get_instance().write_config(writer);
+  AddonManager::get_instance().write(writer);
   writer.end_list("addons");
 
   writer.end_list("supertux-config");