Moved some console commands' implementations nearer to target classes

[supertux.git] / src / tile.cpp

diff --git a/src/tile.cpp b/src/tile.cpp
index 68e271e..f2d77dd 100644 (file)
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -30,6 +30,8 @@
 #include "timer.hpp"
 #include "math/vector.hpp"
 #include "video/drawing_context.hpp"
+#include "msg.hpp"
+
 
 Tile::Tile()
   : id(0), editor_image(0), attributes(0), data(0), anim_fps(1)
@@ -69,8 +71,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)
@@ -125,7 +127,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";
+      msg_warning << "Expected string or list in images tag" << std::endl;
       continue;
     }