Just removed spaces from key and joystick setup entries... What were does doing there...

[supertux.git] / src / level.cpp

diff --git a/src/level.cpp b/src/level.cpp
index b83bdb4..bbd0915 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>
@@ -191,19 +199,28 @@ void st_subset::free()
 }
 
 Level::Level()
+  : img_bkgd(0), level_song(0), level_song_fast(0)
 {
 }
 
 Level::Level(const std::string& subset, int level)
+  : img_bkgd(0), level_song(0), level_song_fast(0)
 {
   load(subset, level);
 }
 
 Level::Level(const std::string& filename)
+  : img_bkgd(0), level_song(0), level_song_fast(0)
 {
   load(filename);
 }
 
+Level::~Level()
+{
+  free_gfx();
+  free_song();
+}
+
 void
 Level::init_defaults()
 {
@@ -213,6 +230,8 @@ Level::init_defaults()
   song_title = "Mortimers_chipdisko.mod";
   bkgd_image = "arctis.png";
   width      = 21;
+  start_pos_x = 100;
+  start_pos_y = 170;
   time_left  = 100;
   gravity    = 10.;
   bkgd_top.red   = 0;
@@ -285,9 +304,10 @@ Level::load(const std::string& filename)
   if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-level") == 0)
     {
       LispReader reader(lisp_cdr(root_obj));
-
       reader.read_int("version",  &version);
       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);
@@ -312,7 +332,29 @@ Level::load(const std::string& filename)
 
       reader.read_int_vector("foreground-tm",  &fg_tm);
 
-      {
+      { // Read ResetPoints
+        lisp_object_t* cur = 0;
+        if (reader.read_lisp("reset-points",  &cur))
+          {
+            while (!lisp_nil_p(cur))
+              {
+                lisp_object_t* data = lisp_car(cur);
+
+                ResetPoint pos;
+
+                LispReader reader(lisp_cdr(data));
+                if (reader.read_int("x", &pos.x)
+                    && reader.read_int("y", &pos.y))
+                  {
+                    reset_points.push_back(pos);
+                  }
+
+                cur = lisp_cdr(cur);
+              }
+          }
+      }
+
+      { // Read BadGuys
         lisp_object_t* cur = 0;
         if (reader.read_lisp("objects",  &cur))
           {
@@ -325,6 +367,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);
 
@@ -383,7 +426,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
@@ -450,7 +493,7 @@ 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);
+  endpos = 32*(width-20);
 
   fclose(fi);
   return 0;
@@ -527,12 +570,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");
 
@@ -554,6 +606,7 @@ Level::cleanup()
       fg_tiles[i].clear();
     }
 
+  reset_points.clear();
   name.clear();
   author.clear();
   theme.clear();
@@ -643,17 +696,26 @@ Level::change(float x, float y, int tm, unsigned int c)
 void 
 Level::free_song(void)
 {
+  if(level_song_fast != level_song) {
+    free_music(level_song_fast);
+    level_song_fast = 0;
+  }
+    
   free_music(level_song);
-  free_music(level_song_fast);
+  level_song = 0;
 }
 
 void
 Level::load_song()
 {
+  free_song();
+  
   char* song_path;
   char* song_subtitle;
 
   level_song = ::load_song(datadir + "/music/" + song_title);
+  if(!level_song)
+    st_abort("Couldn't load song: " , song_title.c_str());
 
   song_path = (char *) malloc(sizeof(char) * datadir.length() +
                               strlen(song_title.c_str()) + 8 + 5);
@@ -662,10 +724,25 @@ Level::load_song()
   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(!level_song_fast) {
+    level_song_fast = level_song;
+  }
   free(song_subtitle);
   free(song_path);
 }
 
+Mix_Music*
+Level::get_level_music()
+{
+  return level_song;
+}
+
+Mix_Music*
+Level::get_level_music_fast()
+{
+  return level_song_fast;
+}
+
 unsigned int 
 Level::gettileid(float x, float y)
 {