- bullet tweaks

[supertux.git] / src / level.cpp

diff --git a/src/level.cpp b/src/level.cpp
index f0700c9..4bdf1b4 100644 (file)
--- a/src/level.cpp
+++ b/src/level.cpp
@@ -31,6 +31,8 @@
 #include "scene.h"
 #include "tile.h"
 #include "lispreader.h"
+#include "resources.h"
+#include "music_manager.h"
 
 using namespace std;
 
@@ -125,6 +127,7 @@ void st_subset::load(char *subset)
 
         }
 
+      lisp_free(root_obj);
       fclose(fi);
 
       snprintf(str, 1024, "%s.png", filename);
@@ -199,18 +202,19 @@ void st_subset::free()
 }
 
 Level::Level()
-  : level_song(0), level_song_fast(0)
+  : img_bkgd(0)
 {
+  init_defaults();
 }
 
 Level::Level(const std::string& subset, int level)
-  : level_song(0), level_song_fast(0)
+  : img_bkgd(0)
 {
   load(subset, level);
 }
 
 Level::Level(const std::string& filename)
-  : level_song(0), level_song_fast(0)
+  : img_bkgd(0)
 {
   load(filename);
 }
@@ -218,7 +222,6 @@ Level::Level(const std::string& filename)
 Level::~Level()
 {
   free_gfx();
-  free_song();
 }
 
 void
@@ -241,6 +244,7 @@ Level::init_defaults()
   bkgd_bottom.green = 255;
   bkgd_bottom.blue  = 255;
   endpos     = 0;
+  use_endsequence = false;
 
   for(int i = 0; i < 15; ++i)
     {
@@ -305,18 +309,19 @@ Level::load(const std::string& filename)
     {
       LispReader reader(lisp_cdr(root_obj));
       reader.read_int("version",  &version);
+      reader.read_bool("use-endsequence", &use_endsequence);
       reader.read_int("width",  &width);
       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);
 
-      reader.read_int("bkgd_top_red",  &bkgd_top.red);
-      reader.read_int("bkgd_top_green",  &bkgd_top.green);
-      reader.read_int("bkgd_top_blue",  &bkgd_top.blue);
+      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);
 
-      reader.read_int("bkgd_bottom_red",  &bkgd_bottom.red);
-      reader.read_int("bkgd_bottom_green",  &bkgd_bottom.green);
-      reader.read_int("bkgd_bottom_blue",  &bkgd_bottom.blue);
+      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);
 
       reader.read_float("gravity",  &gravity);
       reader.read_string("name",  &name);
@@ -493,8 +498,12 @@ 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
-  endpos = 32*(width-20);
+  if (use_endsequence)
+    endpos = 32*(width-20);
+  else
+    endpos = 32*(width-15);
 
+  lisp_free(root_obj);
   fclose(fi);
   return 0;
 }
@@ -534,12 +543,12 @@ Level::save(const  char * subset, int level)
   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_top_red %d)\n", bkgd_top.red);
-  fprintf(fi,"  (bkgd_top_green %d)\n", bkgd_top.green);
-  fprintf(fi,"  (bkgd_top_blue %d)\n", bkgd_top.blue);
-  fprintf(fi,"  (bkgd_bottom_red %d)\n", bkgd_bottom.red);
-  fprintf(fi,"  (bkgd_bottom_green %d)\n", bkgd_bottom.green);
-  fprintf(fi,"  (bkgd_bottom_blue %d)\n", bkgd_bottom.blue);
+  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);
+  fprintf(fi,"  (bkgd_red_bottom %d)\n", bkgd_bottom.red);
+  fprintf(fi,"  (bkgd_green_bottom %d)\n", bkgd_bottom.green);
+  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,"  (gravity %2.1f)\n", gravity);
@@ -629,8 +638,7 @@ Level::load_gfx()
     }
   else
     {
-      /* Quick hack to make sure an image is loaded, when we are freeing it afterwards. */
-      load_image(&img_bkgd, theme,"solid0.png", IGNORE_ALPHA);
+      img_bkgd = 0;
     }
 }
 
@@ -693,24 +701,13 @@ Level::change(float x, float y, int tm, unsigned int c)
     }
 }
 
-void 
-Level::free_song(void)
-{
-  free_music(level_song);
-  level_song = 0;
-  free_music(level_song_fast);
-  level_song_fast = 0;
-}
-
 void
 Level::load_song()
 {
-  free_song();
-  
   char* song_path;
   char* song_subtitle;
 
-  level_song = ::load_song(datadir + "/music/" + song_title);
+  level_song = music_manager->load_music(datadir + "/music/" + song_title);
 
   song_path = (char *) malloc(sizeof(char) * datadir.length() +
                               strlen(song_title.c_str()) + 8 + 5);
@@ -718,18 +715,22 @@ Level::load_song()
   strcpy(strstr(song_subtitle, "."), "\0");
   sprintf(song_path, "%s/music/%s-fast%s", datadir.c_str(), 
           song_subtitle, strstr(song_title.c_str(), "."));
-  level_song_fast = ::load_song(song_path);
+  if(!music_manager->exists_music(song_path)) {
+    level_song_fast = level_song;
+  } else {
+    level_song_fast = music_manager->load_music(song_path);
+  }
   free(song_subtitle);
   free(song_path);
 }
 
-Mix_Music*
+MusicRef
 Level::get_level_music()
 {
   return level_song;
 }
 
-Mix_Music*
+MusicRef
 Level::get_level_music_fast()
 {
   return level_song_fast;