X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Flevel.cpp;h=8ba49b1d6c381868d2feee1fa87b0ff4f116b7c0;hb=c824e19caa62118f59abbd2a53f7d91261b12af8;hp=9cb8dda2758eadcfa8d14829faa90274b33c03f7;hpb=4eab056837b0f26d0163a7ab2d0cc1addedcb0af;p=supertux.git

diff --git a/src/level.cpp b/src/level.cpp
index 9cb8dda27..8ba49b1d6 100644
--- a/src/level.cpp
+++ b/src/level.cpp
@@ -36,24 +36,29 @@
 
 using namespace std;
 
-st_subset::st_subset()
+LevelSubset::LevelSubset()
+    : image(0), levels(0)
 {
-  levels = 0;
 }
 
-void st_subset::create(const std::string& subset_name)
+LevelSubset::~LevelSubset()
+{
+  delete image;
+}
+
+void LevelSubset::create(const std::string& subset_name)
 {
   Level new_lev;
-  st_subset new_subset;
+  LevelSubset new_subset;
   new_subset.name = subset_name;
   new_subset.title = "Unknown Title";
   new_subset.description = "No description so far.";
   new_subset.save();
   new_lev.init_defaults();
-  new_lev.save(subset_name.c_str(),1);
+  new_lev.save(subset_name, 1);
 }
 
-void st_subset::parse (lisp_object_t* cursor)
+void LevelSubset::parse (lisp_object_t* cursor)
 {
   while(!lisp_nil_p(cursor))
     {
@@ -85,7 +90,7 @@ void st_subset::parse (lisp_object_t* cursor)
     }
 }
 
-void st_subset::load(char *subset)
+void LevelSubset::load(char *subset)
 {
   FILE* fi;
   char filename[1024];
@@ -133,11 +138,13 @@ void st_subset::load(char *subset)
       snprintf(str, 1024, "%s.png", filename);
       if(faccessible(str))
         {
+          delete image;
           image = new Surface(str,IGNORE_ALPHA);
         }
       else
         {
           snprintf(filename, 1024, "%s/images/status/level-subset-info.png", datadir.c_str());
+          delete image;
           image = new Surface(filename,IGNORE_ALPHA);
         }
     }
@@ -156,7 +163,7 @@ void st_subset::load(char *subset)
   levels = --i;
 }
 
-void st_subset::save()
+void LevelSubset::save()
 {
   FILE* fi;
   string filename;
@@ -192,15 +199,6 @@ void st_subset::save()
     }
 }
 
