X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftile.hpp;h=f0668d56dd37f6e629a3a064b89bf4473262c071;hb=665b4a4a6b0edae82fb830528f16d2176da44aa4;hp=68f5308ad63ee4ea0e46f5e1064eadf5c19b2db1;hpb=9b58f72e1c6900540c0ee00a800ed57d2c1f4974;p=supertux.git

diff --git a/src/tile.hpp b/src/tile.hpp
index 68f5308ad..f0668d56d 100644
--- a/src/tile.hpp
+++ b/src/tile.hpp
@@ -26,7 +26,8 @@
 #include <stdint.h>
 #include "video/surface.hpp"
 #include "math/rect.hpp"
-#include "lisp/lisp.hpp"
+
+namespace lisp { class Lisp; }
 
 class DrawingContext;
 
@@ -38,7 +39,7 @@ class Tile
 public:
   /// bitset for tile attributes
   enum {
-    /** solid tile that is indestructable by Tux */                         
+    /** solid tile that is indestructable by Tux */
     SOLID     = 0x0001,
     /** uni-directional solid tile */
     UNISOLID  = 0x0002,
@@ -58,13 +59,15 @@ public:
 
     /* interesting flags (the following are passed to gameobjects) */
     FIRST_INTERESTING_FLAG = 0x0100,
-    
+
     /** an ice brick that makes tux sliding more than usual */
     ICE       = 0x0100,
-    /** a water tile in which tux starts to swim */                         
+    /** a water tile in which tux starts to swim */
     WATER     = 0x0200,
     /** a tile that hurts the player if he touches it */
     HURTS     = 0x0400,
+    /** for lava: WATER, HURTS, FIRE */
+    FIRE      = 0x0800
   };
 
   /// worldmap flags
@@ -73,6 +76,7 @@ public:
     WORLDMAP_SOUTH = 0x0002,
     WORLDMAP_EAST  = 0x0004,
     WORLDMAP_WEST  = 0x0008,
+	WORLDMAP_DIR_MASK = 0x000f,
 
     WORLDMAP_STOP  = 0x0010,
 
@@ -83,7 +87,7 @@ public:
     WORLDMAP_CSEW  = WORLDMAP_SOUTH | WORLDMAP_EAST  | WORLDMAP_WEST,
     WORLDMAP_CNSEW = WORLDMAP_NORTH | WORLDMAP_SOUTH | WORLDMAP_EAST | WORLDMAP_WEST
   };
-  
+
   struct ImageSpec {
     ImageSpec(const std::string& newfile, const Rect& newrect)
       : file(newfile), rect(newrect)
@@ -99,19 +103,19 @@ private:
   std::vector<ImageSpec> imagespecs;
   std::vector<Surface*> images;
 
-  /** tile attributes */
+  /// tile attributes
   uint32_t attributes;
-  
+
   /** General purpose data attached to a tile (content of a box, type of coin)*/
   int data;
-  
+
   float anim_fps;
 
 public:
   ~Tile();
-  
+
   /** Draw a tile on the screen */
-  void draw(DrawingContext& context, const Vector& pos, int layer) const;
+  void draw(DrawingContext& context, const Vector& pos, int z_pos) const;
 
   unsigned int getID() const
   { return id; }
@@ -124,7 +128,7 @@ public:
 
   /// returns the width of the tile in pixels
   int getWidth() const
-  { 
+  {
     if(!images.size())
       return 0;
     return (int) images[0]->get_width();