From 8f42a8be0c760322207287e50b624bd3d388a2e1 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Mon, 15 Aug 2011 02:04:56 +0300 Subject: lava! --- src/mapnode.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'src/mapnode.h') diff --git a/src/mapnode.h b/src/mapnode.h index 389fa1c9c..7ac050ef0 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,6 +153,11 @@ 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; @@ -181,6 +186,10 @@ 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(); } -- cgit v1.2.3 From 472585a7e8e511e7cc210ad8e2c17cad9dfeb186 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Mon, 15 Aug 2011 11:49:39 +0300 Subject: tuned lava/universal damage code --- src/mapnode.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/mapnode.h') diff --git a/src/mapnode.h b/src/mapnode.h index 7ac050ef0..3101a9fc1 100644 --- a/src/mapnode.h +++ b/src/mapnode.h @@ -164,6 +164,8 @@ struct ContentFeatures // Digging properties for different tools DiggingPropertiesList digging_properties; + + u32 damage_per_second; // NOTE: Move relevant properties to here from elsewhere @@ -192,6 +194,7 @@ struct ContentFeatures special_atlas = NULL; light_source = 0; digging_properties.clear(); + damage_per_second = 0; } ContentFeatures() -- cgit v1.2.3