Add ObjectRef:punch and ObjectRef:right_click to Lua API

[oweals/minetest.git] / src / nodedef.cpp

diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index 0e48c8c07aaa99ba84b6f23ba4ee916e497135ea..bb08871df371890cdf2685d96c59b9bd70254a3c 100644 (file)
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -89,7 +89,6 @@ ContentFeatures::ContentFeatures()
 
 ContentFeatures::~ContentFeatures()
 {
-       delete initial_metadata;
 #ifndef SERVER
        for(u16 j=0; j<CF_SPECIAL_COUNT; j++){
                delete special_materials[j];
@@ -117,6 +116,9 @@ void ContentFeatures::reset()
        used_texturenames.clear();
        /*
                Actual data
+               
+               NOTE: Most of this is always overridden by the default values given
+                     in builtin.lua
        */
        name = "";
        drawtype = NDT_NORMAL;
@@ -138,15 +140,14 @@ void ContentFeatures::reset()
        climbable = false;
        buildable_to = false;
        wall_mounted = false;
-       air_equivalent = false;
        often_contains_mineral = false;
        dug_item = "";
        extra_dug_item = "";
        extra_dug_item_rarity = 2;
-       initial_metadata = NULL;
+       metadata_name = "";
        liquid_type = LIQUID_NONE;
-       liquid_alternative_flowing = CONTENT_IGNORE;
-       liquid_alternative_source = CONTENT_IGNORE;
+       liquid_alternative_flowing = "";
+       liquid_alternative_source = "";
        liquid_viscosity = 0;
        light_source = 0;
        damage_per_second = 0;
@@ -186,20 +187,14 @@ void ContentFeatures::serialize(std::ostream &os)
        writeU8(os, climbable);
        writeU8(os, buildable_to);
        writeU8(os, wall_mounted);
-       writeU8(os, air_equivalent);
        writeU8(os, often_contains_mineral);
        os<<serializeString(dug_item);
        os<<serializeString(extra_dug_item);
        writeS32(os, extra_dug_item_rarity);
-       if(initial_metadata){
-               writeU8(os, true);
-               initial_metadata->serialize(os);
-       } else {
-               writeU8(os, false);
-       }
+       os<<serializeString(metadata_name);
        writeU8(os, liquid_type);
-       writeU16(os, liquid_alternative_flowing);
-       writeU16(os, liquid_alternative_source);
+       os<<serializeString(liquid_alternative_flowing);
+       os<<serializeString(liquid_alternative_source);
        writeU8(os, liquid_viscosity);
        writeU8(os, light_source);
        writeU32(os, damage_per_second);
@@ -243,19 +238,14 @@ void ContentFeatures::deSerialize(std::istream &is, IGameDef *gamedef)
        climbable = readU8(is);
        buildable_to = readU8(is);
        wall_mounted = readU8(is);
-       air_equivalent = readU8(is);
        often_contains_mineral = readU8(is);
        dug_item = deSerializeString(is);
        extra_dug_item = deSerializeString(is);
        extra_dug_item_rarity = readS32(is);
-       if(readU8(is)){
-               initial_metadata = NodeMetadata::deSerialize(is, gamedef);
-       } else {
-               initial_metadata = NULL;
-       }
+       metadata_name = deSerializeString(is);
        liquid_type = (enum LiquidType)readU8(is);
-       liquid_alternative_flowing = readU16(is);
-       liquid_alternative_source = readU16(is);
+       liquid_alternative_flowing = deSerializeString(is);
+       liquid_alternative_source = deSerializeString(is);
        liquid_viscosity = readU8(is);
        light_source = readU8(is);
        damage_per_second = readU32(is);
@@ -339,23 +329,28 @@ public:
                        f.pointable = false;
                        f.diggable = false;
                        f.buildable_to = true;
-                       f.air_equivalent = true;
-                       set(CONTENT_AIR, f);
+                       // Insert directly into containers
+                       content_t c = CONTENT_AIR;
+                       m_content_features[c] = f;
+                       m_name_id_mapping.set(c, f.name);
                }
                // Set CONTENT_IGNORE
                {
                        ContentFeatures f;
                        f.name = "ignore";
                        f.drawtype = NDT_AIRLIKE;
-                       /*f.param_type = CPT_LIGHT;
-                       f.light_propagates = true;
-                       f.sunlight_propagates = true;*/
+                       f.param_type = CPT_NONE;
+                       f.light_propagates = false;
+                       f.sunlight_propagates = false;
                        f.walkable = false;
                        f.pointable = false;
                        f.diggable = false;
-                       f.buildable_to = false;
-                       f.air_equivalent = true;
-                       set(CONTENT_IGNORE, f);
+                       // A way to remove accidental CONTENT_IGNOREs
+                       f.buildable_to = true;
+                       // Insert directly into containers
+                       content_t c = CONTENT_IGNORE;
+                       m_content_features[c] = f;
+                       m_name_id_mapping.set(c, f.name);
                }
        }
        // CONTENT_IGNORE = not found
@@ -424,6 +419,12 @@ public:
                infostream<<"registerNode: registering content id \""<<c
                                <<"\": name=\""<<def.name<<"\""<<std::endl;
                assert(c <= MAX_CONTENT);
+               // Don't allow redefining CONTENT_IGNORE (but allow air)
+               if(def.name == "ignore" || c == CONTENT_IGNORE){
+                       infostream<<"registerNode: WARNING: Ignoring "
+                                       <<"CONTENT_IGNORE redefinition"<<std::endl;
+                       return;
+               }
                // Check that the special contents are not redefined as different id
                // because it would mess up everything
                if((def.name == "ignore" && c != CONTENT_IGNORE) ||
@@ -504,6 +505,7 @@ public:
                                        f->solidness = 1;
                                        if(f->alpha == 255)
                                                f->solidness = 2;
+                                       f->backface_culling = false;
                                }
                                break;
                        case NDT_FLOWINGLIQUID:
@@ -529,8 +531,8 @@ public:
                                        f->drawtype = NDT_NORMAL;
                                        f->solidness = 1;
                                        for(u32 i=0; i<6; i++){
-                                               f->tname_tiles[i] = std::string("[noalpha:")
-                                                               + f->tname_tiles[i];
+                                               f->tname_tiles[i] = f->tname_tiles[i]
+                                                               + std::string("^[noalpha");
                                        }
                                }
                                break;