diff options
author | Perttu Ahola <celeron55@gmail.com> | 2011-08-05 11:22:13 +0300 |
---|---|---|
committer | Perttu Ahola <celeron55@gmail.com> | 2011-08-05 11:22:13 +0300 |
commit | 64a6da3e45838a6f764777728736dfa0f6678778 (patch) | |
tree | 570cfe68e9036f77ef10f6ca57c3ca489cbb393f /src/mapnode.h | |
parent | 5f8809e425ba814f102c4387b6bf0cf323bd96c5 (diff) | |
parent | dd9909a574514f59eb527db682a4e8d85350ead9 (diff) | |
download | minetest-64a6da3e45838a6f764777728736dfa0f6678778.tar.gz minetest-64a6da3e45838a6f764777728736dfa0f6678778.tar.bz2 minetest-64a6da3e45838a6f764777728736dfa0f6678778.zip |
merged delta and c55
Diffstat (limited to 'src/mapnode.h')
-rw-r--r-- | src/mapnode.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/mapnode.h b/src/mapnode.h index aeb72c97a..389fa1c9c 100644 --- a/src/mapnode.h +++ b/src/mapnode.h @@ -96,7 +96,7 @@ enum LiquidType LIQUID_SOURCE }; -class MapNode; +struct MapNode; class NodeMetadata; struct ContentFeatures @@ -128,6 +128,8 @@ struct ContentFeatures bool pointable; // Player can dig these bool diggable; + // Player can climb these + bool climbable; // Player can build on these bool buildable_to; // Whether the node has no liquid, source liquid or flowing liquid @@ -171,6 +173,7 @@ struct ContentFeatures walkable = true; pointable = true; diggable = true; + climbable = false; buildable_to = false; liquid_type = LIQUID_NONE; wall_mounted = false; @@ -404,9 +407,16 @@ enum LightBank }; /* + Masks for MapNode.param2 of flowing liquids + */ +#define LIQUID_LEVEL_MASK 0x07 +#define LIQUID_FLOW_DOWN_MASK 0x08 + +/* This is the stuff what the whole world consists of. */ + struct MapNode { /* |