Fix bone-attached entities (#10015)

[dragonfireclient.git] / src / content_nodemeta.cpp

diff --git a/src/content_nodemeta.cpp b/src/content_nodemeta.cpp
index f504924f956a39dcc8fe29bbe323496186efcef7..fc2859d27ac0d891a8134c4a04f56925d7094a91 100644 (file)
--- a/src/content_nodemeta.cpp
+++ b/src/content_nodemeta.cpp
@@ -79,7 +79,7 @@ static bool content_nodemeta_deserialize_legacy_body(
                        inv->getList("0")->setName("main");
                }
                assert(inv->getList("main") && !inv->getList("0"));
-               
+
                meta->setString("formspec","size[8,9]"
                                "list[current_name;main;0,0;8,4;]"
                                "list[current_player;main;0,5;8,4;]");
@@ -96,7 +96,7 @@ static bool content_nodemeta_deserialize_legacy_body(
                        inv->getList("0")->setName("main");
                }
                assert(inv->getList("main") && !inv->getList("0"));
-               
+
                meta->setString("formspec","size[8,9]"
                                "list[current_name;main;0,0;8,4;]"
                                "list[current_player;main;0,5;8,4;]");
@@ -145,7 +145,7 @@ static bool content_nodemeta_deserialize_legacy_meta(
 
 void content_nodemeta_deserialize_legacy(std::istream &is,
                NodeMetadataList *meta, NodeTimerList *timers,
-               IGameDef *gamedef)
+               IItemDefManager *item_def_mgr)
 {
        meta->clear();
        timers->clear();
@@ -154,9 +154,9 @@ void content_nodemeta_deserialize_legacy(std::istream &is,
 
        if(version > 1)
        {
-               infostream<<__FUNCTION_NAME<<": version "<<version<<" not supported"
+               infostream<<FUNCTION_NAME<<": version "<<version<<" not supported"
                                <<std::endl;
-               throw SerializationError(__FUNCTION_NAME);
+               throw SerializationError(FUNCTION_NAME);
        }
 
        u16 count = readU16(is);
@@ -174,27 +174,18 @@ void content_nodemeta_deserialize_legacy(std::istream &is,
 
                if(meta->get(p) != NULL)
                {
-                       infostream<<"WARNING: "<<__FUNCTION_NAME<<": "
+                       warningstream<<FUNCTION_NAME<<": "
                                        <<"already set data at position"
                                        <<"("<<p.X<<","<<p.Y<<","<<p.Z<<"): Ignoring."
                                        <<std::endl;
                        continue;
                }
 
-               NodeMetadata *data = new NodeMetadata(gamedef);
+               NodeMetadata *data = new NodeMetadata(item_def_mgr);
                bool need_timer = content_nodemeta_deserialize_legacy_meta(is, data);
                meta->set(p, data);
 
                if(need_timer)
-                       timers->set(p, NodeTimer(1., 0.));
+                       timers->set(NodeTimer(1., 0., p));
        }
 }
-
-void content_nodemeta_serialize_legacy(std::ostream &os, NodeMetadataList *meta)
-{
-       // Sorry, I was too lazy to implement this. --kahrl
-       writeU16(os, 1); // version
-       writeU16(os, 0); // count
-}
-
-// END