projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Experimental supertux2-messages target to generate messages.pot files of src/ and...
[supertux.git]
/
src
/
tile.hpp
diff --git
a/src/tile.hpp
b/src/tile.hpp
index
c03154f
..
f0668d5
100644
(file)
--- a/
src/tile.hpp
+++ b/
src/tile.hpp
@@
-26,7
+26,8
@@
#include <stdint.h>
#include "video/surface.hpp"
#include "math/rect.hpp"
#include <stdint.h>
#include "video/surface.hpp"
#include "math/rect.hpp"
-#include "lisp/lisp.hpp"
+
+namespace lisp { class Lisp; }
class DrawingContext;
class DrawingContext;
@@
-65,6
+66,8
@@
public:
WATER = 0x0200,
/** a tile that hurts the player if he touches it */
HURTS = 0x0400,
WATER = 0x0200,
/** a tile that hurts the player if he touches it */
HURTS = 0x0400,
+ /** for lava: WATER, HURTS, FIRE */
+ FIRE = 0x0800
};
/// worldmap flags
};
/// worldmap flags
@@
-73,6
+76,7
@@
public:
WORLDMAP_SOUTH = 0x0002,
WORLDMAP_EAST = 0x0004,
WORLDMAP_WEST = 0x0008,
WORLDMAP_SOUTH = 0x0002,
WORLDMAP_EAST = 0x0004,
WORLDMAP_WEST = 0x0008,
+ WORLDMAP_DIR_MASK = 0x000f,
WORLDMAP_STOP = 0x0010,
WORLDMAP_STOP = 0x0010,