Fixed time/badguy errors in statistics, still needs some testing

[supertux.git] / src / tile.cpp

diff --git a/src/tile.cpp b/src/tile.cpp
index 5f74a99..252cd6e 100644 (file)
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -1,7 +1,8 @@
 //  $Id$
-// 
+//
 //  SuperTux
 //  Copyright (C) 2004 Tobias Glaesser <tobi.web@gmx.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -12,7 +13,7 @@
 //  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
@@ -30,12 +31,20 @@
 #include "timer.hpp"
 #include "math/vector.hpp"
 #include "video/drawing_context.hpp"
+#include "log.hpp"
+
 
 Tile::Tile()
   : id(0), editor_image(0), attributes(0), data(0), anim_fps(1)
 {
 }
 
+Tile::Tile(unsigned int id_, Uint32 attributes_, const ImageSpec& imagespec)
+  : id(id_), editor_image(0), attributes(attributes_), data(0), anim_fps(1)
+{
+  imagespecs.push_back(imagespec);
+}
+
 Tile::~Tile()
 {
   for(std::vector<Surface*>::iterator i = images.begin(); i != images.end();
@@ -63,8 +72,8 @@ Tile::parse(const lisp::Lisp& reader)
     attributes |= ICE;
   if(reader.get("water", value) && value)
     attributes |= WATER;
-  if(reader.get("spike", value) && value)
-    attributes |= SPIKE;
+  if(reader.get("hurts", value) && value)
+    attributes |= HURTS;
   if(reader.get("fullbox", value) && value)
     attributes |= FULLBOX;
   if(reader.get("coin", value) && value)
@@ -119,7 +128,7 @@ Tile::parse_images(const lisp::Lisp& images_lisp)
       ptr->get_car()->get(h);
       imagespecs.push_back(ImageSpec(file, Rect(x, y, x+w, y+h)));
     } else {
-      std::cerr << "Expected string or list in images tag.\n";
+      log_warning << "Expected string or list in images tag" << std::endl;
       continue;
     }