make it slightly less annoying :o)

[dragonfireclient.git] / src / content_mapnode.cpp

diff --git a/src/content_mapnode.cpp b/src/content_mapnode.cpp
index a3c8d4b0a48cee82913f2cede12327d30039dfad..89171755e33a1ec8f640c2927a42c5cf08f9cfd8 100644 (file)
--- a/src/content_mapnode.cpp
+++ b/src/content_mapnode.cpp
@@ -26,6 +26,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #define WATER_ALPHA 160
 
+#define WATER_VISC 1
+#define LAVA_VISC 7
+
 // TODO: Get rid of these and set up some attributes like toughness,
 //       fluffyness, and a funciton to calculate time and durability loss
 //       (and sound? and whatever else) from them
@@ -33,6 +36,11 @@ void setStoneLikeDiggingProperties(DiggingPropertiesList &list, float toughness)
 void setDirtLikeDiggingProperties(DiggingPropertiesList &list, float toughness);
 void setWoodLikeDiggingProperties(DiggingPropertiesList &list, float toughness);
 
+/*
+       A conversion table for backwards compatibility.
+       Maps <=v19 content types to current ones.
+       Should never be touched.
+*/
 content_t trans_table_19[21][2] = {
        {CONTENT_GRASS, 1},
        {CONTENT_TREE, 4},
@@ -290,7 +298,7 @@ void content_mapnode_init()
        f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
        f->solidness = 0; // drawn separately, makes no faces
        f->air_equivalent = true; // grass grows underneath
-       f->setInventoryTexture("item_fence.png");
+       f->setInventoryTexture("fence.png");
        setWoodLikeDiggingProperties(f->digging_properties, 0.75);
 
        i = CONTENT_RAIL;
@@ -367,6 +375,7 @@ void content_mapnode_init()
        f->param_type = CPT_LIGHT;
        f->light_propagates = true;
        f->solidness = 0; // Drawn separately, makes no faces
+       f->visual_solidness = 1;
        f->walkable = false;
        f->pointable = false;
        f->diggable = false;
@@ -374,7 +383,9 @@ void content_mapnode_init()
        f->liquid_type = LIQUID_FLOWING;
        f->liquid_alternative_flowing = CONTENT_WATER;
        f->liquid_alternative_source = CONTENT_WATERSOURCE;
+       f->liquid_viscosity = WATER_VISC;
        f->vertex_alpha = WATER_ALPHA;
+       f->post_effect_color = video::SColor(64, 100, 100, 200);
        if(f->special_material == NULL && g_texturesource)
        {
                // Flowing water material
@@ -421,7 +432,9 @@ void content_mapnode_init()
        f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
        f->liquid_alternative_flowing = CONTENT_WATER;
        f->liquid_alternative_source = CONTENT_WATERSOURCE;
+       f->liquid_viscosity = WATER_VISC;
        f->vertex_alpha = WATER_ALPHA;
+       f->post_effect_color = video::SColor(64, 100, 100, 200);
        if(f->special_material == NULL && g_texturesource)
        {
                // Flowing water material
@@ -444,6 +457,7 @@ void content_mapnode_init()
        f->light_propagates = false;
        f->light_source = LIGHT_MAX-1;
        f->solidness = 0; // Drawn separately, makes no faces
+       f->visual_solidness = 2;
        f->walkable = false;
        f->pointable = false;
        f->diggable = false;
@@ -451,7 +465,9 @@ void content_mapnode_init()
        f->liquid_type = LIQUID_FLOWING;
        f->liquid_alternative_flowing = CONTENT_LAVA;
        f->liquid_alternative_source = CONTENT_LAVASOURCE;
+       f->liquid_viscosity = LAVA_VISC;
        f->damage_per_second = 4*2;
+       f->post_effect_color = video::SColor(192, 255, 64, 0);
        if(f->special_material == NULL && g_texturesource)
        {
                // Flowing lava material
@@ -460,7 +476,7 @@ void content_mapnode_init()
                f->special_material->setFlag(video::EMF_BACK_FACE_CULLING, false);
                f->special_material->setFlag(video::EMF_BILINEAR_FILTER, false);
                f->special_material->setFlag(video::EMF_FOG_ENABLE, true);
-               f->special_material->MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
+               f->special_material->MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
                AtlasPointer *pa_lava1 = new AtlasPointer(
                        g_texturesource->getTexture(
                                g_texturesource->getTextureId("lava.png")));
@@ -499,7 +515,9 @@ void content_mapnode_init()
        f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
        f->liquid_alternative_flowing = CONTENT_LAVA;
        f->liquid_alternative_source = CONTENT_LAVASOURCE;
+       f->liquid_viscosity = LAVA_VISC;
        f->damage_per_second = 4*2;
+       f->post_effect_color = video::SColor(192, 255, 64, 0);
        if(f->special_material == NULL && g_texturesource)
        {
                // Flowing lava material
@@ -508,7 +526,7 @@ void content_mapnode_init()
                f->special_material->setFlag(video::EMF_BACK_FACE_CULLING, false);
                f->special_material->setFlag(video::EMF_BILINEAR_FILTER, false);
                f->special_material->setFlag(video::EMF_FOG_ENABLE, true);
-               f->special_material->MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
+               f->special_material->MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
                AtlasPointer *pa_lava1 = new AtlasPointer(
                        g_texturesource->getTexture(
                                g_texturesource->getTextureId("lava.png")));