- fixed rising specials

[supertux.git] / src / level.cpp

diff --git a/src/level.cpp b/src/level.cpp
index d5e3e72..727e6bd 100644 (file)
--- a/src/level.cpp
+++ b/src/level.cpp
@@ -43,7 +43,7 @@ LevelSubset::LevelSubset()
 
 LevelSubset::~LevelSubset()
 {
-    delete image;
+  delete image;
 }
 
 void LevelSubset::create(const std::string& subset_name)
@@ -221,7 +221,7 @@ Level::Level(const std::string& filename)
 
 Level::~Level()
 {
-  free_gfx();
+  delete img_bkgd;
 }
 
 void
@@ -229,14 +229,17 @@ Level::init_defaults()
 {
   name       = "UnNamed";
   author     = "UnNamed";
-  theme      = "antarctica";
   song_title = "Mortimers_chipdisko.mod";
   bkgd_image = "arctis.png";
   width      = 21;
+  height     = 15;
   start_pos_x = 100;
   start_pos_y = 170;
   time_left  = 100;
   gravity    = 10.;
+  back_scrolling = false;
+  hor_autoscroll_speed = 0;
+  bkgd_speed = 50;
   bkgd_top.red   = 0;
   bkgd_top.green = 0;
   bkgd_top.blue  = 0;
@@ -244,7 +247,11 @@ Level::init_defaults()
   bkgd_bottom.green = 255;
   bkgd_bottom.blue  = 255;
 
-  for(int i = 0; i < 15; ++i)
+  bg_tiles.resize(height+1, std::vector<unsigned int>(width, 0));
+  ia_tiles.resize(height+1, std::vector<unsigned int>(width, 0));
+  fg_tiles.resize(height+1, std::vector<unsigned int>(width, 0));
+
+  for(int i = 0; i < height; ++i)
     {
       ia_tiles[i].resize(width+1, 0);
       ia_tiles[i][width] = (unsigned int) '\0';
@@ -311,7 +318,20 @@ Level::load(const std::string& filename)
       if(!reader.read_int("time",  &time_left)) {
         printf("Warning no time specified for level.\n");
       }
-
+      
+      height = 15;
+      reader.read_int("height",  &height);
+      
+      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 = 50;
+      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);
@@ -328,8 +348,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 = "";
@@ -459,7 +477,11 @@ Level::load(const std::string& filename)
         }
     }
 
-  for(int i = 0; i < 15; ++i)
+  bg_tiles.resize(height+1, std::vector<unsigned int>(width, 0));
+  ia_tiles.resize(height+1, std::vector<unsigned int>(width, 0));
+  fg_tiles.resize(height+1, std::vector<unsigned int>(width, 0));
+
+  for(int i = 0; i < height; ++i)
     {
       ia_tiles[i].resize(width + 1, 0);
       bg_tiles[i].resize(width + 1, 0);
@@ -539,10 +561,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);
@@ -551,10 +573,16 @@ Level::save(const std::string& 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);
+  fprintf(fi,"  (height %d)\n", height);
+  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 ");
 
-  for(int y = 0; y < 15; ++y)
+  for(int y = 0; y < height; ++y)
     {
       for(int i = 0; i < width; ++i)
         fprintf(fi," %d ", bg_tiles[y][i]);
@@ -563,7 +591,7 @@ Level::save(const std::string& subset, int level)
   fprintf( fi,")\n");
   fprintf(fi,"  (interactive-tm ");
 
-  for(int y = 0; y < 15; ++y)
+  for(int y = 0; y < height; ++y)
     {
       for(int i = 0; i < width; ++i)
         fprintf(fi," %d ", ia_tiles[y][i]);
@@ -572,7 +600,7 @@ Level::save(const std::string& subset, int level)
   fprintf( fi,")\n");
   fprintf(fi,"  (foreground-tm ");
 
-  for(int y = 0; y < 15; ++y)
+  for(int y = 0; y < height; ++y)
     {
       for(int i = 0; i < width; ++i)
         fprintf(fi," %d ", fg_tiles[y][i]);
@@ -616,11 +644,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 +661,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];
 
@@ -661,14 +683,14 @@ Level::load_image(Surface** ptexture, string theme,const  char * file, int use_a
   *ptexture = new Surface(fname, use_alpha);
 }
 
-/* Change the size of a level (width) */
+/* Change the size of a level */
 void 
-Level::change_size (int new_width)
+Level::change_width (int new_width)
 {
   if(new_width < 21)
     new_width = 21;
 
-  for(int y = 0; y < 15; ++y)
+  for(int y = 0; y < height; ++y)
     {
       ia_tiles[y].resize(new_width, 0);
       bg_tiles[y].resize(new_width, 0);
@@ -678,13 +700,26 @@ Level::change_size (int new_width)
   width = new_width;
 }
 
+void 
+Level::change_height (int new_height)
+{
+  if(new_height < 15)
+    new_height = 15;
+
+  bg_tiles.resize(height+1, std::vector<unsigned int>(width, 0));
+  ia_tiles.resize(height+1, std::vector<unsigned int>(width, 0));
+  fg_tiles.resize(height+1, std::vector<unsigned int>(width, 0));
+
+  height = new_height;
+}
+
 void
 Level::change(float x, float y, int tm, unsigned int c)
 {
   int yy = ((int)y / 32);
   int xx = ((int)x / 32);
 
-  if (yy >= 0 && yy < 15 && xx >= 0 && xx <= width)
+  if (yy >= 0 && yy < height && xx >= 0 && xx <= width)
     {
       switch(tm)
         {
@@ -745,7 +780,7 @@ Level::gettileid(float x, float y) const
   yy = ((int)y / 32);
   xx = ((int)x / 32);
 
-  if (yy >= 0 && yy < 15 && xx >= 0 && xx <= width)
+  if (yy >= 0 && yy < height && xx >= 0 && xx <= width)
     c = ia_tiles[yy][xx];
   else
     c = 0;
@@ -756,7 +791,7 @@ Level::gettileid(float x, float y) const
 unsigned int
 Level::get_tile_at(int x, int y) const
 {
-  if(x < 0 || x > width || y < 0 || y > 14)
+  if(x < 0 || x > width || y < 0 || y > height)
     return 0;
   
   return ia_tiles[y][x];