Fixed bkgd_speed. Objects properties can be edited now.

[supertux.git] / src / level.cpp

diff --git a/src/level.cpp b/src/level.cpp
index 15e258c..8ba49b1 100644 (file)
--- a/src/level.cpp
+++ b/src/level.cpp
@@ -229,7 +229,6 @@ Level::init_defaults()
 {
   name       = "UnNamed";
   author     = "UnNamed";
-  theme      = "antarctica";
   song_title = "Mortimers_chipdisko.mod";
   bkgd_image = "arctis.png";
   width      = 21;
@@ -238,6 +237,8 @@ Level::init_defaults()
   time_left  = 100;
   gravity    = 10.;
   back_scrolling = false;
+  hor_autoscroll_speed = 0;
+  bkgd_speed = 2;
   bkgd_top.red   = 0;
   bkgd_top.green = 0;
   bkgd_top.blue  = 0;
@@ -316,6 +317,13 @@ Level::load(const std::string& filename)
       back_scrolling = false;
       reader.read_bool("back_scrolling",  &back_scrolling);
 
+      hor_autoscroll_speed = 0;
+      reader.read_float("hor_autoscroll_speed",  &hor_autoscroll_speed);
+      
+      bkgd_speed = 2;
+      reader.read_int("bkgd_speed",  &bkgd_speed);
+
+      
       bkgd_top.red = bkgd_top.green = bkgd_top.blue = 0;
       reader.read_int("bkgd_red_top",  &bkgd_top.red);
       reader.read_int("bkgd_green_top",  &bkgd_top.green);
@@ -332,8 +340,6 @@ Level::load(const std::string& filename)
       reader.read_string("name",  &name);
       author = "unknown author";
       reader.read_string("author", &author);
-      if(!reader.read_string("theme",  &theme))
-        st_abort("No theme specified in level file", "");
       song_title = "";
       reader.read_string("music",  &song_title);
       bkgd_image = "";
@@ -543,10 +549,10 @@ Level::save(const std::string& subset, int level)
   fprintf(fi,"  (version %d)\n", 1);
   fprintf(fi,"  (name \"%s\")\n", name.c_str());
   fprintf(fi,"  (author \"%s\")\n", author.c_str());
-  fprintf(fi,"  (theme \"%s\")\n", theme.c_str());
   fprintf(fi,"  (music \"%s\")\n", song_title.c_str());
   fprintf(fi,"  (background \"%s\")\n", bkgd_image.c_str());
   fprintf(fi,"  (particle_system \"%s\")\n", particle_system.c_str());
+  fprintf(fi,"  (bkgd_speed %d)\n", bkgd_speed);
   fprintf(fi,"  (bkgd_red_top %d)\n", bkgd_top.red);
   fprintf(fi,"  (bkgd_green_top %d)\n", bkgd_top.green);
   fprintf(fi,"  (bkgd_blue_top %d)\n", bkgd_top.blue);
@@ -556,9 +562,10 @@ Level::save(const std::string& subset, int level)
   fprintf(fi,"  (time %d)\n", time_left);
   fprintf(fi,"  (width %d)\n", width);
   if(back_scrolling)
-    fprintf(fi,"  (back_scrolling 1)\n"); 
+    fprintf(fi,"  (back_scrolling #t)\n"); 
   else
-    fprintf(fi,"  (back_scrolling 0)\n");
+    fprintf(fi,"  (back_scrolling #f)\n");
+  fprintf(fi,"  (hor_autoscroll_speed %2.1f)\n", hor_autoscroll_speed);
   fprintf(fi,"  (gravity %2.1f)\n", gravity);
   fprintf(fi,"  (background-tm ");
 
@@ -624,11 +631,10 @@ Level::cleanup()
     }
 
   reset_points.clear();
-  name.clear();
-  author.clear();
-  theme.clear();
-  song_title.clear();
-  bkgd_image.clear();
+  name = "";
+  author = "";
+  song_title = "";
+  bkgd_image = "";
 
   badguy_data.clear();
 }
@@ -653,8 +659,7 @@ Level::load_gfx()
 }
 
 /* Load a level-specific graphic... */
-void
-Level::load_image(Surface** ptexture, string theme,const  char * file, int use_alpha)
+void Level::load_image(Surface** ptexture, string theme,const  char * file, int use_alpha)
 {
   char fname[1024];