-void st_subset::free()
-{
-  title.clear();
-  description.clear();
-  name.clear();
-  delete image;
-  levels = 0;
-}
-
 Level::Level()
   : img_bkgd(0)
 {
@@ -210,18 +208,20 @@ Level::Level()
 Level::Level(const std::string& subset, int level)
   : img_bkgd(0)
 {
-  load(subset, level);
+  if(load(subset, level) < 0)
+    st_abort("Couldn't load level from subset", subset.c_str());
 }
 
 Level::Level(const std::string& filename)
   : img_bkgd(0)
 {
-  load(filename);
+  if(load(filename) < 0)
+    st_abort("Couldn't load level " , filename.c_str());
 }
 
 Level::~Level()
 {
-  free_gfx();
+  delete img_bkgd;
 }
 
 void
@@ -229,7 +229,6 @@ Level::init_defaults()
 {
   name       = "UnNamed";
   author     = "UnNamed";
-  theme      = "antarctica";
   song_title = "Mortimers_chipdisko.mod";
   bkgd_image = "arctis.png";
   width      = 21;
@@ -237,14 +236,15 @@ Level::init_defaults()
   start_pos_y = 170;
   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;
   bkgd_bottom.red   = 255;
   bkgd_bottom.green = 255;
   bkgd_bottom.blue  = 255;
-  endpos     = 0;
-  use_endsequence = false;
 
   for(int i = 0; i < 15; ++i)
     {
@@ -282,22 +282,17 @@ Level::load(const std::string& subset, int level)
 int 
 Level::load(const std::string& filename)
 {
-  FILE * fi;
-  lisp_object_t* root_obj = 0;
-  fi = fopen(filename.c_str(), "r");
-  if (fi == NULL)
+  lisp_object_t* root_obj = lisp_read_from_file(filename);
+  if (!root_obj)
     {
-      perror(filename.c_str());
+      std::cout << "Level: Couldn't load file: " << filename << std::endl;
       return -1;
     }
 
-  lisp_stream_t stream;
-  lisp_stream_init_file (&stream, fi);
-  root_obj = lisp_read (&stream);
-
   if (root_obj->type == LISP_TYPE_EOF || root_obj->type == LISP_TYPE_PARSE_ERROR)
     {
       printf("World: Parse Error in file %s", filename.c_str());
+      return -1;
     }
 
   vector<int> ia_tm;
@@ -308,28 +303,50 @@ Level::load(const std::string& filename)
   if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-level") == 0)
     {
       LispReader reader(lisp_cdr(root_obj));
+      version = 0;
       reader.read_int("version",  &version);
-      reader.read_bool("use-endsequence", &use_endsequence);
-      reader.read_int("width",  &width);
+      if(!reader.read_int("width",  &width))
+        st_abort("No width specified for level.", "");
       if (!reader.read_int("start_pos_x", &start_pos_x)) start_pos_x = 100;
       if (!reader.read_int("start_pos_y", &start_pos_y)) start_pos_y = 170;
-      reader.read_int("time",  &time_left);
-
+      time_left = 500;
+      if(!reader.read_int("time",  &time_left)) {
+        printf("Warning no time specified for level.\n");
+      }
+      
+      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);
       reader.read_int("bkgd_blue_top",  &bkgd_top.blue);
 
+      bkgd_bottom.red = bkgd_bottom.green = bkgd_bottom.blue = 0;
       reader.read_int("bkgd_red_bottom",  &bkgd_bottom.red);
       reader.read_int("bkgd_green_bottom",  &bkgd_bottom.green);
       reader.read_int("bkgd_blue_bottom",  &bkgd_bottom.blue);
 
+      gravity = 10;
       reader.read_float("gravity",  &gravity);
+      name = "Noname";
       reader.read_string("name",  &name);
+      author = "unknown author";
       reader.read_string("author", &author);
-      reader.read_string("theme",  &theme);
+      song_title = "";
       reader.read_string("music",  &song_title);
+      bkgd_image = "";
       reader.read_string("background",  &bkgd_image);
+      particle_system = "";
       reader.read_string("particle_system", &particle_system);
+
       reader.read_int_vector("background-tm",  &bg_tm);
 
       if (!reader.read_int_vector("interactive-tm", &ia_tm))
@@ -495,33 +512,26 @@ Level::load(const std::string& filename)
         }
     }
 
-  //  Mark the end position of this level!
-  // FIXME: -10 is a rather random value, we still need some kind of
-  // real levelend gola
-  if (use_endsequence)
-    endpos = 32*(width-30);
-  else
-    endpos = 32*(width-15);
-
   lisp_free(root_obj);
-  fclose(fi);
   return 0;
 }
 
 /* Save data for level: */
 
 void 
-Level::save(const  char * subset, int level)
+Level::save(const std::string& subset, int level)
 {
   char filename[1024];
   char str[80];
 
   /* Save data file: */
-  sprintf(str, "/levels/%s/", subset);
+  sprintf(str, "/levels/%s/", subset.c_str());
   fcreatedir(str);
-  snprintf(filename, 1024, "%s/levels/%s/level%d.stl", st_dir, subset, level);
+  snprintf(filename, 1024, "%s/levels/%s/level%d.stl", st_dir, subset.c_str(),
+      level);
   if(!fwriteable(filename))
-    snprintf(filename, 1024, "%s/levels/%s/level%d.stl", datadir.c_str(), subset, level);
+    snprintf(filename, 1024, "%s/levels/%s/level%d.stl", datadir.c_str(),
+        subset.c_str(), level);
 
   FILE * fi = fopen(filename, "w");
   if (fi == NULL)
@@ -539,10 +549,10 @@ Level::save(const  char * 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);
@@ -551,6 +561,11 @@ Level::save(const  char * subset, int level)
   fprintf(fi,"  (bkgd_blue_bottom %d)\n", bkgd_bottom.blue);
   fprintf(fi,"  (time %d)\n", time_left);
   fprintf(fi,"  (width %d)\n", width);
+  if(back_scrolling)
+    fprintf(fi,"  (back_scrolling #t)\n"); 
+  else
+    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 ");
 
@@ -616,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();
 }
@@ -634,23 +648,18 @@ Level::load_gfx()
       snprintf(fname, 1024, "%s/background/%s", st_dir, bkgd_image.c_str());
       if(!faccessible(fname))
         snprintf(fname, 1024, "%s/images/background/%s", datadir.c_str(), bkgd_image.c_str());
+      delete img_bkgd;
       img_bkgd = new Surface(fname, IGNORE_ALPHA);
     }
   else
     {
+      delete img_bkgd;
       img_bkgd = 0;
     }
 }
 
-void
-Level::free_gfx()
-{
-  delete img_bkgd;
-}
-
 /* 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];
 
@@ -737,7 +746,7 @@ Level::get_level_music_fast()
 }
 
 unsigned int 
-Level::gettileid(float x, float y)
+Level::gettileid(float x, float y) const
 {
   int xx, yy;
   unsigned int c;
@@ -753,4 +762,13 @@ Level::gettileid(float x, float y)
   return c;
 }
 
+unsigned int
+Level::get_tile_at(int x, int y) const
+{
+  if(x < 0 || x > width || y < 0 || y > 14)
+    return 0;
+  
+  return ia_tiles[y][x];
+}
+
 /* EOF */