diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-10-16 16:28:12 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-10-16 16:28:12 +0300 |
| commit | 0bf533f7534e84a23b5b9c8a5ca45e67c1cc3f00 (patch) | |
| tree | 2d18c159736b7f5f157e79b7ea6cca4af8e71c19 /src/nodemetadata.cpp | |
| parent | 67a6bc4ab5be607c4a9f9a349dee629e864c2d42 (diff) | |
| download | minetest-0bf533f7534e84a23b5b9c8a5ca45e67c1cc3f00.tar.gz minetest-0bf533f7534e84a23b5b9c8a5ca45e67c1cc3f00.tar.bz2 minetest-0bf533f7534e84a23b5b9c8a5ca45e67c1cc3f00.zip | |
Switch more stuff to use the logging thing and fix segfault on player leave from server as introduced in a previous switch-to-logging commit
Diffstat (limited to 'src/nodemetadata.cpp')
| -rw-r--r-- | src/nodemetadata.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/nodemetadata.cpp b/src/nodemetadata.cpp index 3edf6d3c2..6fbfc2dba 100644 --- 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 @@ -55,7 +56,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; } @@ -71,7 +72,7 @@ NodeMetadata* NodeMetadata::deSerialize(std::istream &is) } catch(SerializationError &e) { - dstream<<"WARNING: NodeMetadata: ignoring SerializationError"<<std::endl; + infostream<<"WARNING: NodeMetadata: ignoring SerializationError"<<std::endl; return NULL; } } @@ -138,7 +139,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"); } @@ -165,7 +166,7 @@ void NodeMetadataList::deSerialize(std::istream &is) 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; |