X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fsupertux%2Fgameconfig.cpp;h=235198c67fb0c189d80d91aeb96fdff550a55e32;hb=366edb883b04a2f627407fc51f22da36a1ba7762;hp=59a2c0a7ff84a973fe988ab333d67e8daa42be14;hpb=d78fbc721f773f410a373ca1f060dfe223cf45d2;p=supertux.git

diff --git a/src/supertux/gameconfig.cpp b/src/supertux/gameconfig.cpp
index 59a2c0a7f..235198c67 100644
--- a/src/supertux/gameconfig.cpp
+++ b/src/supertux/gameconfig.cpp
@@ -30,7 +30,7 @@ Config::Config() :
   fullscreen_size(800, 600),
   window_size(800, 600),
   aspect_size(0, 0), // auto detect
-  magnification(1.0f),
+  magnification(0.0f),
   use_fullscreen(false),
   video(VideoSystem::AUTO_VIDEO),
   try_vsync(true),
@@ -81,6 +81,8 @@ Config::load()
 
     config_video_lisp->get("aspect_width",  aspect_size.width);
     config_video_lisp->get("aspect_height", aspect_size.height);
+    
+    config_video_lisp->get("magnification", magnification);
   }
 
   const lisp::Lisp* config_audio_lisp = config_lisp->get_lisp("audio");
@@ -90,8 +92,8 @@ Config::load()
   }
 
   const lisp::Lisp* config_control_lisp = config_lisp->get_lisp("control");
-  if(config_control_lisp && g_main_controller) {
-    g_main_controller->read(*config_control_lisp);
+  if(config_control_lisp && g_jk_controller) {
+    g_jk_controller->read(*config_control_lisp);
   }
 
   const lisp::Lisp* config_addons_lisp = config_lisp->get_lisp("addons");
@@ -124,6 +126,8 @@ Config::save()
 
   writer.write("aspect_width",  aspect_size.width);
   writer.write("aspect_height", aspect_size.height);
+  
+  writer.write("magnification", magnification);
 
   writer.end_list("video");
 
@@ -132,9 +136,9 @@ Config::save()
   writer.write("music_enabled", music_enabled);
   writer.end_list("audio");
 
-  if(g_main_controller) {
+  if(g_jk_controller) {
     writer.start_list("control");
-    g_main_controller->write(writer);
+    g_jk_controller->write(writer);
     writer.end_list("control");
   }