]> git.lizzy.rs Git - minetest.git/blobdiff - src/content_cao.cpp
Added debug log level setting
[minetest.git] / src / content_cao.cpp
index ba2011a5156ceadaa19e4be156ed4e5ce0fde872..d71911b952e681d2505fa48aa32f9a1bc2dd8be0 100644 (file)
@@ -3,16 +3,16 @@ Minetest-c55
 Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -30,12 +30,21 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "clientobject.h"
 #include "content_object.h"
 #include "mesh.h"
-#include "utility.h" // For IntervalLimiter
 #include "itemdef.h"
 #include "tool.h"
 #include "content_cso.h"
 #include "sound.h"
 #include "nodedef.h"
+#include "localplayer.h"
+#include "util/numeric.h" // For IntervalLimiter
+#include "util/serialize.h"
+#include "util/mathconstants.h"
+#include "map.h"
+#include "main.h" // g_settings
+#include <IMeshManipulator.h>
+#include <IAnimatedMeshSceneNode.h>
+#include <IBoneSceneNode.h>
+
 class Settings;
 struct ToolCapabilities;
 
@@ -463,7 +472,7 @@ void ItemCAO::updateTexture()
                IItemDefManager *idef = m_gamedef->idef();
                ItemStack item;
                item.deSerialize(is, idef);
