added .music script for fortress music

[supertux.git] / src / gameconfig.cpp

diff --git a/src/gameconfig.cpp b/src/gameconfig.cpp
index 80f27c0..6a92e35 100644 (file)
--- a/src/gameconfig.cpp
+++ b/src/gameconfig.cpp
@@ -35,12 +35,9 @@ Config* config = 0;
 
 Config::Config()
 {
-  use_fullscreen = true;
-#ifdef HAVE_OPENGL
-  video = "opengl";
-#else
-  video = "sdl";
-#endif
+  profile = 1;
+  use_fullscreen = false;
+  video = AUTO_VIDEO;
   try_vsync = true;
   show_fps = false;
   sound_enabled = true;
@@ -50,7 +47,9 @@ Config::Config()
 
   screenwidth = 800;
   screenheight = 600;
-  aspect_ratio = -1;       // autodetect
+  
+  aspect_width  = 800;
+  aspect_height = 600;
 
   enable_script_debugger = false;
 
@@ -78,11 +77,14 @@ Config::load()
   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("video", video);
+    std::string video_string;
+    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("aspect_ratio", aspect_ratio);
+    config_video_lisp->get("aspect_width",  aspect_width);
+    config_video_lisp->get("aspect_height", aspect_height);
   }
 
   const lisp::Lisp* config_audio_lisp = config_lisp->get_lisp("audio");
@@ -110,11 +112,12 @@ Config::save()
 
   writer.start_list("video");
   writer.write_bool("fullscreen", use_fullscreen);
-  writer.write_string("video", video);
+  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_ratio", aspect_ratio);
+  writer.write_float("aspect_width",  aspect_width);
+  writer.write_float("aspect_height", aspect_height);
   writer.end_list("video");
 
   writer.start_list("audio");