X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftile.hpp;h=f0668d56dd37f6e629a3a064b89bf4473262c071;hb=665b4a4a6b0edae82fb830528f16d2176da44aa4;hp=c03154f8e6972e69926c9fe5761d2d4304301d98;hpb=a113d3bd1feddd510e3b2852b0d42522735eee40;p=supertux.git diff --git a/src/tile.hpp b/src/tile.hpp index c03154f8e..f0668d56d 100644 --- a/src/tile.hpp +++ b/src/tile.hpp @@ -26,7 +26,8 @@ #include #include "video/surface.hpp" #include "math/rect.hpp" -#include "lisp/lisp.hpp" + +namespace lisp { class Lisp; } class DrawingContext; @@ -65,6 +66,8 @@ public: 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,