MapNode constructor to allow ndef+name

diff --git a/src/mapnode.cpp b/src/mapnode.cpp
index c5756e8ba207871e3ee33aa47415cc6e57b2fdd3..a757149b10612925093837750b52a9a0d43f5599 100644 (file)
--- a/src/mapnode.cpp
+++ b/src/mapnode.cpp
@@ -155,6 +155,20 @@ v3s16 unpackDir(u8 b)
        MapNode
 */
 
+// Create directly from a nodename
+// If name is unknown, sets CONTENT_IGNORE
+MapNode::MapNode(INodeDefManager *ndef, const std::string &name,
+               u8 a_param1, u8 a_param2)
+{
+       content_t id = CONTENT_IGNORE;
+       ndef->getId(name, id);
+       param1 = a_param1;
+       param2 = a_param2;
+       // Set content (param0 and (param2&0xf0)) after other params
+       // because this needs to override part of param2
+       setContent(id);
+}
+
 void MapNode::setLight(enum LightBank bank, u8 a_light, INodeDefManager *nodemgr)
 {
        // If node doesn't contain light data, ignore this

diff --git a/src/mapnode.h b/src/mapnode.h
index 285f197db995bd7a47dac0783b79736808e29d9e..e287ea54fec9f6137489bf34362a83de14115aa2 100644 (file)
--- a/src/mapnode.h
+++ b/src/mapnode.h
@@ -147,6 +147,11 @@ struct MapNode
                // because this needs to override part of param2
                setContent(content);
        }
+       
+       // Create directly from a nodename
+       // If name is unknown, sets CONTENT_IGNORE
+       MapNode(INodeDefManager *ndef, const std::string &name,
+                       u8 a_param1=0, u8 a_param2=0);
 
        bool operator==(const MapNode &other)
        {