At least my compiler (g++ (GCC) 3.3.2) needs this include.

[supertux.git] / src / level.cpp

diff --git a/src/level.cpp b/src/level.cpp
index f0700c9..0ee5cc7 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;
 
@@ -199,18 +201,18 @@ void st_subset::free()
 }
 
 Level::Level()
-  : level_song(0), level_song_fast(0)
+  : img_bkgd(0)
 {
 }
 
 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 +220,6 @@ Level::Level(const std::string& filename)
 Level::~Level()
 {
   free_gfx();
-  free_song();
 }
 
 void
@@ -241,6 +242,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,6 +307,7 @@ 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;
@@ -493,7 +496,10 @@ 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);
 
   fclose(fi);
   return 0;
@@ -693,24 +699,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 +713,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;