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 4811a7b..0ee5cc7 100644 (file)
--- a/src/level.cpp
+++ b/src/level.cpp
@@ -1,14 +1,22 @@
+//  $Id$
+// 
+//  SuperTux
+//  Copyright (C) 2004 SuperTux Development Team, see AUTHORS for details
 //
-// C Implementation: level
-//
-// Description:
-//
-//
-// Author: Tobias Glaesser <tobi.web@gmx.de>, (C) 2003
-//
-// Copyright: See COPYING file that comes with this distribution
-//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
 //
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+//  02111-1307, USA.
 
 #include <map>
 #include <stdlib.h>
@@ -23,6 +31,8 @@
 #include "scene.h"
 #include "tile.h"
 #include "lispreader.h"
+#include "resources.h"
+#include "music_manager.h"
 
 using namespace std;
 
@@ -191,19 +201,27 @@ void st_subset::free()
 }
 
 Level::Level()
+  : img_bkgd(0)
 {
 }
 
 Level::Level(const std::string& subset, int level)
+  : img_bkgd(0)
 {
   load(subset, level);
 }
 
 Level::Level(const std::string& filename)
+  : img_bkgd(0)
 {
   load(filename);
 }
 
+Level::~Level()
+{
+  free_gfx();
+}
+
 void
 Level::init_defaults()
 {
@@ -224,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)
     {
@@ -288,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;
@@ -350,6 +370,7 @@ Level::load(const std::string& filename)
                 LispReader reader(lisp_cdr(data));
                 reader.read_int("x", &bg_data.x);
                 reader.read_int("y", &bg_data.y);
+                reader.read_bool("stay-on-platform", &bg_data.stay_on_platform);
 
                 badguy_data.push_back(bg_data);
 
@@ -408,7 +429,7 @@ Level::load(const std::string& filename)
               if (*i == '0' || *i == '1' || *i == '2')
                 {
                   badguy_data.push_back(BadGuyData(static_cast<BadGuyKind>(*i-'0'),
-                                                x*32, y*32));
+                                                   x*32, y*32, false));
                   *i = 0;
                 }
               else
@@ -475,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-10);
+  if (use_endsequence)
+    endpos = 32*(width-20);
+  else
+    endpos = 32*(width-15);
 
   fclose(fi);
   return 0;
@@ -552,12 +576,21 @@ Level::save(const  char * subset, int level)
     }
 
   fprintf( fi,")\n");
+
+  fprintf( fi,"(reset-points\n");
+  for(std::vector<ResetPoint>::iterator i = reset_points.begin();
+      i != reset_points.end(); ++i)
+    fprintf( fi,"(point (x %d) (y %d))\n",i->x, i->y);
+  fprintf( fi,")\n");
+
   fprintf( fi,"(objects\n");
 
   for(std::vector<BadGuyData>::iterator it = badguy_data.begin();
       it != badguy_data.end();
       ++it)
-    fprintf( fi,"(%s (x %d) (y %d))\n",badguykind_to_string((*it).kind).c_str(),(*it).x,(*it).y);
+    fprintf( fi,"(%s (x %d) (y %d) (stay-on-platform %s))\n",
+             badguykind_to_string((*it).kind).c_str(),(*it).x,(*it).y,
+             it->stay_on_platform ? "#t" : "#f");
 
   fprintf( fi,")\n");
 
@@ -666,20 +699,13 @@ Level::change(float x, float y, int tm, unsigned int c)
     }
 }
 
-void 
-Level::free_song(void)
-{
-  free_music(level_song);
-  free_music(level_song_fast);
-}
-
 void
 Level::load_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);
@@ -687,11 +713,27 @@ 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);
 }
 
+MusicRef
+Level::get_level_music()
+{
+  return level_song;
+}
+
+MusicRef
+Level::get_level_music_fast()
+{
+  return level_song_fast;
+}
+
 unsigned int 
 Level::gettileid(float x, float y)
 {