Improve glass

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

diff --git a/src/nodemetadata.cpp b/src/nodemetadata.cpp
index 3edf6d3c28ac58e6fe0ae7ab8eb6ff7c281c9987..ef6ea1cd2062b75ca248c8dd80b90f815edf9657 100644 (file)
--- a/src/nodemetadata.cpp
+++ b/src/nodemetadata.cpp
@@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "inventory.h"
 #include <sstream>
 #include "content_mapnode.h"
+#include "log.h"
 
 /*
        NodeMetadata
@@ -31,7 +32,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 core::map<u16, NodeMetadata::Factory> NodeMetadata::m_types;
 
-NodeMetadata::NodeMetadata()
+NodeMetadata::NodeMetadata(IGameDef *gamedef):
+       m_gamedef(gamedef)
 {
 }
 
@@ -39,7 +41,7 @@ NodeMetadata::~NodeMetadata()
 {
 }
 
-NodeMetadata* NodeMetadata::deSerialize(std::istream &is)
+NodeMetadata* NodeMetadata::deSerialize(std::istream &is, IGameDef *gamedef)
 {
        // Read id
        u8 buf[2];
@@ -55,7 +57,7 @@ NodeMetadata* NodeMetadata::deSerialize(std::istream &is)
        if(n == NULL)
        {
                // If factory is not found, just return.
-               dstream<<"WARNING: NodeMetadata: No factory for typeId="
+               infostream<<"WARNING: NodeMetadata: No factory for typeId="
                                <<id<<std::endl;
                return NULL;
        }
@@ -66,12 +68,12 @@ NodeMetadata* NodeMetadata::deSerialize(std::istream &is)
                std::istringstream iss(data, std::ios_base::binary);
                
                Factory f = n->getValue();
-               NodeMetadata *meta = (*f)(iss);
+               NodeMetadata *meta = (*f)(iss, gamedef);
                return meta;
        }
        catch(SerializationError &e)
        {
-               dstream<<"WARNING: NodeMetadata: ignoring SerializationError"<<std::endl;
+               infostream<<"WARNING: NodeMetadata: ignoring SerializationError"<<std::endl;
                return NULL;
        }
 }
@@ -127,7 +129,7 @@ void NodeMetadataList::serialize(std::ostream &os)
        }
        
 }
-void NodeMetadataList::deSerialize(std::istream &is)
+void NodeMetadataList::deSerialize(std::istream &is, IGameDef *gamedef)
 {
        m_data.clear();
 
@@ -138,7 +140,7 @@ void NodeMetadataList::deSerialize(std::istream &is)
 
        if(version > 1)
        {
-               dstream<<__FUNCTION_NAME<<": version "<<version<<" not supported"
+               infostream<<__FUNCTION_NAME<<": version "<<version<<" not supported"
                                <<std::endl;
                throw SerializationError("NodeMetadataList::deSerialize");
        }
@@ -158,14 +160,14 @@ void NodeMetadataList::deSerialize(std::istream &is)
                p16 -= p.Y * MAP_BLOCKSIZE;
                p.X += p16;
                
-               NodeMetadata *data = NodeMetadata::deSerialize(is);
+               NodeMetadata *data = NodeMetadata::deSerialize(is, gamedef);
 
                if(data == NULL)
                        continue;
                
                if(m_data.find(p))
                {
-                       dstream<<"WARNING: NodeMetadataList::deSerialize(): "
+                       infostream<<"WARNING: NodeMetadataList::deSerialize(): "
                                        <<"already set data at position"
                                        <<"("<<p.X<<","<<p.Y<<","<<p.Z<<"): Ignoring."
                                        <<std::endl;