diff options
author | Perttu Ahola <celeron55@gmail.com> | 2011-08-22 12:53:02 +0300 |
---|---|---|
committer | Perttu Ahola <celeron55@gmail.com> | 2011-08-22 12:53:02 +0300 |
commit | 23717510c21c89f39760faf033844d531fc093b5 (patch) | |
tree | 078e94632a2d622f0d45673d43e867b717496429 /src/mapnode.h | |
parent | 29c9d3d5f44ea6bb812a7d66d3ce582a1aeb7557 (diff) | |
parent | dc4ac0b96fc11d4620f04d6068e681ab793a5d92 (diff) | |
download | minetest-23717510c21c89f39760faf033844d531fc093b5.tar.gz minetest-23717510c21c89f39760faf033844d531fc093b5.tar.bz2 minetest-23717510c21c89f39760faf033844d531fc093b5.zip |
Merge branch 'lava'
Diffstat (limited to 'src/mapnode.h')
-rw-r--r-- | src/mapnode.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/mapnode.h b/src/mapnode.h index 389fa1c9c..3101a9fc1 100644 --- a/src/mapnode.h +++ b/src/mapnode.h @@ -128,8 +128,8 @@ struct ContentFeatures bool pointable; // Player can dig these bool diggable; - // Player can climb these - bool climbable; + // 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 @@ -153,12 +153,19 @@ struct ContentFeatures content_t liquid_alternative_flowing; // If the content is liquid, this is the source version of the liquid. content_t liquid_alternative_source; + // Used currently for flowing liquids + u8 vertex_alpha; + // Special irrlicht material, used sometimes + video::SMaterial *special_material; + AtlasPointer *special_atlas; // Amount of light the node emits u8 light_source; // Digging properties for different tools DiggingPropertiesList digging_properties; + + u32 damage_per_second; // NOTE: Move relevant properties to here from elsewhere @@ -181,8 +188,13 @@ struct ContentFeatures dug_item = ""; initial_metadata = NULL; liquid_alternative_flowing = CONTENT_IGNORE; + liquid_alternative_source = CONTENT_IGNORE; + vertex_alpha = 255; + special_material = NULL; + special_atlas = NULL; light_source = 0; digging_properties.clear(); + damage_per_second = 0; } ContentFeatures() |