-               texture = item.getDefinition(idef).inventory_texture;
+               texture = idef->getInventoryTexture(item.getDefinition(idef).name, m_gamedef);
        }
        catch(SerializationError &e)
        {
@@ -546,23 +555,16 @@ class GenericCAO : public ClientActiveObject
        // Only set at initialization
        std::string m_name;
        bool m_is_player;
-       bool m_is_local_player; // determined locally
+       bool m_is_local_player;
+       int m_id;
        // Property-ish things
-       s16 m_hp_max;
-       bool m_physical;
-       float m_weight;
-       core::aabbox3d<f32> m_collisionbox;
-       std::string m_visual;
-       v2f m_visual_size;
-       core::array<std::string> m_textures;
-       v2s16 m_spritediv;
-       bool m_is_visible;
-       bool m_makes_footstep_sound;
+       ObjectProperties m_prop;
        //
        scene::ISceneManager *m_smgr;
        IrrlichtDevice *m_irr;
        core::aabbox3d<f32> m_selection_box;
        scene::IMeshSceneNode *m_meshnode;
+       scene::IAnimatedMeshSceneNode *m_animated_meshnode;
        scene::IBillboardSceneNode *m_spritenode;
        scene::ITextSceneNode* m_textnode;
        v3f m_position;
@@ -574,7 +576,16 @@ class GenericCAO : public ClientActiveObject
        // Spritesheet/animation stuff
        v2f m_tx_size;
        v2s16 m_tx_basepos;
+       bool m_initial_tx_basepos_set;
        bool m_tx_select_horiz_by_yawpitch;
+       v2f m_animation_range;
+       int m_animation_speed;
+       int m_animation_blend;
+       std::map<std::string, core::vector2d<v3f> > m_bone_position; // stores position and rotation for each bone name
+       std::string m_attachment_bone;
+       v3f m_attachment_position;
+       v3f m_attachment_rotation;
+       bool m_attached_to_local;
        int m_anim_frame;
        int m_anim_num_frames;
        float m_anim_framelength;
@@ -583,6 +594,8 @@ class GenericCAO : public ClientActiveObject
        float m_reset_textures_timer;
        bool m_visuals_expired;
        float m_step_distance_counter;
+       u8 m_last_light;
+       bool m_is_visible;
 
 public:
        GenericCAO(IGameDef *gamedef, ClientEnvironment *env):
@@ -590,21 +603,13 @@ class GenericCAO : public ClientActiveObject
                //
                m_is_player(false),
                m_is_local_player(false),
-               //
-               m_hp_max(1),
-               m_physical(false),
-               m_weight(5),
-               m_collisionbox(-0.5,-0.5,-0.5, 0.5,0.5,0.5),
-               m_visual("sprite"),
-               m_visual_size(1,1),
-               m_spritediv(1,1),
-               m_is_visible(true),
-               m_makes_footstep_sound(false),
+               m_id(0),
                //
                m_smgr(NULL),
                m_irr(NULL),
                m_selection_box(-BS/3.,-BS/3.,-BS/3., BS/3.,BS/3.,BS/3.),
                m_meshnode(NULL),
+               m_animated_meshnode(NULL),
                m_spritenode(NULL),
                m_textnode(NULL),
                m_position(v3f(0,10*BS,0)),
@@ -614,16 +619,26 @@ class GenericCAO : public ClientActiveObject
                m_hp(1),
                m_tx_size(1,1),
                m_tx_basepos(0,0),
+               m_initial_tx_basepos_set(false),
                m_tx_select_horiz_by_yawpitch(false),
+               m_animation_range(v2f(0,0)),
+               m_animation_speed(15),
+               m_animation_blend(0),
+               m_bone_position(std::map<std::string, core::vector2d<v3f> >()),
+               m_attachment_bone(""),
+               m_attachment_position(v3f(0,0,0)),
+               m_attachment_rotation(v3f(0,0,0)),
+               m_attached_to_local(false),
                m_anim_frame(0),
                m_anim_num_frames(1),
                m_anim_framelength(0.2),
                m_anim_timer(0),
                m_reset_textures_timer(-1),
                m_visuals_expired(false),
-               m_step_distance_counter(0)
+               m_step_distance_counter(0),
+               m_last_light(255),
+               m_is_visible(false)
        {
-               m_textures.push_back("unknown_object.png");
                if(gamedef == NULL)
                        ClientActiveObject::registerType(getType(), create);
        }
@@ -632,21 +647,36 @@ class GenericCAO : public ClientActiveObject
        {
                infostream<<"GenericCAO: Got init data"<<std::endl;
                std::istringstream is(data, std::ios::binary);
+               int num_messages = 0;
                // version
                u8 version = readU8(is);
                // check version
-               if(version != 0){
+               if(version == 1) // In PROTOCOL_VERSION 14
+               {
+                       m_name = deSerializeString(is);
+                       m_is_player = readU8(is);
+                       m_id = readS16(is);
+                       m_position = readV3F1000(is);
+                       m_yaw = readF1000(is);
+                       m_hp = readS16(is);
+                       num_messages = readU8(is);
+               }
+               else if(version == 0) // In PROTOCOL_VERSION 13
+               {
+                       m_name = deSerializeString(is);
+                       m_is_player = readU8(is);
+                       m_position = readV3F1000(is);
+                       m_yaw = readF1000(is);
+                       m_hp = readS16(is);
+                       num_messages = readU8(is);
+               }
+               else
+               {
                        errorstream<<"GenericCAO: Unsupported init data version"
                                        <<std::endl;
                        return;
                }
-               m_name = deSerializeString(is);
-               m_is_player = readU8(is);
-               m_position = readV3F1000(is);
-               m_yaw = readF1000(is);
-               m_hp = readS16(is);
-               
-               int num_messages = readU8(is);
+
                for(int i=0; i<num_messages; i++){
                        std::string message = deSerializeLongString(is);
                        processMessage(message);
@@ -678,21 +708,113 @@ class GenericCAO : public ClientActiveObject
        }
        core::aabbox3d<f32>* getSelectionBox()
        {
-               if(!m_is_visible || m_is_local_player)
+               if(!m_prop.is_visible || !m_is_visible || m_is_local_player || getParent() != NULL)
                        return NULL;
                return &m_selection_box;
        }
        v3f getPosition()
        {
+               if(getParent() != NULL){
+                       if(m_meshnode)
+                               return m_meshnode->getAbsolutePosition();
+                       if(m_animated_meshnode)
+                               return m_animated_meshnode->getAbsolutePosition();
+                       if(m_spritenode)
+                               return m_spritenode->getAbsolutePosition();
+                       return m_position;
+               }
                return pos_translator.vect_show;
        }
 
-       void removeFromScene()
+       scene::IMeshSceneNode *getMeshSceneNode()
+       {
+               if(m_meshnode)
+                       return m_meshnode;
+               return NULL;
+       }
+
+       scene::IAnimatedMeshSceneNode *getAnimatedMeshSceneNode()
+       {
+               if(m_animated_meshnode)
+                       return m_animated_meshnode;
+               return NULL;
+       }
+
+       scene::IBillboardSceneNode *getSpriteSceneNode()
+       {
+               if(m_spritenode)
+                       return m_spritenode;
+               return NULL;
+       }
+
+       bool isPlayer()
+       {
+               return m_is_player;
+       }
+
+       bool isLocalPlayer()
+       {
+               return m_is_local_player;
+       }
+
+       void setAttachments()
+       {
+               updateAttachments();
+       }
+
+       ClientActiveObject *getParent()
+       {
+               ClientActiveObject *obj = NULL;
+               for(std::vector<core::vector2d<int> >::const_iterator cii = m_env->attachment_list.begin(); cii != m_env->attachment_list.end(); cii++)
+               {
+                       if(cii->X == getId()){ // This ID is our child
+                               if(cii->Y > 0){ // A parent ID exists for our child
+                                       if(cii->X != cii->Y){ // The parent and child ID are not the same
+                                               obj = m_env->getActiveObject(cii->Y);
+                                       }
+                               }
+                               break;
+                       }
+               }
+               if(obj)
+                       return obj;
+               return NULL;
+       }
+
+       void removeFromScene(bool permanent)
        {
+               if(permanent) // Should be true when removing the object permanently and false when refreshing (eg: updating visuals)
+               {
+                       // Detach this object's children
+                       for(std::vector<core::vector2d<int> >::iterator ii = m_env->attachment_list.begin(); ii != m_env->attachment_list.end(); ii++)
+                       {
+                               if(ii->Y == getId()) // Is a child of our object
+                               {
+                                       ii->Y = 0;
+                                       ClientActiveObject *obj = m_env->getActiveObject(ii->X); // Get the object of the child
+                                       if(obj)
+                                               obj->setAttachments();
+                               }
+                       }
+                       // Delete this object from the attachments list
+                       for(std::vector<core::vector2d<int> >::iterator ii = m_env->attachment_list.begin(); ii != m_env->attachment_list.end(); ii++)
+                       {
+                               if(ii->X == getId()) // Is our object
+                               {
+                                       m_env->attachment_list.erase(ii);
+                                       break;
+                               }
+                       }
+               }
+
                if(m_meshnode){
                        m_meshnode->remove();
                        m_meshnode = NULL;
                }
+               if(m_animated_meshnode){
+                       m_animated_meshnode->remove();
+                       m_animated_meshnode = NULL;
+               }
                if(m_spritenode){
                        m_spritenode->remove();
                        m_spritenode = NULL;
@@ -705,17 +827,17 @@ class GenericCAO : public ClientActiveObject
                m_smgr = smgr;
                m_irr = irr;
 
-               if(m_meshnode != NULL || m_spritenode != NULL)
+               if(m_meshnode != NULL || m_animated_meshnode != NULL || m_spritenode != NULL)
                        return;
                
                m_visuals_expired = false;
 
-               if(!m_is_visible || m_is_local_player)
+               if(!m_prop.is_visible || m_is_local_player)
                        return;
        
                //video::IVideoDriver* driver = smgr->getVideoDriver();
 
-               if(m_visual == "sprite"){
+               if(m_prop.visual == "sprite"){
                        infostream<<"GenericCAO::addToScene(): single_sprite"<<std::endl;
                        m_spritenode = smgr->addBillboardSceneNode(
                                        NULL, v2f(1, 1), v3f(0,0,0), -1);
@@ -725,9 +847,9 @@ class GenericCAO : public ClientActiveObject
                        m_spritenode->setMaterialFlag(video::EMF_BILINEAR_FILTER, false);
                        m_spritenode->setMaterialType(video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF);
                        m_spritenode->setMaterialFlag(video::EMF_FOG_ENABLE, true);
-                       m_spritenode->setColor(video::SColor(255,0,0,0));
-                       m_spritenode->setVisible(false); /* Set visible when brightness is known */
-                       m_spritenode->setSize(m_visual_size*BS);
+                       u8 li = m_last_light;
+                       m_spritenode->setColor(video::SColor(255,li,li,li));
+                       m_spritenode->setSize(m_prop.visual_size*BS);
                        {
                                const float txs = 1.0 / 1;
                                const float tys = 1.0 / 1;
@@ -735,14 +857,15 @@ class GenericCAO : public ClientActiveObject
                                                txs, tys, 0, 0);
                        }
                }
-               else if(m_visual == "upright_sprite")
+               else if(m_prop.visual == "upright_sprite")
                {
                        scene::SMesh *mesh = new scene::SMesh();
-                       double dx = BS*m_visual_size.X/2;
-                       double dy = BS*m_visual_size.Y/2;
+                       double dx = BS*m_prop.visual_size.X/2;
+                       double dy = BS*m_prop.visual_size.Y/2;
                        { // Front
                        scene::IMeshBuffer *buf = new scene::SMeshBuffer();
-                       video::SColor c(255,255,255,255);
+                       u8 li = m_last_light;
+                       video::SColor c(255,li,li,li);
                        video::S3DVertex vertices[4] =
                        {
                                video::S3DVertex(-dx,-dy,0, 0,0,0, c, 0,1),
@@ -763,7 +886,8 @@ class GenericCAO : public ClientActiveObject
                        }
                        { // Back
                        scene::IMeshBuffer *buf = new scene::SMeshBuffer();
-                       video::SColor c(255,255,255,255);
+                       u8 li = m_last_light;
+                       video::SColor c(255,li,li,li);
                        video::S3DVertex vertices[4] =
                        {
                                video::S3DVertex(dx,-dy,0, 0,0,0, c, 1,1),
@@ -788,17 +912,69 @@ class GenericCAO : public ClientActiveObject
                        // This is needed for changing the texture in the future
                        m_meshnode->setReadOnlyMaterials(true);
                }
-               else if(m_visual == "cube"){
+               else if(m_prop.visual == "cube"){
                        infostream<<"GenericCAO::addToScene(): cube"<<std::endl;
                        scene::IMesh *mesh = createCubeMesh(v3f(BS,BS,BS));
                        m_meshnode = smgr->addMeshSceneNode(mesh, NULL);
                        mesh->drop();
                        
-                       m_meshnode->setScale(v3f(1));
-                       // Will be shown when we know the brightness
-                       m_meshnode->setVisible(false);
+                       m_meshnode->setScale(v3f(m_prop.visual_size.X,
+                                       m_prop.visual_size.Y,
+                                       m_prop.visual_size.X));
+                       u8 li = m_last_light;
+                       setMeshColor(m_meshnode->getMesh(), video::SColor(255,li,li,li));
+
+                       m_meshnode->setMaterialFlag(video::EMF_LIGHTING, false);
+                       m_meshnode->setMaterialFlag(video::EMF_BILINEAR_FILTER, false);
+                       m_meshnode->setMaterialType(video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF);
+                       m_meshnode->setMaterialFlag(video::EMF_FOG_ENABLE, true);
+               }
+               else if(m_prop.visual == "mesh"){
+                       infostream<<"GenericCAO::addToScene(): mesh"<<std::endl;
+                       scene::IAnimatedMesh *mesh = smgr->getMesh(m_prop.mesh.c_str());
+                       if(mesh)
+                       {
+                               m_animated_meshnode = smgr->addAnimatedMeshSceneNode(mesh, NULL);
+                               m_animated_meshnode->animateJoints(); // Needed for some animations
+                               m_animated_meshnode->setScale(v3f(m_prop.visual_size.X,
+                                               m_prop.visual_size.Y,
+                                               m_prop.visual_size.X));
+                               u8 li = m_last_light;
+                               setMeshColor(m_animated_meshnode->getMesh(), video::SColor(255,li,li,li));
+
+                               m_animated_meshnode->setMaterialFlag(video::EMF_LIGHTING, false);
+                               m_animated_meshnode->setMaterialFlag(video::EMF_BILINEAR_FILTER, false);
+                               m_animated_meshnode->setMaterialType(video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF);
+                               m_animated_meshnode->setMaterialFlag(video::EMF_FOG_ENABLE, true);
+                       }
+                       else
+                               errorstream<<"GenericCAO::addToScene(): Could not load mesh "<<m_prop.mesh<<std::endl;
+               }
+               else if(m_prop.visual == "wielditem"){
+                       infostream<<"GenericCAO::addToScene(): node"<<std::endl;
+                       infostream<<"textures: "<<m_prop.textures.size()<<std::endl;
+                       if(m_prop.textures.size() >= 1){
+                               infostream<<"textures[0]: "<<m_prop.textures[0]<<std::endl;
+                               IItemDefManager *idef = m_gamedef->idef();
+                               ItemStack item(m_prop.textures[0], 1, 0, "", idef);
+                               scene::IMesh *item_mesh = idef->getWieldMesh(item.getDefinition(idef).name, m_gamedef);
+                               
+                               // Copy mesh to be able to set unique vertex colors
+                               scene::IMeshManipulator *manip =
+                                               irr->getVideoDriver()->getMeshManipulator();
+                               scene::IMesh *mesh = manip->createMeshUniquePrimitives(item_mesh);
+
+                               m_meshnode = smgr->addMeshSceneNode(mesh, NULL);
+                               mesh->drop();
+                               
+                               m_meshnode->setScale(v3f(m_prop.visual_size.X/2,
+                                               m_prop.visual_size.Y/2,
+                                               m_prop.visual_size.X/2));
+                               u8 li = m_last_light;
+                               setMeshColor(m_meshnode->getMesh(), video::SColor(255,li,li,li));
+                       }
                } else {
-                       infostream<<"GenericCAO::addToScene(): \""<<m_visual
+                       infostream<<"GenericCAO::addToScene(): \""<<m_prop.visual
                                        <<"\" not supported"<<std::endl;
                }
                updateTextures("");
@@ -806,6 +982,8 @@ class GenericCAO : public ClientActiveObject
                scene::ISceneNode *node = NULL;
                if(m_spritenode)
                        node = m_spritenode;
+               else if(m_animated_meshnode)
+                       node = m_animated_meshnode;
                else if(m_meshnode)
                        node = m_meshnode;
                if(node && m_is_player && !m_is_local_player){
@@ -816,8 +994,11 @@ class GenericCAO : public ClientActiveObject
                                        wname.c_str(), video::SColor(255,255,255,255), node);
                        m_textnode->setPosition(v3f(0, BS*1.1, 0));
                }
-               
+
                updateNodePos();
+               updateAnimation();
+               updateBonePosition();
+               updateAttachments();
        }
 
        void expireVisuals()
@@ -827,16 +1008,16 @@ class GenericCAO : public ClientActiveObject
                
        void updateLight(u8 light_at_pos)
        {
-               bool is_visible = (m_hp != 0);
                u8 li = decode_light(light_at_pos);
-               video::SColor color(255,li,li,li);
-               if(m_meshnode){
-                       setMeshColor(m_meshnode->getMesh(), color);
-                       m_meshnode->setVisible(is_visible);
-               }
-               if(m_spritenode){
-                       m_spritenode->setColor(color);
-                       m_spritenode->setVisible(is_visible);
+               if(li != m_last_light){
+                       m_last_light = li;
+                       video::SColor color(255,li,li,li);
+                       if(m_meshnode)
+                               setMeshColor(m_meshnode->getMesh(), color);
+                       if(m_animated_meshnode)
+                               setMeshColor(m_animated_meshnode->getMesh(), color);
+                       if(m_spritenode)
+                               m_spritenode->setColor(color);
                }
        }
 
@@ -847,12 +1028,21 @@ class GenericCAO : public ClientActiveObject
 
        void updateNodePos()
        {
+               if(getParent() != NULL)
+                       return;
+
                if(m_meshnode){
                        m_meshnode->setPosition(pos_translator.vect_show);
                        v3f rot = m_meshnode->getRotation();
                        rot.Y = -m_yaw;
                        m_meshnode->setRotation(rot);
                }
+               if(m_animated_meshnode){
+                       m_animated_meshnode->setPosition(pos_translator.vect_show);
+                       v3f rot = m_animated_meshnode->getRotation();
+                       rot.Y = -m_yaw;
+                       m_animated_meshnode->setRotation(rot);
+               }
                if(m_spritenode){
                        m_spritenode->setPosition(pos_translator.vect_show);
                }
@@ -860,53 +1050,116 @@ class GenericCAO : public ClientActiveObject
 
        void step(float dtime, ClientEnvironment *env)
        {
-               v3f lastpos = pos_translator.vect_show;
-
                if(m_visuals_expired && m_smgr && m_irr){
                        m_visuals_expired = false;
-                       removeFromScene();
+
+                       // Attachments, part 1: All attached objects must be unparented first, or Irrlicht causes a segmentation fault
+                       for(std::vector<core::vector2d<int> >::iterator ii = m_env->attachment_list.begin(); ii != m_env->attachment_list.end(); ii++)
+                       {
+                               if(ii->Y == getId()) // This is a child of our parent
+                               {
+                                       ClientActiveObject *obj = m_env->getActiveObject(ii->X); // Get the object of the child
+                                       if(obj)
+                                       {
+                                               scene::IMeshSceneNode *m_child_meshnode = obj->getMeshSceneNode();
+                                               scene::IAnimatedMeshSceneNode *m_child_animated_meshnode = obj->getAnimatedMeshSceneNode();
+                                               scene::IBillboardSceneNode *m_child_spritenode = obj->getSpriteSceneNode();
+                                               if(m_child_meshnode)
+                                                       m_child_meshnode->setParent(m_smgr->getRootSceneNode());
+                                               if(m_child_animated_meshnode)
+                                                       m_child_animated_meshnode->setParent(m_smgr->getRootSceneNode());
+                                               if(m_child_spritenode)
+                                                       m_child_spritenode->setParent(m_smgr->getRootSceneNode());
+                                       }
+                               }
+                       }
+
+                       removeFromScene(false);
                        addToScene(m_smgr, m_gamedef->tsrc(), m_irr);
+
+                       // Attachments, part 2: Now that the parent has been refreshed, put its attachments back
+                       for(std::vector<core::vector2d<int> >::iterator ii = m_env->attachment_list.begin(); ii != m_env->attachment_list.end(); ii++)
+                       {
+                               if(ii->Y == getId()) // This is a child of our parent
+                               {
+                                       ClientActiveObject *obj = m_env->getActiveObject(ii->X); // Get the object of the child
+                                       if(obj)
+                                               obj->setAttachments();
+                               }
+                       }
                }
 
-               if(m_physical){
-                       core::aabbox3d<f32> box = m_collisionbox;
-                       box.MinEdge *= BS;
-                       box.MaxEdge *= BS;
-                       collisionMoveResult moveresult;
-                       f32 pos_max_d = BS*0.25; // Distance per iteration
-                       v3f p_pos = m_position;
-                       v3f p_velocity = m_velocity;
-                       IGameDef *gamedef = env->getGameDef();
-                       moveresult = collisionMovePrecise(&env->getMap(), gamedef,
-                                       pos_max_d, box, dtime, p_pos, p_velocity);
-                       // Apply results
-                       m_position = p_pos;
-                       m_velocity = p_velocity;
-                       
-                       bool is_end_position = moveresult.collides;
-                       pos_translator.update(m_position, is_end_position, dtime);
-                       pos_translator.translate(dtime);
-                       updateNodePos();
+               // Make sure m_is_visible is always applied
+               if(m_meshnode)
+                       m_meshnode->setVisible(m_is_visible);
+               if(m_animated_meshnode)
+                       m_animated_meshnode->setVisible(m_is_visible);
+               if(m_spritenode)
+                       m_spritenode->setVisible(m_is_visible);
+               if(m_textnode)
+                       m_textnode->setVisible(m_is_visible);
 
-                       m_velocity += dtime * m_acceleration;
-               } else {
-                       m_position += dtime * m_velocity + 0.5 * dtime * dtime * m_acceleration;
-                       m_velocity += dtime * m_acceleration;
-                       pos_translator.update(m_position, pos_translator.aim_is_end, pos_translator.anim_time);
-                       pos_translator.translate(dtime);
-                       updateNodePos();
+               if(getParent() != NULL) // Attachments should be glued to their parent by Irrlicht
+               {
+                       // Set these for later
+                       m_position = getPosition();
+                       m_velocity = v3f(0,0,0);
+                       m_acceleration = v3f(0,0,0);
+                       pos_translator.vect_show = m_position;
+
+                       if(m_is_local_player) // Update local player attachment position
+                       {
+                               LocalPlayer *player = m_env->getLocalPlayer();
+                               player->overridePosition = getParent()->getPosition();
+                       }
                }
+               else
+               {
+                       v3f lastpos = pos_translator.vect_show;
+
+                       if(m_prop.physical){
+                               core::aabbox3d<f32> box = m_prop.collisionbox;
+                               box.MinEdge *= BS;
+                               box.MaxEdge *= BS;
+                               collisionMoveResult moveresult;
+                               f32 pos_max_d = BS*0.125; // Distance per iteration
+                               f32 stepheight = 0;
+                               v3f p_pos = m_position;
+                               v3f p_velocity = m_velocity;
+                               v3f p_acceleration = m_acceleration;
+                               IGameDef *gamedef = env->getGameDef();
+                               moveresult = collisionMoveSimple(&env->getMap(), gamedef,
+                                               pos_max_d, box, stepheight, dtime,
+                                               p_pos, p_velocity, p_acceleration);
+                               // Apply results
+                               m_position = p_pos;
+                               m_velocity = p_velocity;
+                               m_acceleration = p_acceleration;
+                               
+                               bool is_end_position = moveresult.collides;
+                               pos_translator.update(m_position, is_end_position, dtime);
+                               pos_translator.translate(dtime);
+                               updateNodePos();
+                       } else {
+                               m_position += dtime * m_velocity + 0.5 * dtime * dtime * m_acceleration;
+                               m_velocity += dtime * m_acceleration;
+                               pos_translator.update(m_position, pos_translator.aim_is_end, pos_translator.anim_time);
+                               pos_translator.translate(dtime);
+                               updateNodePos();
+                       }
 
-               float moved = lastpos.getDistanceFrom(pos_translator.vect_show);
-               m_step_distance_counter += moved;
-               if(m_step_distance_counter > 1.5*BS){
-                       m_step_distance_counter = 0;
-                       if(!m_is_local_player && m_makes_footstep_sound){
-                               INodeDefManager *ndef = m_gamedef->ndef();
-                               v3s16 p = floatToInt(getPosition()+v3f(0,-0.5*BS, 0), BS);
-                               MapNode n = m_env->getMap().getNodeNoEx(p);
-                               SimpleSoundSpec spec = ndef->get(n).sound_footstep;
-                               m_gamedef->sound()->playSoundAt(spec, false, getPosition());
+                       float moved = lastpos.getDistanceFrom(pos_translator.vect_show);
+                       m_step_distance_counter += moved;
+                       if(m_step_distance_counter > 1.5*BS){
+                               m_step_distance_counter = 0;
+                               if(!m_is_local_player && m_prop.makes_footstep_sound){
+                                       INodeDefManager *ndef = m_gamedef->ndef();
+                                       v3s16 p = floatToInt(getPosition() + v3f(0,
+                                                       (m_prop.collisionbox.MinEdge.Y-0.5)*BS, 0), BS);
+                                       MapNode n = m_env->getMap().getNodeNoEx(p);
+                                       SimpleSoundSpec spec = ndef->get(n).sound_footstep;
+                                       m_gamedef->sound()->playSoundAt(spec, false, getPosition());
+                               }
                        }
                }
 
@@ -927,6 +1180,10 @@ class GenericCAO : public ClientActiveObject
                                updateTextures("");
                        }
                }
+               if(getParent() == NULL && fabs(m_prop.automatic_rotate) > 0.001){
+                       m_yaw += dtime * m_prop.automatic_rotate * 180 / M_PI;
+                       updateNodePos();
+               }
        }
 
        void updateTexturePos()
@@ -950,7 +1207,7 @@ class GenericCAO : public ClientActiveObject
                                else if(cam_to_entity.Y < -0.75)
                                        col += 4;
                                else{
-                                       float mob_dir = atan2(cam_to_entity.Z, cam_to_entity.X) / PI * 180.;
+                                       float mob_dir = atan2(cam_to_entity.Z, cam_to_entity.X) / M_PI * 180.;
                                        float dir = mob_dir - m_yaw;
                                        dir = wrapDegrees_180(dir);
                                        //infostream<<"id="<<m_id<<" dir="<<dir<<std::endl;
@@ -981,27 +1238,83 @@ class GenericCAO : public ClientActiveObject
        {
                ITextureSource *tsrc = m_gamedef->tsrc();
 
+               bool use_trilinear_filter = g_settings->getBool("trilinear_filter");
+               bool use_bilinear_filter = g_settings->getBool("bilinear_filter");
+               bool use_anisotropic_filter = g_settings->getBool("anisotropic_filter");
+
                if(m_spritenode)
                {
-                       if(m_visual == "sprite")
+                       if(m_prop.visual == "sprite")
                        {
                                std::string texturestring = "unknown_block.png";
-                               if(m_textures.size() >= 1)
-                                       texturestring = m_textures[0];
+                               if(m_prop.textures.size() >= 1)
+                                       texturestring = m_prop.textures[0];
                                texturestring += mod;
                                m_spritenode->setMaterialTexture(0,
                                                tsrc->getTextureRaw(texturestring));
+
+                               // This allows setting per-material colors. However, until a real lighting
+                               // system is added, the code below will have no effect. Once MineTest
+                               // has directional lighting, it should work automatically.
+                               if(m_prop.colors.size() >= 1)
+                               {
+                                       m_spritenode->getMaterial(0).AmbientColor = m_prop.colors[0];
+                                       m_spritenode->getMaterial(0).DiffuseColor = m_prop.colors[0];
+                                       m_spritenode->getMaterial(0).SpecularColor = m_prop.colors[0];
+                               }
+
+                               m_spritenode->getMaterial(0).setFlag(video::EMF_TRILINEAR_FILTER, use_trilinear_filter);
+                               m_spritenode->getMaterial(0).setFlag(video::EMF_BILINEAR_FILTER, use_bilinear_filter);
+                               m_spritenode->getMaterial(0).setFlag(video::EMF_ANISOTROPIC_FILTER, use_anisotropic_filter);
+                       }
+               }
+               if(m_animated_meshnode)
+               {
+                       if(m_prop.visual == "mesh")
+                       {
+                               for (u32 i = 0; i < m_prop.textures.size() && i < m_animated_meshnode->getMaterialCount(); ++i)
+                               {
+                                       std::string texturestring = m_prop.textures[i];
+                                       if(texturestring == "")
+                                               continue; // Empty texture string means don't modify that material
+                                       texturestring += mod;
+                                       video::ITexture* texture = tsrc->getTextureRaw(texturestring);
+                                       if(!texture)
+                                       {
+                                               errorstream<<"GenericCAO::updateTextures(): Could not load texture "<<texturestring<<std::endl;
+                                               continue;
+                                       }
+
+                                       // Set material flags and texture
+                                       m_animated_meshnode->setMaterialTexture(i, texture);
+                                       video::SMaterial& material = m_animated_meshnode->getMaterial(i);
+                                       material.setFlag(video::EMF_LIGHTING, false);
+                                       material.setFlag(video::EMF_BILINEAR_FILTER, false);
+
+                                       m_animated_meshnode->getMaterial(i).setFlag(video::EMF_TRILINEAR_FILTER, use_trilinear_filter);
+                                       m_animated_meshnode->getMaterial(i).setFlag(video::EMF_BILINEAR_FILTER, use_bilinear_filter);
+                                       m_animated_meshnode->getMaterial(i).setFlag(video::EMF_ANISOTROPIC_FILTER, use_anisotropic_filter);
+                               }
+                               for (u32 i = 0; i < m_prop.colors.size() && i < m_animated_meshnode->getMaterialCount(); ++i)
+                               {
+                                       // This allows setting per-material colors. However, until a real lighting
+                                       // system is added, the code below will have no effect. Once MineTest
+                                       // has directional lighting, it should work automatically.
+                                       m_animated_meshnode->getMaterial(i).AmbientColor = m_prop.colors[i];
+                                       m_animated_meshnode->getMaterial(i).DiffuseColor = m_prop.colors[i];
+                                       m_animated_meshnode->getMaterial(i).SpecularColor = m_prop.colors[i];
+                               }
                        }
                }
                if(m_meshnode)
                {
-                       if(m_visual == "cube")
+                       if(m_prop.visual == "cube")
                        {
                                for (u32 i = 0; i < 6; ++i)
                                {
                                        std::string texturestring = "unknown_block.png";
-                                       if(m_textures.size() > i)
-                                               texturestring = m_textures[i];
+                                       if(m_prop.textures.size() > i)
+                                               texturestring = m_prop.textures[i];
                                        texturestring += mod;
                                        AtlasPointer ap = tsrc->getTexture(texturestring);
 
@@ -1017,31 +1330,261 @@ class GenericCAO : public ClientActiveObject
                                        material.setTexture(0, atlas);
                                        material.getTextureMatrix(0).setTextureTranslate(pos.X, pos.Y);
                                        material.getTextureMatrix(0).setTextureScale(size.X, size.Y);
+
+                                       // This allows setting per-material colors. However, until a real lighting
+                                       // system is added, the code below will have no effect. Once MineTest
+                                       // has directional lighting, it should work automatically.
+                                       if(m_prop.colors.size() > i)
+                                       {
+                                               m_meshnode->getMaterial(i).AmbientColor = m_prop.colors[i];
+                                               m_meshnode->getMaterial(i).DiffuseColor = m_prop.colors[i];
+                                               m_meshnode->getMaterial(i).SpecularColor = m_prop.colors[i];
+                                       }
+
+                                       m_meshnode->getMaterial(i).setFlag(video::EMF_TRILINEAR_FILTER, use_trilinear_filter);
+                                       m_meshnode->getMaterial(i).setFlag(video::EMF_BILINEAR_FILTER, use_bilinear_filter);
+                                       m_meshnode->getMaterial(i).setFlag(video::EMF_ANISOTROPIC_FILTER, use_anisotropic_filter);
                                }
                        }
-                       else if(m_visual == "upright_sprite")
+                       else if(m_prop.visual == "upright_sprite")
                        {
                                scene::IMesh *mesh = m_meshnode->getMesh();
                                {
                                        std::string tname = "unknown_object.png";
-                                       if(m_textures.size() >= 1)
-                                               tname = m_textures[0];
+                                       if(m_prop.textures.size() >= 1)
+                                               tname = m_prop.textures[0];
                                        tname += mod;
                                        scene::IMeshBuffer *buf = mesh->getMeshBuffer(0);
                                        buf->getMaterial().setTexture(0,
                                                        tsrc->getTextureRaw(tname));
+                                       
+                                       // This allows setting per-material colors. However, until a real lighting
+                                       // system is added, the code below will have no effect. Once MineTest
+                                       // has directional lighting, it should work automatically.
+                                       if(m_prop.colors.size() >= 1)
+                                       {
+                                               buf->getMaterial().AmbientColor = m_prop.colors[0];
+                                               buf->getMaterial().DiffuseColor = m_prop.colors[0];
+                                               buf->getMaterial().SpecularColor = m_prop.colors[0];
+                                       }
+
+                                       buf->getMaterial().setFlag(video::EMF_TRILINEAR_FILTER, use_trilinear_filter);
+                                       buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, use_bilinear_filter);
+                                       buf->getMaterial().setFlag(video::EMF_ANISOTROPIC_FILTER, use_anisotropic_filter);
                                }
                                {
                                        std::string tname = "unknown_object.png";
-                                       if(m_textures.size() >= 2)
-                                               tname = m_textures[1];
-                                       else if(m_textures.size() >= 1)
-                                               tname = m_textures[0];
+                                       if(m_prop.textures.size() >= 2)
+                                               tname = m_prop.textures[1];
+                                       else if(m_prop.textures.size() >= 1)
+                                               tname = m_prop.textures[0];
                                        tname += mod;
                                        scene::IMeshBuffer *buf = mesh->getMeshBuffer(1);
                                        buf->getMaterial().setTexture(0,
                                                        tsrc->getTextureRaw(tname));
+
+                                       // This allows setting per-material colors. However, until a real lighting
+                                       // system is added, the code below will have no effect. Once MineTest
+                                       // has directional lighting, it should work automatically.
+                                       if(m_prop.colors.size() >= 2)
+                                       {
+                                               buf->getMaterial().AmbientColor = m_prop.colors[1];
+                                               buf->getMaterial().DiffuseColor = m_prop.colors[1];
+                                               buf->getMaterial().SpecularColor = m_prop.colors[1];
+                                       }
+                                       else if(m_prop.colors.size() >= 1)
+                                       {
+                                               buf->getMaterial().AmbientColor = m_prop.colors[0];
+                                               buf->getMaterial().DiffuseColor = m_prop.colors[0];
+                                               buf->getMaterial().SpecularColor = m_prop.colors[0];
+                                       }
+
+                                       buf->getMaterial().setFlag(video::EMF_TRILINEAR_FILTER, use_trilinear_filter);
+                                       buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, use_bilinear_filter);
+                                       buf->getMaterial().setFlag(video::EMF_ANISOTROPIC_FILTER, use_anisotropic_filter);
+                               }
+                       }
+               }
+       }
+
+       void updateAnimation()
+       {
+               if(m_animated_meshnode == NULL)
+                       return;
+
+               m_animated_meshnode->setFrameLoop((int)m_animation_range.X, (int)m_animation_range.Y);
+               m_animated_meshnode->setAnimationSpeed(m_animation_speed);
+               m_animated_meshnode->setTransitionTime(m_animation_blend);
+       }
+
+       void updateBonePosition()
+       {
+               if(!m_bone_position.size() || m_animated_meshnode == NULL)
+                       return;
+
+               m_animated_meshnode->setJointMode(irr::scene::EJUOR_CONTROL); // To write positions to the mesh on render
+               for(std::map<std::string, core::vector2d<v3f> >::const_iterator ii = m_bone_position.begin(); ii != m_bone_position.end(); ++ii){
+                       std::string bone_name = (*ii).first;
+                       v3f bone_pos = (*ii).second.X;
+                       v3f bone_rot = (*ii).second.Y;
+                       irr::scene::IBoneSceneNode* bone = m_animated_meshnode->getJointNode(bone_name.c_str());
+                       if(bone)
+                       {
+                               bone->setPosition(bone_pos);
+                               bone->setRotation(bone_rot);
+                       }
+               }
+       }
+       
+       void updateAttachments()
+       {
+               m_attached_to_local = getParent() != NULL && getParent()->isLocalPlayer();
+               m_is_visible = !m_attached_to_local; // Objects attached to the local player should always be hidden
+
+               if(getParent() == NULL || m_attached_to_local) // Detach or don't attach
+               {
+                       if(m_meshnode)
+                       {
+                               v3f old_position = m_meshnode->getAbsolutePosition();
+                               v3f old_rotation = m_meshnode->getRotation();
+                               m_meshnode->setParent(m_smgr->getRootSceneNode());
+                               m_meshnode->setPosition(old_position);
+                               m_meshnode->setRotation(old_rotation);
+                               m_meshnode->updateAbsolutePosition();
+                       }
+                       if(m_animated_meshnode)
+                       {
+                               v3f old_position = m_animated_meshnode->getAbsolutePosition();
+                               v3f old_rotation = m_animated_meshnode->getRotation();
+                               m_animated_meshnode->setParent(m_smgr->getRootSceneNode());
+                               m_animated_meshnode->setPosition(old_position);
+                               m_animated_meshnode->setRotation(old_rotation);
+                               m_animated_meshnode->updateAbsolutePosition();
+                       }
+                       if(m_spritenode)
+                       {
+                               v3f old_position = m_spritenode->getAbsolutePosition();
+                               v3f old_rotation = m_spritenode->getRotation();
+                               m_spritenode->setParent(m_smgr->getRootSceneNode());
+                               m_spritenode->setPosition(old_position);
+                               m_spritenode->setRotation(old_rotation);
+                               m_spritenode->updateAbsolutePosition();
+                       }
+                       if(m_is_local_player)
+                       {
+                               LocalPlayer *player = m_env->getLocalPlayer();
+                               player->isAttached = false;
+                       }
+               }
+               else // Attach
+               {
+                       scene::IMeshSceneNode *parent_mesh = NULL;
+                       if(getParent()->getMeshSceneNode())
+                               parent_mesh = getParent()->getMeshSceneNode();
+                       scene::IAnimatedMeshSceneNode *parent_animated_mesh = NULL;
+                       if(getParent()->getAnimatedMeshSceneNode())
+                               parent_animated_mesh = getParent()->getAnimatedMeshSceneNode();
+                       scene::IBillboardSceneNode *parent_sprite = NULL;
+                       if(getParent()->getSpriteSceneNode())
+                               parent_sprite = getParent()->getSpriteSceneNode();
+
+                       scene::IBoneSceneNode *parent_bone = NULL;
+                       if(parent_animated_mesh && m_attachment_bone != "")
+                               parent_bone = parent_animated_mesh->getJointNode(m_attachment_bone.c_str());
+
+                       // The spaghetti code below makes sure attaching works if either the parent or child is a spritenode, meshnode, or animatedmeshnode
+                       // TODO: Perhaps use polymorphism here to save code duplication
+                       if(m_meshnode){
+                               if(parent_bone){
+                                       m_meshnode->setParent(parent_bone);
+                                       m_meshnode->setPosition(m_attachment_position);
+                                       m_meshnode->setRotation(m_attachment_rotation);
+                                       m_meshnode->updateAbsolutePosition();
+                               }
+                               else
+                               {
+                                       if(parent_mesh){
+                                               m_meshnode->setParent(parent_mesh);
+                                               m_meshnode->setPosition(m_attachment_position);
+                                               m_meshnode->setRotation(m_attachment_rotation);
+                                               m_meshnode->updateAbsolutePosition();
+                                       }
+                                       else if(parent_animated_mesh){
+                                               m_meshnode->setParent(parent_animated_mesh);
+                                               m_meshnode->setPosition(m_attachment_position);
+                                               m_meshnode->setRotation(m_attachment_rotation);
+                                               m_meshnode->updateAbsolutePosition();
+                                       }
+                                       else if(parent_sprite){
+                                               m_meshnode->setParent(parent_sprite);
+                                               m_meshnode->setPosition(m_attachment_position);
+                                               m_meshnode->setRotation(m_attachment_rotation);
+                                               m_meshnode->updateAbsolutePosition();
+                                       }
+                               }
+                       }
+                       if(m_animated_meshnode){
+                               if(parent_bone){
+                                       m_animated_meshnode->setParent(parent_bone);
+                                       m_animated_meshnode->setPosition(m_attachment_position);
+                                       m_animated_meshnode->setRotation(m_attachment_rotation);
+                                       m_animated_meshnode->updateAbsolutePosition();
+                               }
+                               else
+                               {
+                                       if(parent_mesh){
+                                               m_animated_meshnode->setParent(parent_mesh);
+                                               m_animated_meshnode->setPosition(m_attachment_position);
+                                               m_animated_meshnode->setRotation(m_attachment_rotation);
+                                               m_animated_meshnode->updateAbsolutePosition();
+                                       }
+                                       else if(parent_animated_mesh){
+                                               m_animated_meshnode->setParent(parent_animated_mesh);
+                                               m_animated_meshnode->setPosition(m_attachment_position);
+                                               m_animated_meshnode->setRotation(m_attachment_rotation);
+                                               m_animated_meshnode->updateAbsolutePosition();
+                                       }
+                                       else if(parent_sprite){
+                                               m_animated_meshnode->setParent(parent_sprite);
+                                               m_animated_meshnode->setPosition(m_attachment_position);
+                                               m_animated_meshnode->setRotation(m_attachment_rotation);
+                                               m_animated_meshnode->updateAbsolutePosition();
+                                       }
+                               }
+                       }
+                       if(m_spritenode){
+                               if(parent_bone){
+                                       m_spritenode->setParent(parent_bone);
+                                       m_spritenode->setPosition(m_attachment_position);
+                                       m_spritenode->setRotation(m_attachment_rotation);
+                                       m_spritenode->updateAbsolutePosition();
                                }
+                               else
+                               {
+                                       if(parent_mesh){
+                                               m_spritenode->setParent(parent_mesh);
+                                               m_spritenode->setPosition(m_attachment_position);
+                                               m_spritenode->setRotation(m_attachment_rotation);
+                                               m_spritenode->updateAbsolutePosition();
+                                       }
+                                       else if(parent_animated_mesh){
+                                               m_spritenode->setParent(parent_animated_mesh);
+                                               m_spritenode->setPosition(m_attachment_position);
+                                               m_spritenode->setRotation(m_attachment_rotation);
+                                               m_spritenode->updateAbsolutePosition();
+                                       }
+                                       else if(parent_sprite){
+                                               m_spritenode->setParent(parent_sprite);
+                                               m_spritenode->setPosition(m_attachment_position);
+                                               m_spritenode->setRotation(m_attachment_rotation);
+                                               m_spritenode->updateAbsolutePosition();
+                                       }
+                               }
+                       }
+                       if(m_is_local_player)
+                       {
+                               LocalPlayer *player = m_env->getLocalPlayer();
+                               player->isAttached = true;
                        }
                }
        }
@@ -1054,43 +1597,45 @@ class GenericCAO : public ClientActiveObject
                u8 cmd = readU8(is);
                if(cmd == GENERIC_CMD_SET_PROPERTIES)
                {
-                       m_hp_max = readS16(is);
-                       m_physical = readU8(is);
-                       m_weight = readF1000(is);
-                       m_collisionbox.MinEdge = readV3F1000(is);
-                       m_collisionbox.MaxEdge = readV3F1000(is);
-                       m_visual = deSerializeString(is);
-                       m_visual_size = readV2F1000(is);
-                       m_textures.clear();
-                       u32 texture_count = readU16(is);
-                       for(u32 i=0; i<texture_count; i++){
-                               m_textures.push_back(deSerializeString(is));
-                       }
-                       m_spritediv = readV2S16(is);
-                       m_is_visible = readU8(is);
-                       m_makes_footstep_sound = readU8(is);
+                       m_prop = gob_read_set_properties(is);
 
-                       m_selection_box = m_collisionbox;
+                       m_selection_box = m_prop.collisionbox;
                        m_selection_box.MinEdge *= BS;
                        m_selection_box.MaxEdge *= BS;
                                
-                       m_tx_size.X = 1.0 / m_spritediv.X;
-                       m_tx_size.Y = 1.0 / m_spritediv.Y;
+                       m_tx_size.X = 1.0 / m_prop.spritediv.X;
+                       m_tx_size.Y = 1.0 / m_prop.spritediv.Y;
+
+                       if(!m_initial_tx_basepos_set){
+                               m_initial_tx_basepos_set = true;
+                               m_tx_basepos = m_prop.initial_sprite_basepos;
+                       }
                        
                        expireVisuals();
                }
                else if(cmd == GENERIC_CMD_UPDATE_POSITION)
                {
+                       // Not sent by the server if this object is an attachment.
+                       // We might however get here if the server notices the object being detached before the client.
                        m_position = readV3F1000(is);
                        m_velocity = readV3F1000(is);
                        m_acceleration = readV3F1000(is);
-                       m_yaw = readF1000(is);
+                       if(fabs(m_prop.automatic_rotate) < 0.001)
+                               m_yaw = readF1000(is);
                        bool do_interpolate = readU8(is);
                        bool is_end_position = readU8(is);
                        float update_interval = readF1000(is);
-                       
+
+                       // Place us a bit higher if we're physical, to not sink into
+                       // the ground due to sucky collision detection...
+                       if(m_prop.physical)
+                               m_position += v3f(0,0.002,0);
+
+                       if(getParent() != NULL) // Just in case
+                               return;
+
                        if(do_interpolate){
-                               if(!m_physical)
+                               if(!m_prop.physical)
                                        pos_translator.update(m_position, is_end_position, update_interval);
                        } else {
                                pos_translator.init(m_position);
@@ -1116,6 +1661,41 @@ class GenericCAO : public ClientActiveObject
 
                        updateTexturePos();
                }
+               else if(cmd == GENERIC_CMD_SET_ANIMATION)
+               {
+                       m_animation_range = readV2F1000(is);
+                       m_animation_speed = readF1000(is);
+                       m_animation_blend = readF1000(is);
+
+                       updateAnimation();
+               }
+               else if(cmd == GENERIC_CMD_SET_BONE_POSITION)
+               {
+                       std::string bone = deSerializeString(is);
+                       v3f position = readV3F1000(is);
+                       v3f rotation = readV3F1000(is);
+                       m_bone_position[bone] = core::vector2d<v3f>(position, rotation);
+
+                       updateBonePosition();
+               }
+               else if(cmd == GENERIC_CMD_SET_ATTACHMENT)
+               {
+                       // If an entry already exists for this object, delete it first to avoid duplicates
+                       for(std::vector<core::vector2d<int> >::iterator ii = m_env->attachment_list.begin(); ii != m_env->attachment_list.end(); ii++)
+                       {
+                               if(ii->X == getId()) // This is the ID of our object
+                               {
+                                       m_env->attachment_list.erase(ii);
+                                       break;
+                               }
+                       }
+                       m_env->attachment_list.push_back(core::vector2d<int>(getId(), readS16(is)));
+                       m_attachment_bone = deSerializeString(is);
+                       m_attachment_position = readV3F1000(is);
+                       m_attachment_rotation = readV3F1000(is);
+
+                       updateAttachments();
+               }
                else if(cmd == GENERIC_CMD_PUNCHED)
                {
                        /*s16 damage =*/ readS16(is);
@@ -1147,8 +1727,6 @@ class GenericCAO : public ClientActiveObject
                                punchitem,
                                time_from_last_punch);
 
-               dstream<<"Directly did_punch="<<result.did_punch<<" result.damage="<<result.damage<<std::endl;
-               
                if(result.did_punch && result.damage != 0)
                {
                        if(result.damage < m_hp){
@@ -1159,7 +1737,7 @@ class GenericCAO : public ClientActiveObject
                                // As there is no definition, make a smoke puff
                                ClientSimpleObject *simple = createSmokePuff(
                                                m_smgr, m_env, m_position,
-                                               m_visual_size * BS);
+                                               m_prop.visual_size * BS);
                                m_env->addSimpleObject(simple);
                        }
                        // TODO: Execute defined fast response