Fix unit test if there isn't a localhost address (for example FreeBSD jails), second...

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

diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 8471b7e81408eec598b5542b56cb2370786576f1..6d41b27490879ba7cb7f5284d736ff4a51f9675f 100644 (file)
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -945,8 +945,7 @@ void GenericCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
                        m_wield_meshnode = new WieldMeshSceneNode(
                                        smgr->getRootSceneNode(), smgr, -1);
                        m_wield_meshnode->setItem(item, m_gamedef);
-                       m_wield_meshnode->grab();
-                       
+
                        m_wield_meshnode->setScale(v3f(m_prop.visual_size.X/2,
                                        m_prop.visual_size.Y/2,
                                        m_prop.visual_size.X/2));
@@ -975,7 +974,7 @@ void GenericCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
        updateBonePosition();
        updateAttachments();
 }
-               
+
 void GenericCAO::updateLight(u8 light_at_pos)
 {
        u8 li = decode_light(light_at_pos);
@@ -1468,7 +1467,7 @@ void GenericCAO::updateAnimation()
 
 void GenericCAO::updateBonePosition()
 {
-       if(!m_bone_position.size() || m_animated_meshnode == NULL)
+       if(m_bone_position.empty() || m_animated_meshnode == NULL)
                return;
 
        m_animated_meshnode->setJointMode(irr::scene::EJUOR_CONTROL); // To write positions to the mesh on render