From f9087d14a3655af0a8f47db819b1f9b5dcb9bd7f Mon Sep 17 00:00:00 2001
From: Kyle <kyle.kylina@gmail.com>
Date: Thu, 18 Oct 2012 12:06:47 -0700
Subject: [PATCH 01/24] Allow transparent image_buttons

---
 src/guiFormSpecMenu.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index ed44e441b..9bdcdd5fb 100644
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -458,6 +458,7 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
 			
 			video::ITexture *texture = m_gamedef->tsrc()->getTextureRaw(fimage);
 			gui::IGUIButton *e = Environment->addButton(rect, this, spec.fid, spec.flabel.c_str());
+			e->setUseAlphaChannel(true);
 			e->setImage(texture);
 			e->setPressedImage(texture);
 			e->setScaleImage(true);

From 8e5167d72622dec428477a7fff529b7dbc974106 Mon Sep 17 00:00:00 2001
From: RealBadAngel <mk@realbadangel.pl>
Date: Thu, 8 Nov 2012 19:22:37 +0100
Subject: [PATCH 02/24] Adding background to Formspec

---
 doc/lua_api.txt         |  5 +++++
 src/guiFormSpecMenu.cpp | 45 +++++++++++++++++++++++++++++++++++++++--
 src/guiFormSpecMenu.h   |  1 +
 3 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 301832618..500b514d9 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -694,6 +694,11 @@ image[<X>,<Y>;<W>,<H>;<texture name>]
 ^ Show an image
 ^ Position and size units are inventory slots
 
+background[<X>,<Y>;<W>,<H>;<texture name>]
+^ Use a background. Inventory rectangles are not drawn then.
+^ Position and size units are inventory slots
+^ Example for formspec 8x4 in 16x resolution: image shall be sized 8*16px x 4*16px
+
 field[<X>,<Y>;<W>,<H>;<name>;<label>;<default>]
 ^ Textual field; will be sent to server when a button is clicked
 ^ x and y position the field relative to the top left of the menu
diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index affbd1a34..7815089b2 100644
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -199,6 +199,7 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
 	
 	m_inventorylists.clear();
 	m_images.clear();
+	m_backgrounds.clear();
 	m_fields.clear();
 
 	Strfnd f(m_formspec_string);
@@ -278,9 +279,26 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
 					<<", geom=("<<geom.X<<","<<geom.Y<<")"
 					<<std::endl;
 			if(bp_set != 2)
-				errorstream<<"WARNING: invalid use of button without a size[] element"<<std::endl;
+				errorstream<<"WARNING: invalid use of image without a size[] element"<<std::endl;
 			m_images.push_back(ImageDrawSpec(name, pos, geom));
 		}
+		else if(type == "background")
+		{
+			v2s32 pos = basepos;
+			pos.X += stof(f.next(",")) * (float)spacing.X - ((float)spacing.X-(float)imgsize.X)/2;
+			pos.Y += stof(f.next(";")) * (float)spacing.Y - ((float)spacing.Y-(float)imgsize.Y)/2;
+			v2s32 geom;
+			geom.X = stof(f.next(",")) * (float)spacing.X;
+			geom.Y = stof(f.next(";")) * (float)spacing.Y;
+			std::string name = f.next("]");
+			infostream<<"image name="<<name
+					<<", pos=("<<pos.X<<","<<pos.Y<<")"
+					<<", geom=("<<geom.X<<","<<geom.Y<<")"
+					<<std::endl;
+			if(bp_set != 2)
+				errorstream<<"WARNING: invalid use of background without a size[] element"<<std::endl;
+			m_backgrounds.push_back(ImageDrawSpec(name, pos, geom));
+		}
 		else if(type == "field")
 		{
 			std::string fname = f.next(";");
@@ -691,6 +709,26 @@ void GUIFormSpecMenu::drawMenu()
 
 	m_tooltip_element->setVisible(false);
 
+	/*
+		Draw backgrounds
+	*/
+	for(u32 i=0; i<m_backgrounds.size(); i++)
+	{
+		const ImageDrawSpec &spec = m_backgrounds[i];
+		video::ITexture *texture =
+				m_gamedef->tsrc()->getTextureRaw(spec.name);
+		// Image size on screen
+		core::rect<s32> imgrect(0, 0, spec.geom.X, spec.geom.Y);
+		// Image rectangle on screen
+		core::rect<s32> rect = imgrect + spec.pos;
+		const video::SColor color(255,255,255,255);
+		const video::SColor colors[] = {color,color,color,color};
+		driver->draw2DImage(texture, rect,
+			core::rect<s32>(core::position2d<s32>(0,0),
+					core::dimension2di(texture->getOriginalSize())),
+			NULL/*&AbsoluteClippingRect*/, colors, true);
+	}
+	
 	/*
 		Draw images
 	*/
@@ -715,8 +753,11 @@ void GUIFormSpecMenu::drawMenu()
 		Draw items
 		Phase 0: Item slot rectangles
 		Phase 1: Item images; prepare tooltip
+		If backgrounds used, do not draw Item slot rectangles
 	*/
-	for(int phase=0; phase<=1; phase++)
+	int start_phase=0;
+	if (m_backgrounds.size() > 0) start_phase=1;
+	for(int phase=start_phase; phase<=1; phase++)
 	for(u32 i=0; i<m_inventorylists.size(); i++)
 	{
 		drawList(m_inventorylists[i], phase);
diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h
index 5c01bdcd2..890b54d61 100644
--- a/src/guiFormSpecMenu.h
+++ b/src/guiFormSpecMenu.h
@@ -206,6 +206,7 @@ protected:
 	TextDest *m_text_dst;
 
 	core::array<ListDrawSpec> m_inventorylists;
+	core::array<ImageDrawSpec> m_backgrounds;	
 	core::array<ImageDrawSpec> m_images;
 	core::array<FieldSpec> m_fields;
 

From 3ba9b263103d2cd5218246b05d19b6485347ae28 Mon Sep 17 00:00:00 2001
From: Anthony <azhang9@gmail.com>
Date: Sun, 18 Nov 2012 18:18:45 -0500
Subject: [PATCH 03/24] Fix server crash on /clearpassword

According to #253, using `/clearpassword` without an argument causes the server to crash from an assertion failure. I've resubmitted matttpt's patch as a pull request to aid in merging.
---
 builtin/chatcommands.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/builtin/chatcommands.lua b/builtin/chatcommands.lua
index 9f55f1afc..f25a276ea 100644
--- a/builtin/chatcommands.lua
+++ b/builtin/chatcommands.lua
@@ -215,8 +215,8 @@ minetest.register_chatcommand("clearpassword", {
 	privs = {password=true},
 	func = function(name, param)
 		toname = param
-		if not toname then
-			minetest.chat_send_player(toname, "Name field required")
+		if toname == "" then
+			minetest.chat_send_player(name, "Name field required")
 			return
 		end
 		minetest.set_player_password(toname, '')

From bbd990f2cca59b9e5775707ba24fbab21a0c6164 Mon Sep 17 00:00:00 2001
From: Ilya Zhuravlev <zhuravlevilya@ya.ru>
Date: Fri, 23 Nov 2012 00:36:52 +0400
Subject: [PATCH 04/24] Fix trees growing into any type of node

---
 src/mapgen.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index 77b133020..782f00b62 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -132,7 +132,8 @@ void make_tree(ManualMapVoxelManipulator &vmanip, v3s16 p0,
 	for(s16 ii=0; ii<trunk_h; ii++)
 	{
 		if(vmanip.m_area.contains(p1))
-			vmanip.m_data[vmanip.m_area.index(p1)] = treenode;
+			if(ii == 0 || vmanip.getNodeNoExNoEmerge(p1).getContent() == CONTENT_AIR)
+				vmanip.m_data[vmanip.m_area.index(p1)] = treenode;
 		p1.Y++;
 	}
 

From e02b95741bb0953a4322955bfab18511ff31511d Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Sun, 25 Nov 2012 16:39:07 +0200
Subject: [PATCH 05/24] Revert "Don't leak textures all over the place"

This causes textures to be deleted before they are no longer accessed,
resulting in a segmentation fault. This needs to be rewritten in such a way
that textures are deleted when the client disconnects from a server.

This reverts commit 41c00e87d42580881d8c7001f39014814e3b55f2.
---
 src/mesh.cpp |  3 ---
 src/tile.cpp | 40 ++++++++++++----------------------------
 2 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/src/mesh.cpp b/src/mesh.cpp
index b9ec82e18..0f075f72b 100644
--- a/src/mesh.cpp
+++ b/src/mesh.cpp
@@ -433,9 +433,6 @@ video::ITexture *generateTextureFromMesh(scene::IMesh *mesh,
 	}
 
 	// Create render target texture
-	video::ITexture *oldtexture = driver->findTexture(texture_name.c_str());
-	if(oldtexture)
-		driver->removeTexture(oldtexture);
 	video::ITexture *rtt = driver->addRenderTargetTexture(
 			dim, texture_name.c_str(), video::ECF_A8R8G8B8);
 	if(rtt == NULL)
diff --git a/src/tile.cpp b/src/tile.cpp
index e676c56c4..f7f1779ca 100644
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -518,15 +518,6 @@ core::dimension2d<u32> imageTransformDimension(u32 transform, core::dimension2d<
 // Apply transform to image data
 void imageTransform(u32 transform, video::IImage *src, video::IImage *dst);
 
-/*
-	Adds a new texture to the video driver and returns a pointer to it.
-	This pointer should not be dropped. Any texture that was registered
-	with that name before is removed (this may invalidate some ITexture
-	pointers).
-*/
-video::ITexture* register_texture(video::IVideoDriver *driver,
-		std::string name, video::IImage *img);
-
 /*
 	Generate image based on a string like "stone.png" or "[crack0".
 	if baseimg is NULL, it is created. Otherwise stuff is made on it.
@@ -695,9 +686,11 @@ u32 TextureSource::getTextureIdDirect(const std::string &name)
 				" create texture \""<<name<<"\""<<std::endl;
 	}
 	
-	// Create texture from resulting image
 	if(baseimg != NULL)
-		t = register_texture(driver, name, baseimg);
+	{
+		// Create texture from resulting image
+		t = driver->addTexture(name.c_str(), baseimg);
+	}
 	
 	/*
 		Add texture to caches (add NULL textures too)
@@ -816,7 +809,7 @@ void TextureSource::rebuildImagesAndTextures()
 		// Create texture from resulting image
 		video::ITexture *t = NULL;
 		if(img)
-			t = register_texture(driver, sap->name, img);
+			t = driver->addTexture(sap->name.c_str(), img);
 		
 		// Replace texture
 		sap->a.atlas = t;
@@ -1051,7 +1044,7 @@ void TextureSource::buildMainAtlas(class IGameDef *gamedef)
 	/*
 		Make texture
 	*/
-	video::ITexture *t = register_texture(driver, "__main_atlas__", atlas_img);
+	video::ITexture *t = driver->addTexture("__main_atlas__", atlas_img);
 	assert(t);
 
 	/*
@@ -1142,15 +1135,6 @@ video::IImage* generate_image_from_scratch(std::string name,
 	return baseimg;
 }
 
-video::ITexture* register_texture(video::IVideoDriver *driver,
-		std::string name, video::IImage *img)
-{
-	video::ITexture *old_texture = driver->findTexture(name.c_str());
-	if(old_texture)
-		driver->removeTexture(old_texture);
-	return driver->addTexture(name.c_str(), img);
-}
-
 bool generate_image(std::string part_of_name, video::IImage *& baseimg,
 		IrrlichtDevice *device, SourceImageCache *sourcecache)
 {
@@ -1557,12 +1541,12 @@ bool generate_image(std::string part_of_name, video::IImage *& baseimg,
 			assert(img_top && img_left && img_right);
 
 			// Create textures from images
-			video::ITexture *texture_top = register_texture(driver,
-					imagename_top + "__temp1__", img_top);
-			video::ITexture *texture_left = register_texture(driver,
-					imagename_left + "__temp2__", img_left);
-			video::ITexture *texture_right = register_texture(driver,
-					imagename_right + "__temp3__", img_right);
+			video::ITexture *texture_top = driver->addTexture(
+					(imagename_top + "__temp__").c_str(), img_top);
+			video::ITexture *texture_left = driver->addTexture(
+					(imagename_left + "__temp__").c_str(), img_left);
+			video::ITexture *texture_right = driver->addTexture(
+					(imagename_right + "__temp__").c_str(), img_right);
 			assert(texture_top && texture_left && texture_right);
 
 			// Drop images

From ac97a7f70eefd4b8065e006c634a0a5baf236b62 Mon Sep 17 00:00:00 2001
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 23 Oct 2012 00:03:14 +0300
Subject: [PATCH 06/24] 3D model support for players using Irrlicht. Also ready
 the basis for mesh support on nodes / items via LUA (to be done). Supports
 any mesh format compatible with Irrlicht, but animations are not set up yet.

---
 src/content_cao.cpp     | 47 +++++++++++++++++++++++++++++++++++++++--
 src/content_sao.cpp     |  5 ++++-
 src/object_properties.h |  2 ++
 3 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index cb14cf395..e177fa15c 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -41,6 +41,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/mathconstants.h"
 #include "map.h"
 #include <IMeshManipulator.h>
+#include <IAnimatedMeshSceneNode.h>
 
 class Settings;
 struct ToolCapabilities;
@@ -560,6 +561,7 @@ private:
 	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;
@@ -594,6 +596,7 @@ public:
 		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)),
@@ -683,6 +686,10 @@ public:
 			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;
@@ -695,7 +702,7 @@ public:
 		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;
@@ -791,7 +798,20 @@ public:
 					m_prop.visual_size.X));
 			u8 li = m_last_light;
 			setMeshColor(m_meshnode->getMesh(), video::SColor(255,li,li,li));
-		} else if(m_prop.visual == "wielditem"){
+		}
+		else if(m_prop.visual == "mesh"){
+			infostream<<"GenericCAO::addToScene(): mesh"<<std::endl;
+			scene::IAnimatedMesh *mesh = smgr->getMesh(m_prop.mesh.c_str());
+			m_animated_meshnode = smgr->addAnimatedMeshSceneNode(mesh, NULL);
+			mesh->drop();
+			
+			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));
+		}
+		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){
@@ -823,6 +843,8 @@ public:
 		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){
@@ -853,6 +875,10 @@ public:
 				setMeshColor(m_meshnode->getMesh(), color);
 				m_meshnode->setVisible(is_visible);
 			}
+			if(m_animated_meshnode){
+				setMeshColor(m_animated_meshnode->getMesh(), color);
+				m_animated_meshnode->setVisible(is_visible);
+			}
 			if(m_spritenode){
 				m_spritenode->setColor(color);
 				m_spritenode->setVisible(is_visible);
@@ -873,6 +899,12 @@ public:
 			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);
 		}
@@ -1020,6 +1052,17 @@ public:
 						tsrc->getTextureRaw(texturestring));
 			}
 		}
+		if(m_animated_meshnode)
+		{
+			if(m_prop.visual == "mesh")
+			{
+				// fallback texture
+				if(m_prop.texture == "")
+					m_prop.texture = "unknown_block.png";
+				video::IVideoDriver* driver = m_animated_meshnode->getSceneManager()->getVideoDriver();
+				m_animated_meshnode->setMaterialTexture(0, driver->getTexture(m_prop.texture.c_str()));
+			}
+		}
 		if(m_meshnode)
 		{
 			if(m_prop.visual == "cube")
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 7526e0353..a372b986f 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -782,12 +782,14 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, Player *player_, u16 peer_id_,
 	m_prop.physical = false;
 	m_prop.weight = 75;
 	m_prop.collisionbox = core::aabbox3d<f32>(-1/3.,-1.0,-1/3., 1/3.,1.0,1/3.);
-	m_prop.visual = "upright_sprite";
+	// start of default appearance, this should be overwritten by LUA
+	m_prop.visual = "upright-sprite";
 	m_prop.visual_size = v2f(1, 2);
 	m_prop.textures.clear();
 	m_prop.textures.push_back("player.png");
 	m_prop.textures.push_back("player_back.png");
 	m_prop.spritediv = v2s16(1,1);
+	// end of default appearance
 	m_prop.is_visible = (getHP() != 0);
 	m_prop.makes_footstep_sound = true;
 }
@@ -1136,6 +1138,7 @@ void PlayerSAO::disconnected()
 	}
 }
 
+
 std::string PlayerSAO::getPropertyPacket()
 {
 	m_prop.is_visible = (getHP() != 0);
diff --git a/src/object_properties.h b/src/object_properties.h
index 3f44771e9..f60ecefa4 100644
--- a/src/object_properties.h
+++ b/src/object_properties.h
@@ -32,6 +32,8 @@ struct ObjectProperties
 	float weight;
 	core::aabbox3d<f32> collisionbox;
 	std::string visual;
+	std::string mesh;
+	std::string texture;
 	v2f visual_size;
 	core::array<std::string> textures;
 	v2s16 spritediv;

From 0a020dbcc848ae2debec664846e08bd097d70320 Mon Sep 17 00:00:00 2001
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 23 Oct 2012 20:03:06 +0300
Subject: [PATCH 07/24] Properly read the mesh from LUA.

Players can now be set to meshes using the following test script:

function switch_player_visual()
		prop = {
			mesh="player.obj",
			texture="player.png",
			visual="mesh",
		}
	for _, obj in pairs(minetest.get_connected_players()) do
		obj:set_properties(prop)
	end
	minetest.after(1.0, switch_player_visual)
end
minetest.after(1.0, switch_player_visual)
---
 src/content_cao.cpp       | 20 ++++++++++++--------
 src/content_sao.cpp       |  5 ++---
 src/object_properties.cpp |  8 ++++++++
 src/scriptapi.cpp         |  3 +++
 4 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index e177fa15c..985f3cbbd 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -802,14 +802,18 @@ public:
 		else if(m_prop.visual == "mesh"){
 			infostream<<"GenericCAO::addToScene(): mesh"<<std::endl;
 			scene::IAnimatedMesh *mesh = smgr->getMesh(m_prop.mesh.c_str());
-			m_animated_meshnode = smgr->addAnimatedMeshSceneNode(mesh, NULL);
-			mesh->drop();
-			
-			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));
+			if(mesh)
+			{
+				m_animated_meshnode = smgr->addAnimatedMeshSceneNode(mesh, NULL);
+				
+				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));
+			}
+			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;
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index a372b986f..6c2abf8f6 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -783,14 +783,14 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, Player *player_, u16 peer_id_,
 	m_prop.weight = 75;
 	m_prop.collisionbox = core::aabbox3d<f32>(-1/3.,-1.0,-1/3., 1/3.,1.0,1/3.);
 	// start of default appearance, this should be overwritten by LUA
-	m_prop.visual = "upright-sprite";
+	m_prop.visual = "upright_sprite";
 	m_prop.visual_size = v2f(1, 2);
 	m_prop.textures.clear();
 	m_prop.textures.push_back("player.png");
 	m_prop.textures.push_back("player_back.png");
 	m_prop.spritediv = v2s16(1,1);
 	// end of default appearance
-	m_prop.is_visible = (getHP() != 0);
+	m_prop.is_visible = (getHP() != 0); // TODO: Use a death animation instead for mesh players
 	m_prop.makes_footstep_sound = true;
 }
 
@@ -1138,7 +1138,6 @@ void PlayerSAO::disconnected()
 	}
 }
 
-
 std::string PlayerSAO::getPropertyPacket()
 {
 	m_prop.is_visible = (getHP() != 0);
diff --git a/src/object_properties.cpp b/src/object_properties.cpp
index e67b78b52..3a36addc7 100644
--- a/src/object_properties.cpp
+++ b/src/object_properties.cpp
@@ -30,6 +30,8 @@ ObjectProperties::ObjectProperties():
 	weight(5),
 	collisionbox(-0.5,-0.5,-0.5, 0.5,0.5,0.5),
 	visual("sprite"),
+	mesh(""),
+	texture(""),
 	visual_size(1,1),
 	spritediv(1,1),
 	initial_sprite_basepos(0,0),
@@ -48,6 +50,8 @@ std::string ObjectProperties::dump()
 	os<<", weight="<<weight;
 	os<<", collisionbox="<<PP(collisionbox.MinEdge)<<","<<PP(collisionbox.MaxEdge);
 	os<<", visual="<<visual;
+	os<<", mesh="<<mesh;
+	os<<", texture="<<texture;
 	os<<", visual_size="<<PP2(visual_size);
 	os<<", textures=[";
 	for(u32 i=0; i<textures.size(); i++){
@@ -71,6 +75,8 @@ void ObjectProperties::serialize(std::ostream &os) const
 	writeV3F1000(os, collisionbox.MinEdge);
 	writeV3F1000(os, collisionbox.MaxEdge);
 	os<<serializeString(visual);
+	os<<serializeString(mesh);
+	os<<serializeString(texture);
 	writeV2F1000(os, visual_size);
 	writeU16(os, textures.size());
 	for(u32 i=0; i<textures.size(); i++){
@@ -94,6 +100,8 @@ void ObjectProperties::deSerialize(std::istream &is)
 	collisionbox.MinEdge = readV3F1000(is);
 	collisionbox.MaxEdge = readV3F1000(is);
 	visual = deSerializeString(is);
+	mesh = deSerializeString(is);
+	texture = deSerializeString(is);
 	visual_size = readV2F1000(is);
 	textures.clear();
 	u32 texture_count = readU16(is);
diff --git a/src/scriptapi.cpp b/src/scriptapi.cpp
index 09900ce1f..7eda636e3 100644
--- a/src/scriptapi.cpp
+++ b/src/scriptapi.cpp
@@ -936,6 +936,9 @@ static void read_object_properties(lua_State *L, int index,
 	lua_pop(L, 1);
 
 	getstringfield(L, -1, "visual", prop->visual);
+
+	getstringfield(L, -1, "mesh", prop->mesh);
+	getstringfield(L, -1, "texture", prop->texture);
 	
 	lua_getfield(L, -1, "visual_size");
 	if(lua_istable(L, -1))

From cb40b3517a2dfac96c6733ce6e89e13822998cf9 Mon Sep 17 00:00:00 2001
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 23 Oct 2012 23:57:36 +0300
Subject: [PATCH 08/24] Fix material properties and allow lighting. Models
 should now be affected by light instead of being black

---
 src/content_cao.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 985f3cbbd..c0be4e4cd 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -1065,6 +1065,11 @@ public:
 					m_prop.texture = "unknown_block.png";
 				video::IVideoDriver* driver = m_animated_meshnode->getSceneManager()->getVideoDriver();
 				m_animated_meshnode->setMaterialTexture(0, driver->getTexture(m_prop.texture.c_str()));
+
+				// Set material flags and texture
+				video::SMaterial& material = m_animated_meshnode->getMaterial(0);
+				material.setFlag(video::EMF_LIGHTING, false);
+				material.setFlag(video::EMF_BILINEAR_FILTER, false);
 			}
 		}
 		if(m_meshnode)

From f9675bd2b4d48b9517cd4939a5cfe1ea9c775b6c Mon Sep 17 00:00:00 2001
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Wed, 24 Oct 2012 00:11:24 +0300
Subject: [PATCH 09/24] Add a subfolder for models and transfer models from
 server to client

(obj, md2 and md3 are currently allowed)

Get rid of the texture string and use the existing textures array. Segmented meshes have multiple materials, and this will allow us to texture each. Do not switch to this commit yet!

If a texture string is left empty in LUA, don't modify that material. Useful so a script can change specific textures without affecting others
---
 src/client.cpp            | 19 +++++++++++++++++++
 src/content_cao.cpp       | 28 +++++++++++++++++++---------
 src/object_properties.cpp |  4 ----
 src/object_properties.h   |  1 -
 src/scriptapi.cpp         |  3 ++-
 src/server.cpp            |  2 ++
 6 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/src/client.cpp b/src/client.cpp
index e47bce142..504297a6d 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -860,6 +860,25 @@ bool Client::loadMedia(const std::string &data, const std::string &filename)
 		return true;
 	}
 
+	const char *model_ext[] = {
+		".b3d", ".md2", ".obj",
+		NULL
+	};
+	name = removeStringEnd(filename, model_ext);
+	if(name != "")
+	{
+		verbosestream<<"Client: Storing model into Irrlicht: "
+				<<"file \""<<filename<<"\""<<std::endl;
+
+		io::IFileSystem *irrfs = m_device->getFileSystem();
+
+		// Create an irrlicht memory file
+		io::IReadFile *rfile = irrfs->createMemoryReadFile(*data_rw, data_rw.getSize(), filename.c_str(), true);
+		assert(rfile);
+		//rfile->drop();
+		return true;
+	}
+
 	errorstream<<"Client: Don't know how to load file \""
 			<<filename<<"\""<<std::endl;
 	return false;
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index c0be4e4cd..b3c0370b8 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -1060,16 +1060,26 @@ public:
 		{
 			if(m_prop.visual == "mesh")
 			{
-				// fallback texture
-				if(m_prop.texture == "")
-					m_prop.texture = "unknown_block.png";
-				video::IVideoDriver* driver = m_animated_meshnode->getSceneManager()->getVideoDriver();
-				m_animated_meshnode->setMaterialTexture(0, driver->getTexture(m_prop.texture.c_str()));
+				for (u32 i = 0; i < m_prop.textures.size(); ++i)
+				{
+					std::string texturestring = m_prop.textures[i];
+					if(texturestring == "")
+						continue; // Empty texture string means don't modify that material
+					texturestring += mod;
+					video::IVideoDriver* driver = m_animated_meshnode->getSceneManager()->getVideoDriver();
+					video::ITexture* texture = driver->getTexture(texturestring.c_str());
+					if(!texture)
+					{
+						errorstream<<"GenericCAO::updateTextures(): Could not load texture "<<texturestring<<std::endl;
+						continue;
+					}
 
-				// Set material flags and texture
-				video::SMaterial& material = m_animated_meshnode->getMaterial(0);
-				material.setFlag(video::EMF_LIGHTING, false);
-				material.setFlag(video::EMF_BILINEAR_FILTER, false);
+					// 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);
+				}
 			}
 		}
 		if(m_meshnode)
diff --git a/src/object_properties.cpp b/src/object_properties.cpp
index 3a36addc7..c91384ada 100644
--- a/src/object_properties.cpp
+++ b/src/object_properties.cpp
@@ -31,7 +31,6 @@ ObjectProperties::ObjectProperties():
 	collisionbox(-0.5,-0.5,-0.5, 0.5,0.5,0.5),
 	visual("sprite"),
 	mesh(""),
-	texture(""),
 	visual_size(1,1),
 	spritediv(1,1),
 	initial_sprite_basepos(0,0),
@@ -51,7 +50,6 @@ std::string ObjectProperties::dump()
 	os<<", collisionbox="<<PP(collisionbox.MinEdge)<<","<<PP(collisionbox.MaxEdge);
 	os<<", visual="<<visual;
 	os<<", mesh="<<mesh;
-	os<<", texture="<<texture;
 	os<<", visual_size="<<PP2(visual_size);
 	os<<", textures=[";
 	for(u32 i=0; i<textures.size(); i++){
@@ -76,7 +74,6 @@ void ObjectProperties::serialize(std::ostream &os) const
 	writeV3F1000(os, collisionbox.MaxEdge);
 	os<<serializeString(visual);
 	os<<serializeString(mesh);
-	os<<serializeString(texture);
 	writeV2F1000(os, visual_size);
 	writeU16(os, textures.size());
 	for(u32 i=0; i<textures.size(); i++){
@@ -101,7 +98,6 @@ void ObjectProperties::deSerialize(std::istream &is)
 	collisionbox.MaxEdge = readV3F1000(is);
 	visual = deSerializeString(is);
 	mesh = deSerializeString(is);
-	texture = deSerializeString(is);
 	visual_size = readV2F1000(is);
 	textures.clear();
 	u32 texture_count = readU16(is);
diff --git a/src/object_properties.h b/src/object_properties.h
index f60ecefa4..48240e6ea 100644
--- a/src/object_properties.h
+++ b/src/object_properties.h
@@ -33,7 +33,6 @@ struct ObjectProperties
 	core::aabbox3d<f32> collisionbox;
 	std::string visual;
 	std::string mesh;
-	std::string texture;
 	v2f visual_size;
 	core::array<std::string> textures;
 	v2s16 spritediv;
diff --git a/src/scriptapi.cpp b/src/scriptapi.cpp
index 7eda636e3..9293e2b65 100644
--- a/src/scriptapi.cpp
+++ b/src/scriptapi.cpp
@@ -938,7 +938,6 @@ static void read_object_properties(lua_State *L, int index,
 	getstringfield(L, -1, "visual", prop->visual);
 
 	getstringfield(L, -1, "mesh", prop->mesh);
-	getstringfield(L, -1, "texture", prop->texture);
 	
 	lua_getfield(L, -1, "visual_size");
 	if(lua_istable(L, -1))
@@ -6591,6 +6590,8 @@ void scriptapi_luaentity_get_properties(lua_State *L, u16 id,
 	lua_pop(L, 1);
 
 	getstringfield(L, -1, "visual", prop->visual);
+
+	getstringfield(L, -1, "mesh", prop->mesh);
 	
 	// Deprecated: read object properties directly
 	read_object_properties(L, -1, prop);
diff --git a/src/server.cpp b/src/server.cpp
index 2da9cbe24..92fd567e5 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -4029,6 +4029,7 @@ void Server::fillMediaCache()
 		paths.push_back(mod.path + DIR_DELIM + "textures");
 		paths.push_back(mod.path + DIR_DELIM + "sounds");
 		paths.push_back(mod.path + DIR_DELIM + "media");
+		paths.push_back(mod.path + DIR_DELIM + "models");
 	}
 	std::string path_all = "textures";
 	paths.push_back(path_all + DIR_DELIM + "all");
@@ -4054,6 +4055,7 @@ void Server::fillMediaCache()
 				".png", ".jpg", ".bmp", ".tga",
 				".pcx", ".ppm", ".psd", ".wal", ".rgb",
 				".ogg",
+				".b3d", ".md2", ".obj",
 				NULL
 			};
 			if(removeStringEnd(filename, supported_ext) == ""){

From 9c8ba427503cbf73f0263495a791656b905c2efc Mon Sep 17 00:00:00 2001
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Wed, 24 Oct 2012 22:10:05 +0300
Subject: [PATCH 10/24] Get the mesh working through the memory cache properly.
 Most credit goes to celeron55 for the help on this code

Get the texture from memory as well

Add .x to the list of supported formats

Update LUA API documentation
---
 doc/lua_api.txt     |  3 ++-
 src/client.cpp      | 24 ++++++++++++++----------
 src/content_cao.cpp | 13 +++++++++++--
 src/server.cpp      |  2 +-
 4 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 500b514d9..84c86061f 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -1227,8 +1227,9 @@ Object Properties
     physical = true,
     weight = 5,
     collisionbox = {-0.5,-0.5,-0.5, 0.5,0.5,0.5},
-    visual = "cube"/"sprite"/"upright_sprite",
+    visual = "cube"/"sprite"/"upright_sprite"/"mesh",
     visual_size = {x=1, y=1},
+    mesh = "model",
     textures = {}, -- number of required textures depends on visual
     spritediv = {x=1, y=1},
     initial_sprite_basepos = {x=0, y=0},
diff --git a/src/client.cpp b/src/client.cpp
index 504297a6d..7f5421747 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -41,6 +41,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "sound.h"
 #include "util/string.h"
 #include "hex.h"
+#include "IMeshCache.h"
 
 static std::string getMediaCacheDir()
 {
@@ -820,8 +821,8 @@ bool Client::loadMedia(const std::string &data, const std::string &filename)
 	name = removeStringEnd(filename, image_ext);
 	if(name != "")
 	{
-		verbosestream<<"Client: Attempting to load image "
-				<<"file \""<<filename<<"\""<<std::endl;
+		verbosestream<<"Client: Storing image into Irrlicht: "
+				<<"\""<<filename<<"\""<<std::endl;
 
 		io::IFileSystem *irrfs = m_device->getFileSystem();
 		video::IVideoDriver *vdrv = m_device->getVideoDriver();
@@ -854,28 +855,31 @@ bool Client::loadMedia(const std::string &data, const std::string &filename)
 	name = removeStringEnd(filename, sound_ext);
 	if(name != "")
 	{
-		verbosestream<<"Client: Attempting to load sound "
-				<<"file \""<<filename<<"\""<<std::endl;
+		verbosestream<<"Client: Storing sound into Irrlicht: "
+				<<"\""<<filename<<"\""<<std::endl;
 		m_sound->loadSoundData(name, data);
 		return true;
 	}
 
 	const char *model_ext[] = {
-		".b3d", ".md2", ".obj",
+		".x", ".b3d", ".md2", ".obj",
 		NULL
 	};
 	name = removeStringEnd(filename, model_ext);
 	if(name != "")
 	{
 		verbosestream<<"Client: Storing model into Irrlicht: "
-				<<"file \""<<filename<<"\""<<std::endl;
+				<<"\""<<filename<<"\""<<std::endl;
 
 		io::IFileSystem *irrfs = m_device->getFileSystem();
-
-		// Create an irrlicht memory file
-		io::IReadFile *rfile = irrfs->createMemoryReadFile(*data_rw, data_rw.getSize(), filename.c_str(), true);
+		io::IReadFile *rfile = irrfs->createMemoryReadFile(
+				*data_rw, data_rw.getSize(), filename.c_str());
 		assert(rfile);
-		//rfile->drop();
+		
+		scene::ISceneManager *smgr = m_device->getSceneManager();
+		scene::IAnimatedMesh *mesh = smgr->getMesh(rfile);
+		smgr->getMeshCache()->addMesh(filename.c_str(), mesh);
+		
 		return true;
 	}
 
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index b3c0370b8..cd822cb33 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -979,6 +979,8 @@ public:
 
 		updateTexturePos();
 
+		updateAnimations();
+
 		if(m_reset_textures_timer >= 0){
 			m_reset_textures_timer -= dtime;
 			if(m_reset_textures_timer <= 0){
@@ -1066,8 +1068,7 @@ public:
 					if(texturestring == "")
 						continue; // Empty texture string means don't modify that material
 					texturestring += mod;
-					video::IVideoDriver* driver = m_animated_meshnode->getSceneManager()->getVideoDriver();
-					video::ITexture* texture = driver->getTexture(texturestring.c_str());
+					video::ITexture* texture = tsrc->getTextureRaw(texturestring);
 					if(!texture)
 					{
 						errorstream<<"GenericCAO::updateTextures(): Could not load texture "<<texturestring<<std::endl;
@@ -1135,6 +1136,14 @@ public:
 		}
 	}
 
+	void updateAnimations()
+	{
+		if(!m_animated_meshnode)
+			return;
+
+		m_animated_meshnode->setFrameLoop(0, 50);
+	}
+
 	void processMessage(const std::string &data)
 	{
 		//infostream<<"GenericCAO: Got message"<<std::endl;
diff --git a/src/server.cpp b/src/server.cpp
index 92fd567e5..930938ecb 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -4055,7 +4055,7 @@ void Server::fillMediaCache()
 				".png", ".jpg", ".bmp", ".tga",
 				".pcx", ".ppm", ".psd", ".wal", ".rgb",
 				".ogg",
-				".b3d", ".md2", ".obj",
+				".x", ".b3d", ".md2", ".obj",
 				NULL
 			};
 			if(removeStringEnd(filename, supported_ext) == ""){

From fb0c43186422ad985e70f73bc70eeb07cc194909 Mon Sep 17 00:00:00 2001
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu, 25 Oct 2012 23:29:07 +0300
Subject: [PATCH 11/24] Allow the LUA API to set animations to meshes as well
 as the animation speed. Also update animations only when needed.

Support for animation blending, though for some reason it doesn't work.

Don't enable animation transitions by default for many reaosons

Object property to store individual bone positions. LUA can specify a bone name followed by a bone position. No functionality yet. Bone rotation to be added in the following commit

Same system for bone rotation, plus a few other things I missed
---
 doc/lua_api.txt           |  5 ++++
 src/content_cao.cpp       | 20 ++++++++++---
 src/object_properties.cpp | 61 +++++++++++++++++++++++++++++++++++++++
 src/object_properties.h   |  7 +++++
 src/scriptapi.cpp         | 39 +++++++++++++++++++++++++
 5 files changed, 128 insertions(+), 4 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 84c86061f..2b2b6c6f1 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -1230,6 +1230,11 @@ Object Properties
     visual = "cube"/"sprite"/"upright_sprite"/"mesh",
     visual_size = {x=1, y=1},
     mesh = "model",
+    animation_frames = {1, 1},
+    animation_speed = 15,
+    animation_blend = 0,
+    animation_bone_position = {"", {x=0, y=0, z=0}}, -- bone name followed by position vector
+    animation_bone_rotation = {"", {x=0, y=0, z=0}}, -- bone name followed by rotation vector
     textures = {}, -- number of required textures depends on visual
     spritediv = {x=1, y=1},
     initial_sprite_basepos = {x=0, y=0},
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index cd822cb33..4df238b24 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -42,6 +42,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "map.h"
 #include <IMeshManipulator.h>
 #include <IAnimatedMeshSceneNode.h>
+#include <IBoneSceneNode.h>
 
 class Settings;
 struct ToolCapabilities;
@@ -805,7 +806,8 @@ public:
 			if(mesh)
 			{
 				m_animated_meshnode = smgr->addAnimatedMeshSceneNode(mesh, NULL);
-				
+				m_animated_meshnode->setMD2Animation(scene::EMAT_STAND);
+				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));
@@ -922,6 +924,7 @@ public:
 			m_visuals_expired = false;
 			removeFromScene();
 			addToScene(m_smgr, m_gamedef->tsrc(), m_irr);
+			updateAnimations();
 		}
 
 		if(m_prop.physical){
@@ -979,8 +982,6 @@ public:
 
 		updateTexturePos();
 
-		updateAnimations();
-
 		if(m_reset_textures_timer >= 0){
 			m_reset_textures_timer -= dtime;
 			if(m_reset_textures_timer <= 0){
@@ -1141,7 +1142,18 @@ public:
 		if(!m_animated_meshnode)
 			return;
 
-		m_animated_meshnode->setFrameLoop(0, 50);
+		m_animated_meshnode->setFrameLoop(m_prop.animation_frames.X, m_prop.animation_frames.Y);
+		m_animated_meshnode->setAnimationSpeed(m_prop.animation_speed);
+		m_animated_meshnode->setTransitionTime(m_prop.animation_blend);
+
+		for(std::map<std::string, v3f>::const_iterator ii = m_prop.animation_bone_position.begin(); ii != m_prop.animation_bone_position.end(); ++ii){
+			if((*ii).second.X || (*ii).second.Y || (*ii).second.Z) { }
+			// Bone positioning code will go here
+		}
+		for(std::map<std::string, v3f>::const_iterator ii = m_prop.animation_bone_rotation.begin(); ii != m_prop.animation_bone_rotation.end(); ++ii){
+			if((*ii).second.X || (*ii).second.Y || (*ii).second.Z) { }
+			// Bone rotation code will go here
+		}
 	}
 
 	void processMessage(const std::string &data)
diff --git a/src/object_properties.cpp b/src/object_properties.cpp
index c91384ada..eb26db8d3 100644
--- a/src/object_properties.cpp
+++ b/src/object_properties.cpp
@@ -20,6 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "object_properties.h"
 #include "util/serialize.h"
 #include <sstream>
+#include <map>
 
 #define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
 #define PP2(x) "("<<(x).X<<","<<(x).Y<<")"
@@ -31,6 +32,9 @@ ObjectProperties::ObjectProperties():
 	collisionbox(-0.5,-0.5,-0.5, 0.5,0.5,0.5),
 	visual("sprite"),
 	mesh(""),
+	animation_frames(1,1),
+	animation_speed(15),
+	animation_blend(0),
 	visual_size(1,1),
 	spritediv(1,1),
 	initial_sprite_basepos(0,0),
@@ -38,6 +42,8 @@ ObjectProperties::ObjectProperties():
 	makes_footstep_sound(false),
 	automatic_rotate(0)
 {
+	animation_bone_position[""] = v3f(0,0,0);
+	animation_bone_rotation[""] = v3f(0,0,0);
 	textures.push_back("unknown_object.png");
 }
 
@@ -50,7 +56,26 @@ std::string ObjectProperties::dump()
 	os<<", collisionbox="<<PP(collisionbox.MinEdge)<<","<<PP(collisionbox.MaxEdge);
 	os<<", visual="<<visual;
 	os<<", mesh="<<mesh;
+	os<<", animation_frames="<<animation_frames.X<<","<<animation_frames.Y;
+	os<<", animation_speed="<<animation_speed;
+	os<<", animation_blend="<<animation_blend;
 	os<<", visual_size="<<PP2(visual_size);
+
+	os<<", animation_bone_position=[";
+	for(std::map<std::string, v3f>::const_iterator ii = animation_bone_position.begin(); ii != animation_bone_position.end(); ++ii){
+		std::string bone_name = (*ii).first;
+		v3f bone_pos = (*ii).second;
+		os<<bone_name<<" "<<bone_pos.X<<","<<bone_pos.Y<<","<<bone_pos.Z<<"\"";
+	}
+	os<<"]";
+	os<<", animation_bone_rotation=[";
+	for(std::map<std::string, v3f>::const_iterator ii = animation_bone_rotation.begin(); ii != animation_bone_rotation.end(); ++ii){
+		std::string bone_name = (*ii).first;
+		v3f bone_rot = (*ii).second;
+		os<<bone_name<<" "<<bone_rot.X<<","<<bone_rot.Y<<","<<bone_rot.Z<<"\"";
+	}
+	os<<"]";
+
 	os<<", textures=[";
 	for(u32 i=0; i<textures.size(); i++){
 		os<<"\""<<textures[i]<<"\" ";
@@ -74,11 +99,28 @@ void ObjectProperties::serialize(std::ostream &os) const
 	writeV3F1000(os, collisionbox.MaxEdge);
 	os<<serializeString(visual);
 	os<<serializeString(mesh);
+	writeF1000(os, animation_frames.X);
+	writeF1000(os, animation_frames.Y);
+	writeF1000(os, animation_speed);
+	writeF1000(os, animation_blend);
+
+	writeU16(os, animation_bone_position.size());
+	for(std::map<std::string, v3f>::const_iterator ii = animation_bone_position.begin(); ii != animation_bone_position.end(); ++ii){
+		os<<serializeString((*ii).first);
+		writeV3F1000(os, (*ii).second);
+	}
+	writeU16(os, animation_bone_rotation.size());
+	for(std::map<std::string, v3f>::const_iterator ii = animation_bone_rotation.begin(); ii != animation_bone_rotation.end(); ++ii){
+		os<<serializeString((*ii).first);
+		writeV3F1000(os, (*ii).second);
+	}
+
 	writeV2F1000(os, visual_size);
 	writeU16(os, textures.size());
 	for(u32 i=0; i<textures.size(); i++){
 		os<<serializeString(textures[i]);
 	}
+
 	writeV2S16(os, spritediv);
 	writeV2S16(os, initial_sprite_basepos);
 	writeU8(os, is_visible);
@@ -98,12 +140,31 @@ void ObjectProperties::deSerialize(std::istream &is)
 	collisionbox.MaxEdge = readV3F1000(is);
 	visual = deSerializeString(is);
 	mesh = deSerializeString(is);
+	animation_frames.X = readF1000(is);
+	animation_frames.Y = readF1000(is);
+	animation_speed = readF1000(is);
+	animation_blend = readF1000(is);
+
+	u32 animation_bone_position_count = readU16(is);
+	for(u32 i=0; i<animation_bone_position_count; i++){
+		std::string bone_name = deSerializeString(is);
+		v3f bone_pos = readV3F1000(is);
+		animation_bone_position[bone_name] = bone_pos;
+	}
+	u32 animation_bone_rotation_count = readU16(is);
+	for(u32 i=0; i<animation_bone_rotation_count; i++){
+		std::string bone_name = deSerializeString(is);
+		v3f bone_rot = readV3F1000(is);
+		animation_bone_rotation[bone_name] = bone_rot;
+	}
+
 	visual_size = readV2F1000(is);
 	textures.clear();
 	u32 texture_count = readU16(is);
 	for(u32 i=0; i<texture_count; i++){
 		textures.push_back(deSerializeString(is));
 	}
+
 	spritediv = readV2S16(is);
 	initial_sprite_basepos = readV2S16(is);
 	is_visible = readU8(is);
diff --git a/src/object_properties.h b/src/object_properties.h
index 48240e6ea..3ab488f92 100644
--- a/src/object_properties.h
+++ b/src/object_properties.h
@@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <string>
 #include "irrlichttypes_bloated.h"
 #include <iostream>
+#include <map>
 
 struct ObjectProperties
 {
@@ -33,6 +34,11 @@ struct ObjectProperties
 	core::aabbox3d<f32> collisionbox;
 	std::string visual;
 	std::string mesh;
+	core::vector2d<int> animation_frames;
+	float animation_speed;
+	float animation_blend;
+	std::map<std::string, v3f> animation_bone_position;
+	std::map<std::string, v3f> animation_bone_rotation;
 	v2f visual_size;
 	core::array<std::string> textures;
 	v2s16 spritediv;
@@ -41,6 +47,7 @@ struct ObjectProperties
 	bool makes_footstep_sound;
 	float automatic_rotate;
 
+
 	ObjectProperties();
 	std::string dump();
 	void serialize(std::ostream &os) const;
diff --git a/src/scriptapi.cpp b/src/scriptapi.cpp
index 9293e2b65..74de50ef8 100644
--- a/src/scriptapi.cpp
+++ b/src/scriptapi.cpp
@@ -944,6 +944,45 @@ static void read_object_properties(lua_State *L, int index,
 		prop->visual_size = read_v2f(L, -1);
 	lua_pop(L, 1);
 
+	lua_getfield(L, -1, "animation_frames");
+	if(lua_istable(L, -1))
+	{
+		lua_rawgeti (L, -1, 1);
+		lua_rawgeti (L, -2, 2);
+		prop->animation_frames.X = lua_tonumber(L, -2);
+		prop->animation_frames.Y = lua_tonumber(L, -1);
+		lua_pop(L, 2);
+	}
+	lua_pop(L, 1);
+
+	getfloatfield(L, -1, "animation_speed", prop->animation_speed);
+
+	getfloatfield(L, -1, "animation_blend", prop->animation_blend);
+
+	lua_getfield(L, -1, "animation_bone_position");
+	if(lua_istable(L, -1))
+	{
+		lua_rawgeti (L, -1, 1);
+		lua_rawgeti (L, -2, 2);
+		std::string bone_name = lua_tostring(L, -2);
+		v3f bone_pos = read_v3f(L, -1);
+		prop->animation_bone_position[bone_name] = bone_pos;
+		lua_pop(L, 2);
+	}
+	lua_pop(L, 1);
+
+	lua_getfield(L, -1, "animation_bone_rotation");
+	if(lua_istable(L, -1))
+	{
+		lua_rawgeti (L, -1, 1);
+		lua_rawgeti (L, -2, 2);
+		std::string bone_name = lua_tostring(L, -2);
+		v3f bone_rot = read_v3f(L, -1);
+		prop->animation_bone_rotation[bone_name] = bone_rot;
+		lua_pop(L, 2);
+	}
+	lua_pop(L, 1);
+
 	lua_getfield(L, -1, "textures");
 	if(lua_istable(L, -1)){
 		prop->textures.clear();

From ba4d93027f7b1590f303eff2138cae413faf5c34 Mon Sep 17 00:00:00 2001
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Fri, 26 Oct 2012 11:46:46 +0300
Subject: [PATCH 12/24] Joint positioning and rotation code, and fix a problem
 related to their lua API

Attempt to move the animation system to a more correct implementation, rather than using object properties. Incomplete and breaks functionality
---
 doc/lua_api.txt           |  4 +---
 src/content_cao.cpp       | 42 +++++++++++++++++++++++++++++----------
 src/content_sao.cpp       |  8 ++++++++
 src/content_sao.h         |  1 +
 src/genericobject.cpp     | 13 ++++++++++++
 src/genericobject.h       |  7 +++++--
 src/object_properties.cpp | 18 ++---------------
 src/object_properties.h   |  3 ---
 src/scriptapi.cpp         | 40 +++++++++++++++++++++++--------------
 9 files changed, 86 insertions(+), 50 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 2b2b6c6f1..5515669d8 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -1116,6 +1116,7 @@ LuaEntitySAO-only: (no-op for other objects)
 -           select_horiz_by_yawpitch=false)
   ^ Select sprite from spritesheet with optional animation and DM-style
     texture selection based on yaw relative to camera
+- setanimations(frame_start, frame_end, frame_speed, frame_blend)
 - get_entity_name() (DEPRECATED: Will be removed in a future version)
 - get_luaentity()
 Player-only: (no-op for other objects)
@@ -1230,9 +1231,6 @@ Object Properties
     visual = "cube"/"sprite"/"upright_sprite"/"mesh",
     visual_size = {x=1, y=1},
     mesh = "model",
-    animation_frames = {1, 1},
-    animation_speed = 15,
-    animation_blend = 0,
     animation_bone_position = {"", {x=0, y=0, z=0}}, -- bone name followed by position vector
     animation_bone_rotation = {"", {x=0, y=0, z=0}}, -- bone name followed by rotation vector
     textures = {}, -- number of required textures depends on visual
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 4df238b24..1cd3926ca 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -924,7 +924,6 @@ public:
 			m_visuals_expired = false;
 			removeFromScene();
 			addToScene(m_smgr, m_gamedef->tsrc(), m_irr);
-			updateAnimations();
 		}
 
 		if(m_prop.physical){
@@ -1137,22 +1136,34 @@ public:
 		}
 	}
 
-	void updateAnimations()
+	void updateAnimations(int frame_start, int frame_end, float frame_speed, float frame_blend)
 	{
 		if(!m_animated_meshnode)
 			return;
 
-		m_animated_meshnode->setFrameLoop(m_prop.animation_frames.X, m_prop.animation_frames.Y);
-		m_animated_meshnode->setAnimationSpeed(m_prop.animation_speed);
-		m_animated_meshnode->setTransitionTime(m_prop.animation_blend);
+		m_animated_meshnode->setFrameLoop(frame_start, frame_end);
+		m_animated_meshnode->setAnimationSpeed(frame_speed);
+		m_animated_meshnode->setTransitionTime(frame_blend);
 
-		for(std::map<std::string, v3f>::const_iterator ii = m_prop.animation_bone_position.begin(); ii != m_prop.animation_bone_position.end(); ++ii){
-			if((*ii).second.X || (*ii).second.Y || (*ii).second.Z) { }
-			// Bone positioning code will go here
+		if(m_prop.animation_bone_position.size() > 0)
+		{
+			for(std::map<std::string, v3f>::const_iterator ii = m_prop.animation_bone_position.begin(); ii != m_prop.animation_bone_position.end(); ++ii){
+				m_animated_meshnode->setJointMode(irr::scene::EJUOR_CONTROL); // To write positions to the mesh on render
+				std::string bone_name = (*ii).first;
+				v3f bone_pos = (*ii).second;
+				irr::scene::IBoneSceneNode* bone = m_animated_meshnode->getJointNode(bone_name.c_str());
+				bone->setPosition(bone_pos);
+			}
 		}
-		for(std::map<std::string, v3f>::const_iterator ii = m_prop.animation_bone_rotation.begin(); ii != m_prop.animation_bone_rotation.end(); ++ii){
-			if((*ii).second.X || (*ii).second.Y || (*ii).second.Z) { }
-			// Bone rotation code will go here
+		if(m_prop.animation_bone_rotation.size() > 0)
+		{
+			for(std::map<std::string, v3f>::const_iterator ii = m_prop.animation_bone_rotation.begin(); ii != m_prop.animation_bone_rotation.end(); ++ii){
+				m_animated_meshnode->setJointMode(irr::scene::EJUOR_CONTROL); // To write positions to the mesh on render
+				std::string bone_name = (*ii).first;
+				v3f bone_rot = (*ii).second;
+				irr::scene::IBoneSceneNode* bone = m_animated_meshnode->getJointNode(bone_name.c_str());
+				bone->setRotation(bone_rot);
+			}
 		}
 	}
 
@@ -1223,6 +1234,15 @@ public:
 
 			updateTexturePos();
 		}
+		else if(cmd == GENERIC_CMD_SET_ANIMATIONS)
+		{
+			int frame_start = readU16(is);
+			int frame_end = readU16(is);
+			float frame_speed = readF1000(is);
+			float frame_blend = readF1000(is);
+
+			updateAnimations(frame_start, frame_end, frame_speed, frame_blend);
+		}
 		else if(cmd == GENERIC_CMD_PUNCHED)
 		{
 			/*s16 damage =*/ readS16(is);
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 6c2abf8f6..9aeb88e71 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -706,6 +706,14 @@ void LuaEntitySAO::setSprite(v2s16 p, int num_frames, float framelength,
 	m_messages_out.push_back(aom);
 }
 
+void LuaEntitySAO::setAnimations(int frame_start, int frame_end, float frame_speed, float frame_blend)
+{
+	std::string str = gob_cmd_set_animations(frame_start, frame_end, frame_speed, frame_blend);
+	// create message and add to list
+	ActiveObjectMessage aom(getId(), true, str);
+	m_messages_out.push_back(aom);
+}
+
 std::string LuaEntitySAO::getName()
 {
 	return m_init_name;
diff --git a/src/content_sao.h b/src/content_sao.h
index 05c77e2cb..1cbf492b1 100644
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -73,6 +73,7 @@ public:
 	void setTextureMod(const std::string &mod);
 	void setSprite(v2s16 p, int num_frames, float framelength,
 			bool select_horiz_by_yawpitch);
+	void setAnimations(int frame_start, int frame_end, float frame_speed, float frame_blend);
 	std::string getName();
 private:
 	std::string getPropertyPacket();
diff --git a/src/genericobject.cpp b/src/genericobject.cpp
index 4ab031b5d..0914a13c5 100644
--- a/src/genericobject.cpp
+++ b/src/genericobject.cpp
@@ -92,6 +92,19 @@ std::string gob_cmd_set_sprite(
 	return os.str();
 }
 
+std::string gob_cmd_set_animations(int frame_start, int frame_end, float frame_speed, float frame_blend)
+{
+	std::ostringstream os(std::ios::binary);
+	// command 
+	writeU8(os, GENERIC_CMD_SET_ANIMATIONS);
+	// parameters
+	writeU16(os, frame_start);
+	writeU16(os, frame_end);
+	writeF1000(os, frame_speed);
+	writeF1000(os, frame_blend);
+	return os.str();
+}
+
 std::string gob_cmd_punched(s16 damage, s16 result_hp)
 {
 	std::ostringstream os(std::ios::binary);
diff --git a/src/genericobject.h b/src/genericobject.h
index 81563c19b..c57cce8ba 100644
--- a/src/genericobject.h
+++ b/src/genericobject.h
@@ -28,8 +28,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define GENERIC_CMD_UPDATE_POSITION 1
 #define GENERIC_CMD_SET_TEXTURE_MOD 2
 #define GENERIC_CMD_SET_SPRITE 3
-#define GENERIC_CMD_PUNCHED 4
-#define GENERIC_CMD_UPDATE_ARMOR_GROUPS 5
+#define GENERIC_CMD_SET_ANIMATIONS 4
+#define GENERIC_CMD_PUNCHED 5
+#define GENERIC_CMD_UPDATE_ARMOR_GROUPS 6
 
 #include "object_properties.h"
 std::string gob_cmd_set_properties(const ObjectProperties &prop);
@@ -54,6 +55,8 @@ std::string gob_cmd_set_sprite(
 	bool select_horiz_by_yawpitch
 );
 
+std::string gob_cmd_set_animations(int frame_start, int frame_end, float frame_speed, float frame_blend);
+
 std::string gob_cmd_punched(s16 damage, s16 result_hp);
 
 #include "itemgroup.h"
diff --git a/src/object_properties.cpp b/src/object_properties.cpp
index eb26db8d3..6b98356ac 100644
--- a/src/object_properties.cpp
+++ b/src/object_properties.cpp
@@ -32,9 +32,6 @@ ObjectProperties::ObjectProperties():
 	collisionbox(-0.5,-0.5,-0.5, 0.5,0.5,0.5),
 	visual("sprite"),
 	mesh(""),
-	animation_frames(1,1),
-	animation_speed(15),
-	animation_blend(0),
 	visual_size(1,1),
 	spritediv(1,1),
 	initial_sprite_basepos(0,0),
@@ -42,8 +39,8 @@ ObjectProperties::ObjectProperties():
 	makes_footstep_sound(false),
 	automatic_rotate(0)
 {
-	animation_bone_position[""] = v3f(0,0,0);
-	animation_bone_rotation[""] = v3f(0,0,0);
+	// Nothing to do for animation_bone_position
+	// Nothing to do for animation_bone_rotation
 	textures.push_back("unknown_object.png");
 }
 
@@ -56,9 +53,6 @@ std::string ObjectProperties::dump()
 	os<<", collisionbox="<<PP(collisionbox.MinEdge)<<","<<PP(collisionbox.MaxEdge);
 	os<<", visual="<<visual;
 	os<<", mesh="<<mesh;
-	os<<", animation_frames="<<animation_frames.X<<","<<animation_frames.Y;
-	os<<", animation_speed="<<animation_speed;
-	os<<", animation_blend="<<animation_blend;
 	os<<", visual_size="<<PP2(visual_size);
 
 	os<<", animation_bone_position=[";
@@ -99,10 +93,6 @@ void ObjectProperties::serialize(std::ostream &os) const
 	writeV3F1000(os, collisionbox.MaxEdge);
 	os<<serializeString(visual);
 	os<<serializeString(mesh);
-	writeF1000(os, animation_frames.X);
-	writeF1000(os, animation_frames.Y);
-	writeF1000(os, animation_speed);
-	writeF1000(os, animation_blend);
 
 	writeU16(os, animation_bone_position.size());
 	for(std::map<std::string, v3f>::const_iterator ii = animation_bone_position.begin(); ii != animation_bone_position.end(); ++ii){
@@ -140,10 +130,6 @@ void ObjectProperties::deSerialize(std::istream &is)
 	collisionbox.MaxEdge = readV3F1000(is);
 	visual = deSerializeString(is);
 	mesh = deSerializeString(is);
-	animation_frames.X = readF1000(is);
-	animation_frames.Y = readF1000(is);
-	animation_speed = readF1000(is);
-	animation_blend = readF1000(is);
 
 	u32 animation_bone_position_count = readU16(is);
 	for(u32 i=0; i<animation_bone_position_count; i++){
diff --git a/src/object_properties.h b/src/object_properties.h
index 3ab488f92..719b022ca 100644
--- a/src/object_properties.h
+++ b/src/object_properties.h
@@ -34,9 +34,6 @@ struct ObjectProperties
 	core::aabbox3d<f32> collisionbox;
 	std::string visual;
 	std::string mesh;
-	core::vector2d<int> animation_frames;
-	float animation_speed;
-	float animation_blend;
 	std::map<std::string, v3f> animation_bone_position;
 	std::map<std::string, v3f> animation_bone_rotation;
 	v2f visual_size;
diff --git a/src/scriptapi.cpp b/src/scriptapi.cpp
index 74de50ef8..32fb6e9bd 100644
--- a/src/scriptapi.cpp
+++ b/src/scriptapi.cpp
@@ -944,21 +944,6 @@ static void read_object_properties(lua_State *L, int index,
 		prop->visual_size = read_v2f(L, -1);
 	lua_pop(L, 1);
 
-	lua_getfield(L, -1, "animation_frames");
-	if(lua_istable(L, -1))
-	{
-		lua_rawgeti (L, -1, 1);
-		lua_rawgeti (L, -2, 2);
-		prop->animation_frames.X = lua_tonumber(L, -2);
-		prop->animation_frames.Y = lua_tonumber(L, -1);
-		lua_pop(L, 2);
-	}
-	lua_pop(L, 1);
-
-	getfloatfield(L, -1, "animation_speed", prop->animation_speed);
-
-	getfloatfield(L, -1, "animation_blend", prop->animation_blend);
-
 	lua_getfield(L, -1, "animation_bone_position");
 	if(lua_istable(L, -1))
 	{
@@ -2863,6 +2848,30 @@ private:
 		return 0;
 	}
 
+	// setanimations(self, mod)
+	static int l_setanimations(lua_State *L)
+	{
+		ObjectRef *ref = checkobject(L, 1);
+		LuaEntitySAO *co = getluaobject(ref);
+		if(co == NULL) return 0;
+		// Do it
+		v2s16 p(0,0);
+		int frame_start = 0;
+		if(!lua_isnil(L, 2))
+			frame_start = lua_tonumber(L, 2);
+		int frame_end = 0;
+		if(!lua_isnil(L, 3))
+			frame_end = lua_tonumber(L, 3);
+		float frame_speed = 15;
+		if(!lua_isnil(L, 4))
+			frame_speed = lua_tonumber(L, 4);
+		float frame_blend = 0;
+		if(!lua_isnil(L, 5))
+			frame_blend = lua_tonumber(L, 5);
+		co->setAnimations(frame_start, frame_end, frame_speed, frame_blend);
+		return 0;
+	}
+
 	// DEPRECATED
 	// get_entity_name(self)
 	static int l_get_entity_name(lua_State *L)
@@ -3062,6 +3071,7 @@ const luaL_reg ObjectRef::methods[] = {
 	method(ObjectRef, getyaw),
 	method(ObjectRef, settexturemod),
 	method(ObjectRef, setsprite),
+	method(ObjectRef, setanimations),
 	method(ObjectRef, get_entity_name),
 	method(ObjectRef, get_luaentity),
 	// Player-only

From 118285e6babd511c285780b07c275d527d7da9b1 Mon Sep 17 00:00:00 2001
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Fri, 26 Oct 2012 18:03:24 +0300
Subject: [PATCH 13/24] Get the new animation framework properly working

Store start and end frames as v2f

Also move bone animations to their own function instead of object properties
---
 doc/lua_api.txt           |  3 +-
 src/content_cao.cpp       | 55 ++++++++++++++---------
 src/content_sao.cpp       | 40 +++++++++++++----
 src/content_sao.h         |  5 ++-
 src/genericobject.cpp     | 17 +++++--
 src/genericobject.h       |  9 ++--
 src/object_properties.cpp | 46 -------------------
 src/object_properties.h   |  2 -
 src/scriptapi.cpp         | 93 ++++++++++++++++++---------------------
 src/serverobject.h        |  4 ++
 10 files changed, 139 insertions(+), 135 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 5515669d8..c99e8035a 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -1103,6 +1103,8 @@ methods:
 - get_wielded_item() -> ItemStack
 - set_wielded_item(item): replaces the wielded item, returns true if successful
 - set_armor_groups({group1=rating, group2=rating, ...})
+- set_animations({x=1,y=1}, frame_speed=15, frame_blend=0)
+- set_bone_posrot("", {x=0,y=0,z=0}, {x=0,y=0,z=0})
 - set_properties(object property table)
 LuaEntitySAO-only: (no-op for other objects)
 - setvelocity({x=num, y=num, z=num})
@@ -1116,7 +1118,6 @@ LuaEntitySAO-only: (no-op for other objects)
 -           select_horiz_by_yawpitch=false)
   ^ Select sprite from spritesheet with optional animation and DM-style
     texture selection based on yaw relative to camera
-- setanimations(frame_start, frame_end, frame_speed, frame_blend)
 - get_entity_name() (DEPRECATED: Will be removed in a future version)
 - get_luaentity()
 Player-only: (no-op for other objects)
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 1cd3926ca..b12bfe1c8 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -576,6 +576,10 @@ private:
 	v2s16 m_tx_basepos;
 	bool m_initial_tx_basepos_set;
 	bool m_tx_select_horiz_by_yawpitch;
+	v2f m_frames;
+	int m_frame_speed;
+	int m_frame_blend;
+	std::map<std::string, core::vector2d<v3f> > m_bone_posrot;
 	int m_anim_frame;
 	int m_anim_num_frames;
 	float m_anim_framelength;
@@ -924,6 +928,8 @@ public:
 			m_visuals_expired = false;
 			removeFromScene();
 			addToScene(m_smgr, m_gamedef->tsrc(), m_irr);
+			updateAnimations();
+			updateBonePosRot();
 		}
 
 		if(m_prop.physical){
@@ -1136,32 +1142,27 @@ public:
 		}
 	}
 
-	void updateAnimations(int frame_start, int frame_end, float frame_speed, float frame_blend)
+	void updateAnimations()
 	{
 		if(!m_animated_meshnode)
 			return;
 
-		m_animated_meshnode->setFrameLoop(frame_start, frame_end);
-		m_animated_meshnode->setAnimationSpeed(frame_speed);
-		m_animated_meshnode->setTransitionTime(frame_blend);
+		m_animated_meshnode->setFrameLoop((int)m_frames.X, (int)m_frames.Y);
+		m_animated_meshnode->setAnimationSpeed(m_frame_speed);
+		m_animated_meshnode->setTransitionTime(m_frame_blend);
+	}
 
-		if(m_prop.animation_bone_position.size() > 0)
+	void updateBonePosRot()
+	{
+		if(m_bone_posrot.size() > 0)
 		{
-			for(std::map<std::string, v3f>::const_iterator ii = m_prop.animation_bone_position.begin(); ii != m_prop.animation_bone_position.end(); ++ii){
-				m_animated_meshnode->setJointMode(irr::scene::EJUOR_CONTROL); // To write positions to the mesh on render
+			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_posrot.begin(); ii != m_bone_posrot.end(); ++ii){
 				std::string bone_name = (*ii).first;
-				v3f bone_pos = (*ii).second;
+				v3f bone_pos = (*ii).second.X;
+				v3f bone_rot = (*ii).second.Y;
 				irr::scene::IBoneSceneNode* bone = m_animated_meshnode->getJointNode(bone_name.c_str());
 				bone->setPosition(bone_pos);
-			}
-		}
-		if(m_prop.animation_bone_rotation.size() > 0)
-		{
-			for(std::map<std::string, v3f>::const_iterator ii = m_prop.animation_bone_rotation.begin(); ii != m_prop.animation_bone_rotation.end(); ++ii){
-				m_animated_meshnode->setJointMode(irr::scene::EJUOR_CONTROL); // To write positions to the mesh on render
-				std::string bone_name = (*ii).first;
-				v3f bone_rot = (*ii).second;
-				irr::scene::IBoneSceneNode* bone = m_animated_meshnode->getJointNode(bone_name.c_str());
 				bone->setRotation(bone_rot);
 			}
 		}
@@ -1236,12 +1237,22 @@ public:
 		}
 		else if(cmd == GENERIC_CMD_SET_ANIMATIONS)
 		{
-			int frame_start = readU16(is);
-			int frame_end = readU16(is);
-			float frame_speed = readF1000(is);
-			float frame_blend = readF1000(is);
+			m_frames = readV2F1000(is);
+			m_frame_speed = readF1000(is);
+			m_frame_blend = readF1000(is);
 
-			updateAnimations(frame_start, frame_end, frame_speed, frame_blend);
+			updateAnimations();
+			expireVisuals();
+		}
+		else if(cmd == GENERIC_CMD_SET_BONE_POSROT)
+		{
+			std::string bone = deSerializeString(is);
+			v3f position = readV3F1000(is);
+			v3f rotation = readV3F1000(is);
+			m_bone_posrot[bone] = core::vector2d<v3f>(position, rotation);
+
+			updateBonePosRot();
+			expireVisuals();
 		}
 		else if(cmd == GENERIC_CMD_PUNCHED)
 		{
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 9aeb88e71..bb38fa10e 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -644,6 +644,22 @@ void LuaEntitySAO::setArmorGroups(const ItemGroupList &armor_groups)
 	m_armor_groups_sent = false;
 }
 
+void LuaEntitySAO::setAnimations(v2f frames, float frame_speed, float frame_blend)
+{
+	std::string str = gob_cmd_set_animations(frames, frame_speed, frame_blend);
+	// create message and add to list
+	ActiveObjectMessage aom(getId(), true, str);
+	m_messages_out.push_back(aom);
+}
+
+void LuaEntitySAO::setBonePosRot(std::string bone, v3f position, v3f rotation)
+{
+	std::string str = gob_cmd_set_bone_posrot(bone, position, rotation);
+	// create message and add to list
+	ActiveObjectMessage aom(getId(), true, str);
+	m_messages_out.push_back(aom);
+}
+
 ObjectProperties* LuaEntitySAO::accessObjectProperties()
 {
 	return &m_prop;
@@ -706,14 +722,6 @@ void LuaEntitySAO::setSprite(v2s16 p, int num_frames, float framelength,
 	m_messages_out.push_back(aom);
 }
 
-void LuaEntitySAO::setAnimations(int frame_start, int frame_end, float frame_speed, float frame_blend)
-{
-	std::string str = gob_cmd_set_animations(frame_start, frame_end, frame_speed, frame_blend);
-	// create message and add to list
-	ActiveObjectMessage aom(getId(), true, str);
-	m_messages_out.push_back(aom);
-}
-
 std::string LuaEntitySAO::getName()
 {
 	return m_init_name;
@@ -1085,6 +1093,22 @@ void PlayerSAO::setArmorGroups(const ItemGroupList &armor_groups)
 	m_armor_groups_sent = false;
 }
 
+void PlayerSAO::setAnimations(v2f frames, float frame_speed, float frame_blend)
+{
+	std::string str = gob_cmd_set_animations(frames, frame_speed, frame_blend);
+	// create message and add to list
+	ActiveObjectMessage aom(getId(), true, str);
+	m_messages_out.push_back(aom);
+}
+
+void PlayerSAO::setBonePosRot(std::string bone, v3f position, v3f rotation)
+{
+	std::string str = gob_cmd_set_bone_posrot(bone, position, rotation);
+	// create message and add to list
+	ActiveObjectMessage aom(getId(), true, str);
+	m_messages_out.push_back(aom);
+}
+
 ObjectProperties* PlayerSAO::accessObjectProperties()
 {
 	return &m_prop;
diff --git a/src/content_sao.h b/src/content_sao.h
index 1cbf492b1..cba2729ae 100644
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -61,6 +61,8 @@ public:
 	void setHP(s16 hp);
 	s16 getHP() const;
 	void setArmorGroups(const ItemGroupList &armor_groups);
+	void setAnimations(v2f frames, float frame_speed, float frame_blend);
+	void setBonePosRot(std::string bone, v3f position, v3f rotation);
 	ObjectProperties* accessObjectProperties();
 	void notifyObjectPropertiesModified();
 	/* LuaEntitySAO-specific */
@@ -73,7 +75,6 @@ public:
 	void setTextureMod(const std::string &mod);
 	void setSprite(v2s16 p, int num_frames, float framelength,
 			bool select_horiz_by_yawpitch);
-	void setAnimations(int frame_start, int frame_end, float frame_speed, float frame_blend);
 	std::string getName();
 private:
 	std::string getPropertyPacket();
@@ -143,6 +144,8 @@ public:
 	void setHP(s16 hp);
 	
 	void setArmorGroups(const ItemGroupList &armor_groups);
+	void setAnimations(v2f frames, float frame_speed, float frame_blend);
+	void setBonePosRot(std::string bone, v3f position, v3f rotation);
 	ObjectProperties* accessObjectProperties();
 	void notifyObjectPropertiesModified();
 
diff --git a/src/genericobject.cpp b/src/genericobject.cpp
index 0914a13c5..d915d78a5 100644
--- a/src/genericobject.cpp
+++ b/src/genericobject.cpp
@@ -92,19 +92,30 @@ std::string gob_cmd_set_sprite(
 	return os.str();
 }
 
-std::string gob_cmd_set_animations(int frame_start, int frame_end, float frame_speed, float frame_blend)
+std::string gob_cmd_set_animations(v2f frames, float frame_speed, float frame_blend)
 {
 	std::ostringstream os(std::ios::binary);
 	// command 
 	writeU8(os, GENERIC_CMD_SET_ANIMATIONS);
 	// parameters
-	writeU16(os, frame_start);
-	writeU16(os, frame_end);
+	writeV2F1000(os, frames);
 	writeF1000(os, frame_speed);
 	writeF1000(os, frame_blend);
 	return os.str();
 }
 
+std::string gob_cmd_set_bone_posrot(std::string bone, v3f position, v3f rotation)
+{
+	std::ostringstream os(std::ios::binary);
+	// command 
+	writeU8(os, GENERIC_CMD_SET_BONE_POSROT);
+	// parameters
+	os<<serializeString(bone);
+	writeV3F1000(os, position);
+	writeV3F1000(os, rotation);
+	return os.str();
+}
+
 std::string gob_cmd_punched(s16 damage, s16 result_hp)
 {
 	std::ostringstream os(std::ios::binary);
diff --git a/src/genericobject.h b/src/genericobject.h
index c57cce8ba..7e3e9d96f 100644
--- a/src/genericobject.h
+++ b/src/genericobject.h
@@ -29,8 +29,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define GENERIC_CMD_SET_TEXTURE_MOD 2
 #define GENERIC_CMD_SET_SPRITE 3
 #define GENERIC_CMD_SET_ANIMATIONS 4
-#define GENERIC_CMD_PUNCHED 5
-#define GENERIC_CMD_UPDATE_ARMOR_GROUPS 6
+#define GENERIC_CMD_SET_BONE_POSROT 5
+#define GENERIC_CMD_PUNCHED 6
+#define GENERIC_CMD_UPDATE_ARMOR_GROUPS 7
 
 #include "object_properties.h"
 std::string gob_cmd_set_properties(const ObjectProperties &prop);
@@ -55,7 +56,9 @@ std::string gob_cmd_set_sprite(
 	bool select_horiz_by_yawpitch
 );
 
-std::string gob_cmd_set_animations(int frame_start, int frame_end, float frame_speed, float frame_blend);
+std::string gob_cmd_set_animations(v2f frames, float frame_speed, float frame_blend);
+
+std::string gob_cmd_set_bone_posrot(std::string bone, v3f position, v3f rotation);
 
 std::string gob_cmd_punched(s16 damage, s16 result_hp);
 
diff --git a/src/object_properties.cpp b/src/object_properties.cpp
index 6b98356ac..57e255f58 100644
--- a/src/object_properties.cpp
+++ b/src/object_properties.cpp
@@ -39,8 +39,6 @@ ObjectProperties::ObjectProperties():
 	makes_footstep_sound(false),
 	automatic_rotate(0)
 {
-	// Nothing to do for animation_bone_position
-	// Nothing to do for animation_bone_rotation
 	textures.push_back("unknown_object.png");
 }
 
@@ -54,22 +52,6 @@ std::string ObjectProperties::dump()
 	os<<", visual="<<visual;
 	os<<", mesh="<<mesh;
 	os<<", visual_size="<<PP2(visual_size);
-
-	os<<", animation_bone_position=[";
-	for(std::map<std::string, v3f>::const_iterator ii = animation_bone_position.begin(); ii != animation_bone_position.end(); ++ii){
-		std::string bone_name = (*ii).first;
-		v3f bone_pos = (*ii).second;
-		os<<bone_name<<" "<<bone_pos.X<<","<<bone_pos.Y<<","<<bone_pos.Z<<"\"";
-	}
-	os<<"]";
-	os<<", animation_bone_rotation=[";
-	for(std::map<std::string, v3f>::const_iterator ii = animation_bone_rotation.begin(); ii != animation_bone_rotation.end(); ++ii){
-		std::string bone_name = (*ii).first;
-		v3f bone_rot = (*ii).second;
-		os<<bone_name<<" "<<bone_rot.X<<","<<bone_rot.Y<<","<<bone_rot.Z<<"\"";
-	}
-	os<<"]";
-
 	os<<", textures=[";
 	for(u32 i=0; i<textures.size(); i++){
 		os<<"\""<<textures[i]<<"\" ";
@@ -93,24 +75,11 @@ void ObjectProperties::serialize(std::ostream &os) const
 	writeV3F1000(os, collisionbox.MaxEdge);
 	os<<serializeString(visual);
 	os<<serializeString(mesh);
-
-	writeU16(os, animation_bone_position.size());
-	for(std::map<std::string, v3f>::const_iterator ii = animation_bone_position.begin(); ii != animation_bone_position.end(); ++ii){
-		os<<serializeString((*ii).first);
-		writeV3F1000(os, (*ii).second);
-	}
-	writeU16(os, animation_bone_rotation.size());
-	for(std::map<std::string, v3f>::const_iterator ii = animation_bone_rotation.begin(); ii != animation_bone_rotation.end(); ++ii){
-		os<<serializeString((*ii).first);
-		writeV3F1000(os, (*ii).second);
-	}
-
 	writeV2F1000(os, visual_size);
 	writeU16(os, textures.size());
 	for(u32 i=0; i<textures.size(); i++){
 		os<<serializeString(textures[i]);
 	}
-
 	writeV2S16(os, spritediv);
 	writeV2S16(os, initial_sprite_basepos);
 	writeU8(os, is_visible);
@@ -130,27 +99,12 @@ void ObjectProperties::deSerialize(std::istream &is)
 	collisionbox.MaxEdge = readV3F1000(is);
 	visual = deSerializeString(is);
 	mesh = deSerializeString(is);
-
-	u32 animation_bone_position_count = readU16(is);
-	for(u32 i=0; i<animation_bone_position_count; i++){
-		std::string bone_name = deSerializeString(is);
-		v3f bone_pos = readV3F1000(is);
-		animation_bone_position[bone_name] = bone_pos;
-	}
-	u32 animation_bone_rotation_count = readU16(is);
-	for(u32 i=0; i<animation_bone_rotation_count; i++){
-		std::string bone_name = deSerializeString(is);
-		v3f bone_rot = readV3F1000(is);
-		animation_bone_rotation[bone_name] = bone_rot;
-	}
-
 	visual_size = readV2F1000(is);
 	textures.clear();
 	u32 texture_count = readU16(is);
 	for(u32 i=0; i<texture_count; i++){
 		textures.push_back(deSerializeString(is));
 	}
-
 	spritediv = readV2S16(is);
 	initial_sprite_basepos = readV2S16(is);
 	is_visible = readU8(is);
diff --git a/src/object_properties.h b/src/object_properties.h
index 719b022ca..53d482904 100644
--- a/src/object_properties.h
+++ b/src/object_properties.h
@@ -34,8 +34,6 @@ struct ObjectProperties
 	core::aabbox3d<f32> collisionbox;
 	std::string visual;
 	std::string mesh;
-	std::map<std::string, v3f> animation_bone_position;
-	std::map<std::string, v3f> animation_bone_rotation;
 	v2f visual_size;
 	core::array<std::string> textures;
 	v2s16 spritediv;
diff --git a/src/scriptapi.cpp b/src/scriptapi.cpp
index 32fb6e9bd..3e187d2f6 100644
--- a/src/scriptapi.cpp
+++ b/src/scriptapi.cpp
@@ -944,30 +944,6 @@ static void read_object_properties(lua_State *L, int index,
 		prop->visual_size = read_v2f(L, -1);
 	lua_pop(L, 1);
 
-	lua_getfield(L, -1, "animation_bone_position");
-	if(lua_istable(L, -1))
-	{
-		lua_rawgeti (L, -1, 1);
-		lua_rawgeti (L, -2, 2);
-		std::string bone_name = lua_tostring(L, -2);
-		v3f bone_pos = read_v3f(L, -1);
-		prop->animation_bone_position[bone_name] = bone_pos;
-		lua_pop(L, 2);
-	}
-	lua_pop(L, 1);
-
-	lua_getfield(L, -1, "animation_bone_rotation");
-	if(lua_istable(L, -1))
-	{
-		lua_rawgeti (L, -1, 1);
-		lua_rawgeti (L, -2, 2);
-		std::string bone_name = lua_tostring(L, -2);
-		v3f bone_rot = read_v3f(L, -1);
-		prop->animation_bone_rotation[bone_name] = bone_rot;
-		lua_pop(L, 2);
-	}
-	lua_pop(L, 1);
-
 	lua_getfield(L, -1, "textures");
 	if(lua_istable(L, -1)){
 		prop->textures.clear();
@@ -2723,6 +2699,48 @@ private:
 		return 0;
 	}
 
+	// setanimations(self, frames, frame_speed, frame_blend)
+	static int l_set_animations(lua_State *L)
+	{
+		ObjectRef *ref = checkobject(L, 1);
+		ServerActiveObject *co = getobject(ref);
+		if(co == NULL) return 0;
+		// Do it
+
+		v2f frames = v2f(1, 1);
+		if(!lua_isnil(L, 2))
+			frames = read_v2f(L, 2);
+		float frame_speed = 15;
+		if(!lua_isnil(L, 3))
+			frame_speed = lua_tonumber(L, 3);
+		float frame_blend = 0;
+		if(!lua_isnil(L, 4))
+			frame_blend = lua_tonumber(L, 4);
+		co->setAnimations(frames, frame_speed, frame_blend);
+		return 0;
+	}
+
+	// setboneposrot(std::string bone, v3f position, v3f rotation)
+	static int l_set_bone_posrot(lua_State *L)
+	{
+		ObjectRef *ref = checkobject(L, 1);
+		ServerActiveObject *co = getobject(ref);
+		if(co == NULL) return 0;
+		// Do it
+
+		std::string bone = "";
+		if(!lua_isnil(L, 2))
+			bone = lua_tostring(L, 2);
+		v3f position = v3f(0, 0, 0);
+		if(!lua_isnil(L, 3))
+			position = read_v3f(L, 3);
+		v3f rotation = v3f(0, 0, 0);
+		if(!lua_isnil(L, 4))
+			rotation = read_v3f(L, 4);
+		co->setBonePosRot(bone, position, rotation);
+		return 0;
+	}
+
 	// set_properties(self, properties)
 	static int l_set_properties(lua_State *L)
 	{
@@ -2848,30 +2866,6 @@ private:
 		return 0;
 	}
 
-	// setanimations(self, mod)
-	static int l_setanimations(lua_State *L)
-	{
-		ObjectRef *ref = checkobject(L, 1);
-		LuaEntitySAO *co = getluaobject(ref);
-		if(co == NULL) return 0;
-		// Do it
-		v2s16 p(0,0);
-		int frame_start = 0;
-		if(!lua_isnil(L, 2))
-			frame_start = lua_tonumber(L, 2);
-		int frame_end = 0;
-		if(!lua_isnil(L, 3))
-			frame_end = lua_tonumber(L, 3);
-		float frame_speed = 15;
-		if(!lua_isnil(L, 4))
-			frame_speed = lua_tonumber(L, 4);
-		float frame_blend = 0;
-		if(!lua_isnil(L, 5))
-			frame_blend = lua_tonumber(L, 5);
-		co->setAnimations(frame_start, frame_end, frame_speed, frame_blend);
-		return 0;
-	}
-
 	// DEPRECATED
 	// get_entity_name(self)
 	static int l_get_entity_name(lua_State *L)
@@ -3061,6 +3055,8 @@ const luaL_reg ObjectRef::methods[] = {
 	method(ObjectRef, get_wielded_item),
 	method(ObjectRef, set_wielded_item),
 	method(ObjectRef, set_armor_groups),
+	method(ObjectRef, set_animations),
+	method(ObjectRef, set_bone_posrot),
 	method(ObjectRef, set_properties),
 	// LuaEntitySAO-only
 	method(ObjectRef, setvelocity),
@@ -3071,7 +3067,6 @@ const luaL_reg ObjectRef::methods[] = {
 	method(ObjectRef, getyaw),
 	method(ObjectRef, settexturemod),
 	method(ObjectRef, setsprite),
-	method(ObjectRef, setanimations),
 	method(ObjectRef, get_entity_name),
 	method(ObjectRef, get_luaentity),
 	// Player-only
diff --git a/src/serverobject.h b/src/serverobject.h
index ece53fd98..61991bedf 100644
--- a/src/serverobject.h
+++ b/src/serverobject.h
@@ -152,6 +152,10 @@ public:
 
 	virtual void setArmorGroups(const ItemGroupList &armor_groups)
 	{}
+	virtual void setAnimations(v2f frames, float frame_speed, float frame_blend)
+	{}
+	virtual void setBonePosRot(std::string bone, v3f position, v3f rotation)
+	{}
 	virtual ObjectProperties* accessObjectProperties()
 	{ return NULL; }
 	virtual void notifyObjectPropertiesModified()

From e42eeec8f626acbaa54ae31c10ca06c868c7931c Mon Sep 17 00:00:00 2001
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 27 Oct 2012 01:49:01 +0300
Subject: [PATCH 14/24] Framework for the attachment system, new object
 property which allows changing the color and alpha of mesh materials

New object property which allows changing the color and alpha of mesh materials. Due to the current lighting systems it doesn't work yet, but the full implementation is there

Framework for the attachment system, with no actual functionality yet

Send bone and player object to the setAttachment function in content_sao.cpp, but we need a way to translate it there and send it to the client

I will also want position and rotation offsets to be possible to apply to attachments

Network object ID from server to client. This will be used to identify the parent client-side and know what to attach to
---
 doc/lua_api.txt           |  3 +--
 src/content_cao.cpp       | 40 ++++++++++++++++++++++++++++++++++
 src/content_sao.cpp       | 26 ++++++++++++++++++++++
 src/content_sao.h         |  2 ++
 src/genericobject.cpp     | 11 ++++++++++
 src/genericobject.h       |  7 ++++--
 src/object_properties.cpp | 15 +++++++++++++
 src/object_properties.h   |  1 +
 src/scriptapi.cpp         | 45 +++++++++++++++++++++++++++++++++++++++
 src/serverobject.h        |  2 ++
 src/util/serialize.h      | 33 ++++++++++++++++++++++++++++
 11 files changed, 181 insertions(+), 4 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index c99e8035a..cb84b5459 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -1232,9 +1232,8 @@ Object Properties
     visual = "cube"/"sprite"/"upright_sprite"/"mesh",
     visual_size = {x=1, y=1},
     mesh = "model",
-    animation_bone_position = {"", {x=0, y=0, z=0}}, -- bone name followed by position vector
-    animation_bone_rotation = {"", {x=0, y=0, z=0}}, -- bone name followed by rotation vector
     textures = {}, -- number of required textures depends on visual
+    colors = {}, -- number of required colors depends on visual
     spritediv = {x=1, y=1},
     initial_sprite_basepos = {x=0, y=0},
     is_visible = true,
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index b12bfe1c8..3e18337d2 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -555,6 +555,7 @@ private:
 	std::string m_name;
 	bool m_is_player;
 	bool m_is_local_player; // determined locally
+	int m_id;
 	// Property-ish things
 	ObjectProperties m_prop;
 	//
@@ -596,6 +597,7 @@ public:
 		//
 		m_is_player(false),
 		m_is_local_player(false),
+		m_id(0),
 		//
 		m_smgr(NULL),
 		m_irr(NULL),
@@ -640,6 +642,7 @@ public:
 		}
 		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);
@@ -930,6 +933,7 @@ public:
 			addToScene(m_smgr, m_gamedef->tsrc(), m_irr);
 			updateAnimations();
 			updateBonePosRot();
+			updateAttachment();
 		}
 
 		if(m_prop.physical){
@@ -1062,6 +1066,10 @@ public:
 				texturestring += mod;
 				m_spritenode->setMaterialTexture(0,
 						tsrc->getTextureRaw(texturestring));
+
+				// Does not work yet with the current lighting settings
+				m_meshnode->getMaterial(0).AmbientColor = m_prop.colors[0];
+				m_meshnode->getMaterial(0).DiffuseColor = m_prop.colors[0];
 			}
 		}
 		if(m_animated_meshnode)
@@ -1087,6 +1095,12 @@ public:
 					material.setFlag(video::EMF_LIGHTING, false);
 					material.setFlag(video::EMF_BILINEAR_FILTER, false);
 				}
+				for (u32 i = 0; i < m_prop.colors.size(); ++i)
+				{
+					// Does not work yet with the current lighting settings
+					m_animated_meshnode->getMaterial(i).AmbientColor = m_prop.colors[i];
+					m_animated_meshnode->getMaterial(i).DiffuseColor = m_prop.colors[i];
+				}
 			}
 		}
 		if(m_meshnode)
@@ -1113,6 +1127,10 @@ public:
 					material.setTexture(0, atlas);
 					material.getTextureMatrix(0).setTextureTranslate(pos.X, pos.Y);
 					material.getTextureMatrix(0).setTextureScale(size.X, size.Y);
+
+					// Does not work yet with the current lighting settings
+					m_meshnode->getMaterial(i).AmbientColor = m_prop.colors[i];
+					m_meshnode->getMaterial(i).DiffuseColor = m_prop.colors[i];
 				}
 			}
 			else if(m_prop.visual == "upright_sprite")
@@ -1126,6 +1144,10 @@ public:
 					scene::IMeshBuffer *buf = mesh->getMeshBuffer(0);
 					buf->getMaterial().setTexture(0,
 							tsrc->getTextureRaw(tname));
+					
+					// Does not work yet with the current lighting settings
+					m_meshnode->getMaterial(0).AmbientColor = m_prop.colors[0];
+					m_meshnode->getMaterial(0).DiffuseColor = m_prop.colors[0];
 				}
 				{
 					std::string tname = "unknown_object.png";
@@ -1137,6 +1159,10 @@ public:
 					scene::IMeshBuffer *buf = mesh->getMeshBuffer(1);
 					buf->getMaterial().setTexture(0,
 							tsrc->getTextureRaw(tname));
+
+					// Does not work yet with the current lighting settings
+					m_meshnode->getMaterial(1).AmbientColor = m_prop.colors[1]; 
+					m_meshnode->getMaterial(1).DiffuseColor = m_prop.colors[1]; 
 				}
 			}
 		}
@@ -1168,6 +1194,11 @@ public:
 		}
 	}
 
+	void updateAttachment()
+	{
+		// Code for attachments goes here
+	}
+
 	void processMessage(const std::string &data)
 	{
 		//infostream<<"GenericCAO: Got message"<<std::endl;
@@ -1254,6 +1285,15 @@ public:
 			updateBonePosRot();
 			expireVisuals();
 		}
+		else if(cmd == GENERIC_CMD_SET_ATTACHMENT)
+		{
+			// Part of the attachment structure, not used yet!
+
+			// Get properties here.
+
+			updateAttachment();
+			expireVisuals();
+		}
 		else if(cmd == GENERIC_CMD_PUNCHED)
 		{
 			/*s16 damage =*/ readS16(is);
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index bb38fa10e..b23d287f4 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -504,6 +504,7 @@ std::string LuaEntitySAO::getClientInitializationData()
 	std::ostringstream os(std::ios::binary);
 	writeU8(os, 0); // version
 	os<<serializeString(""); // name
+	writeS16(os, getId()); //id
 	writeU8(os, 0); // is_player
 	writeV3F1000(os, m_base_position);
 	writeF1000(os, m_yaw);
@@ -660,6 +661,19 @@ void LuaEntitySAO::setBonePosRot(std::string bone, v3f position, v3f rotation)
 	m_messages_out.push_back(aom);
 }
 
+// Part of the attachment structure, not used yet!
+void LuaEntitySAO::setAttachment(ServerActiveObject *parent, std::string bone, v3f position, v3f rotation)
+{
+	// Parent should be translated from a ServerActiveObject into something
+	// the client will recognize (as a ClientActiveObject) then sent in
+	// gob_cmd_set_attachment that way.
+
+	std::string str = gob_cmd_set_attachment(); // <- parameters here
+	// create message and add to list
+	ActiveObjectMessage aom(getId(), true, str);
+	m_messages_out.push_back(aom);
+}
+
 ObjectProperties* LuaEntitySAO::accessObjectProperties()
 {
 	return &m_prop;
@@ -804,6 +818,8 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, Player *player_, u16 peer_id_,
 	m_prop.textures.clear();
 	m_prop.textures.push_back("player.png");
 	m_prop.textures.push_back("player_back.png");
+	m_prop.colors.clear();
+	m_prop.colors.push_back(video::SColor(255, 255, 255, 255));
 	m_prop.spritediv = v2s16(1,1);
 	// end of default appearance
 	m_prop.is_visible = (getHP() != 0); // TODO: Use a death animation instead for mesh players
@@ -860,6 +876,7 @@ std::string PlayerSAO::getClientInitializationData()
 	writeU8(os, 0); // version
 	os<<serializeString(m_player->getName()); // name
 	writeU8(os, 1); // is_player
+	writeS16(os, getId()); //id
 	writeV3F1000(os, m_player->getPosition() + v3f(0,BS*1,0));
 	writeF1000(os, m_player->getYaw());
 	writeS16(os, getHP());
@@ -1109,6 +1126,15 @@ void PlayerSAO::setBonePosRot(std::string bone, v3f position, v3f rotation)
 	m_messages_out.push_back(aom);
 }
 
+// Part of the attachment structure, not used yet!
+void PlayerSAO::setAttachment(ServerActiveObject *parent, std::string bone, v3f position, v3f rotation)
+{	
+	std::string str = gob_cmd_set_attachment(); // <- parameters here
+	// create message and add to list
+	ActiveObjectMessage aom(getId(), true, str);
+	m_messages_out.push_back(aom);
+}
+
 ObjectProperties* PlayerSAO::accessObjectProperties()
 {
 	return &m_prop;
diff --git a/src/content_sao.h b/src/content_sao.h
index cba2729ae..a89f2ddd4 100644
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -63,6 +63,7 @@ public:
 	void setArmorGroups(const ItemGroupList &armor_groups);
 	void setAnimations(v2f frames, float frame_speed, float frame_blend);
 	void setBonePosRot(std::string bone, v3f position, v3f rotation);
+	void setAttachment(ServerActiveObject *parent, std::string bone, v3f position, v3f rotation);
 	ObjectProperties* accessObjectProperties();
 	void notifyObjectPropertiesModified();
 	/* LuaEntitySAO-specific */
@@ -146,6 +147,7 @@ public:
 	void setArmorGroups(const ItemGroupList &armor_groups);
 	void setAnimations(v2f frames, float frame_speed, float frame_blend);
 	void setBonePosRot(std::string bone, v3f position, v3f rotation);
+	void setAttachment(ServerActiveObject *parent, std::string bone, v3f position, v3f rotation);
 	ObjectProperties* accessObjectProperties();
 	void notifyObjectPropertiesModified();
 
diff --git a/src/genericobject.cpp b/src/genericobject.cpp
index d915d78a5..482dbbc78 100644
--- a/src/genericobject.cpp
+++ b/src/genericobject.cpp
@@ -104,6 +104,17 @@ std::string gob_cmd_set_animations(v2f frames, float frame_speed, float frame_bl
 	return os.str();
 }
 
+// Part of the attachment structure, not used yet!
+std::string gob_cmd_set_attachment() // <- parameters here
+{
+	std::ostringstream os(std::ios::binary);
+	// command 
+	writeU8(os, GENERIC_CMD_SET_ATTACHMENT);
+	// parameters
+	// Parameters go here
+	return os.str();
+}
+
 std::string gob_cmd_set_bone_posrot(std::string bone, v3f position, v3f rotation)
 {
 	std::ostringstream os(std::ios::binary);
diff --git a/src/genericobject.h b/src/genericobject.h
index 7e3e9d96f..d20e7b3d0 100644
--- a/src/genericobject.h
+++ b/src/genericobject.h
@@ -30,8 +30,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define GENERIC_CMD_SET_SPRITE 3
 #define GENERIC_CMD_SET_ANIMATIONS 4
 #define GENERIC_CMD_SET_BONE_POSROT 5
-#define GENERIC_CMD_PUNCHED 6
-#define GENERIC_CMD_UPDATE_ARMOR_GROUPS 7
+#define GENERIC_CMD_SET_ATTACHMENT 6
+#define GENERIC_CMD_PUNCHED 7
+#define GENERIC_CMD_UPDATE_ARMOR_GROUPS 8
 
 #include "object_properties.h"
 std::string gob_cmd_set_properties(const ObjectProperties &prop);
@@ -60,6 +61,8 @@ std::string gob_cmd_set_animations(v2f frames, float frame_speed, float frame_bl
 
 std::string gob_cmd_set_bone_posrot(std::string bone, v3f position, v3f rotation);
 
+std::string gob_cmd_set_attachment(); // <- parameters here
+
 std::string gob_cmd_punched(s16 damage, s16 result_hp);
 
 #include "itemgroup.h"
diff --git a/src/object_properties.cpp b/src/object_properties.cpp
index 57e255f58..79b3eaf72 100644
--- a/src/object_properties.cpp
+++ b/src/object_properties.cpp
@@ -18,6 +18,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "object_properties.h"
+#include "irrlichttypes_bloated.h"
 #include "util/serialize.h"
 #include <sstream>
 #include <map>
@@ -40,6 +41,7 @@ ObjectProperties::ObjectProperties():
 	automatic_rotate(0)
 {
 	textures.push_back("unknown_object.png");
+	colors.push_back(video::SColor(255,255,255,255));
 }
 
 std::string ObjectProperties::dump()
@@ -57,6 +59,11 @@ std::string ObjectProperties::dump()
 		os<<"\""<<textures[i]<<"\" ";
 	}
 	os<<"]";
+	os<<", colors=[";
+	for(u32 i=0; i<colors.size(); i++){
+		os<<"\""<<colors[i].getAlpha()<<","<<colors[i].getRed()<<","<<colors[i].getGreen()<<","<<colors[i].getBlue()<<"\" ";
+	}
+	os<<"]";
 	os<<", spritediv="<<PP2(spritediv);
 	os<<", initial_sprite_basepos="<<PP2(initial_sprite_basepos);
 	os<<", is_visible="<<is_visible;
@@ -80,6 +87,10 @@ void ObjectProperties::serialize(std::ostream &os) const
 	for(u32 i=0; i<textures.size(); i++){
 		os<<serializeString(textures[i]);
 	}
+	writeU16(os, colors.size());
+	for(u32 i=0; i<colors.size(); i++){
+		writeARGB8(os, colors[i]);
+	}
 	writeV2S16(os, spritediv);
 	writeV2S16(os, initial_sprite_basepos);
 	writeU8(os, is_visible);
@@ -105,6 +116,10 @@ void ObjectProperties::deSerialize(std::istream &is)
 	for(u32 i=0; i<texture_count; i++){
 		textures.push_back(deSerializeString(is));
 	}
+	u32 color_count = readU16(is);
+	for(u32 i=0; i<color_count; i++){
+		colors.push_back(readARGB8(is));
+	}
 	spritediv = readV2S16(is);
 	initial_sprite_basepos = readV2S16(is);
 	is_visible = readU8(is);
diff --git a/src/object_properties.h b/src/object_properties.h
index 53d482904..d7d44625e 100644
--- a/src/object_properties.h
+++ b/src/object_properties.h
@@ -36,6 +36,7 @@ struct ObjectProperties
 	std::string mesh;
 	v2f visual_size;
 	core::array<std::string> textures;
+	core::array<video::SColor> colors;
 	v2s16 spritediv;
 	v2s16 initial_sprite_basepos;
 	bool is_visible;
diff --git a/src/scriptapi.cpp b/src/scriptapi.cpp
index 3e187d2f6..9c5bbcc5b 100644
--- a/src/scriptapi.cpp
+++ b/src/scriptapi.cpp
@@ -960,6 +960,23 @@ static void read_object_properties(lua_State *L, int index,
 		}
 	}
 	lua_pop(L, 1);
+
+	lua_getfield(L, -1, "colors");
+	if(lua_istable(L, -1)){
+		prop->colors.clear();
+		int table = lua_gettop(L);
+		lua_pushnil(L);
+		while(lua_next(L, table) != 0){
+			// key at index -2 and value at index -1
+			if(lua_isstring(L, -1))
+				prop->colors.push_back(readARGB8(L, -1));
+			else
+				prop->colors.push_back(video::SColor(255, 255, 255, 255));
+			// removes value, keeps key for next iteration
+			lua_pop(L, 1);
+		}
+	}
+	lua_pop(L, 1);
 	
 	lua_getfield(L, -1, "spritediv");
 	if(lua_istable(L, -1))
@@ -2741,6 +2758,33 @@ private:
 		return 0;
 	}
 
+// Part of the attachment structure, not used yet!
+	// set_attachment() // <- parameters here
+	static int l_set_attachment(lua_State *L)
+	{
+		ObjectRef *ref = checkobject(L, 1);
+		ObjectRef *parent_ref = checkobject(L, 2);
+		ServerActiveObject *co = getobject(ref);
+		ServerActiveObject *parent = getobject(parent_ref);
+		if(co == NULL) return 0;
+		if(parent == NULL) return 0;
+		std::string bone = "";
+		if(!lua_isnil(L, 3))
+			bone = lua_tostring(L, 3);
+		v3f position = v3f(0, 0, 0);
+		if(!lua_isnil(L, 4))
+			position = read_v3f(L, 4);
+		v3f rotation = v3f(0, 0, 0);
+		if(!lua_isnil(L, 5))
+			rotation = read_v3f(L, 5);
+		// Do it
+	
+//lua_pushnumber(L, cobj->getId()); // Push id
+
+		co->setAttachment(parent, bone, position, rotation);
+		return 0;
+	}
+
 	// set_properties(self, properties)
 	static int l_set_properties(lua_State *L)
 	{
@@ -3057,6 +3101,7 @@ const luaL_reg ObjectRef::methods[] = {
 	method(ObjectRef, set_armor_groups),
 	method(ObjectRef, set_animations),
 	method(ObjectRef, set_bone_posrot),
+	method(ObjectRef, set_attachment),
 	method(ObjectRef, set_properties),
 	// LuaEntitySAO-only
 	method(ObjectRef, setvelocity),
diff --git a/src/serverobject.h b/src/serverobject.h
index 61991bedf..3dcb99552 100644
--- a/src/serverobject.h
+++ b/src/serverobject.h
@@ -156,6 +156,8 @@ public:
 	{}
 	virtual void setBonePosRot(std::string bone, v3f position, v3f rotation)
 	{}
+	virtual void setAttachment(ServerActiveObject *parent, std::string bone, v3f position, v3f rotation)
+	{}
 	virtual ObjectProperties* accessObjectProperties()
 	{ return NULL; }
 	virtual void notifyObjectPropertiesModified()
diff --git a/src/util/serialize.h b/src/util/serialize.h
index 50a002c10..d552dec94 100644
--- a/src/util/serialize.h
+++ b/src/util/serialize.h
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define UTIL_SERIALIZE_HEADER
 
 #include "../irrlichttypes.h"
+#include "../irrlichttypes_bloated.h"
 #include "../irr_v2d.h"
 #include "../irr_v3d.h"
 #include <iostream>
@@ -197,6 +198,24 @@ inline v3s16 readV3S16(u8 *data)
 	return p;
 }
 
+inline void writeARGB8(u8 *data, video::SColor p)
+{
+	writeU8(&data[0], p.getAlpha());
+	writeU8(&data[1], p.getRed());
+	writeU8(&data[2], p.getGreen());
+	writeU8(&data[3], p.getBlue());
+}
+
+inline video::SColor readARGB8(u8 *data)
+{
+	video::SColor p;
+	p.setAlpha(readU8(&data[0]));
+	p.setRed(readU8(&data[1]));
+	p.setGreen(readU8(&data[2]));
+	p.setBlue(readU8(&data[3]));
+	return p;
+}
+
 /*
 	The above stuff directly interfaced to iostream
 */
@@ -344,6 +363,20 @@ inline v3s16 readV3S16(std::istream &is)
 	return readV3S16((u8*)buf);
 }
 
+inline void writeARGB8(std::ostream &os, video::SColor p)
+{
+	char buf[4] = {0};
+	writeARGB8((u8*)buf, p);
+	os.write(buf, 4);
+}
+
+inline video::SColor readARGB8(std::istream &is)
+{
+	char buf[4] = {0};
+	is.read(buf, 4);
+	return readARGB8((u8*)buf);
+}
+
 /*
 	More serialization stuff
 */

From 948b5a8be7b13a346c873c157567a72b4e7e320a Mon Sep 17 00:00:00 2001
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 27 Oct 2012 15:14:24 +0300
Subject: [PATCH 15/24] Complete the attachment framework.

The child ID can now be checked against the parent ID in content_cao.cpp so the parent can be detected. Actual attachment code to come

Divide attachment system between server attachments and client attachments, neither coded right now. As explained in the code comment:

// Attachments need to be handled on both the server and client.
// If we attach only on the server, models (which are client-side)
// can't be read so we don't know the origin and orientation of bones.
// If we attach only on the client, the real position of attachments is
// not updated and you can't click them for example.
---
 src/content_cao.cpp   | 155 ++++++++++++++++++----------
 src/content_sao.cpp   | 232 +++++++++++++++++++++++++++---------------
 src/content_sao.h     |   2 +
 src/genericobject.cpp |  24 +++--
 src/genericobject.h   |   2 +-
 src/scriptapi.cpp     |   7 +-
 6 files changed, 270 insertions(+), 152 deletions(-)

diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 3e18337d2..613ec6153 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -581,6 +581,10 @@ private:
 	int m_frame_speed;
 	int m_frame_blend;
 	std::map<std::string, core::vector2d<v3f> > m_bone_posrot;
+	ClientActiveObject* m_attachment_parent;
+	std::string m_attachment_bone;
+	v3f m_attacmhent_position;
+	v3f m_attachment_rotation;
 	int m_anim_frame;
 	int m_anim_num_frames;
 	float m_anim_framelength;
@@ -615,6 +619,14 @@ public:
 		m_tx_basepos(0,0),
 		m_initial_tx_basepos_set(false),
 		m_tx_select_horiz_by_yawpitch(false),
+		m_frames(v2f(0,0)),
+		m_frame_speed(15),
+		m_frame_blend(0),
+		// Nothing to do for m_bone_posrot
+		m_attachment_parent(NULL),
+		m_attachment_bone(""),
+		m_attacmhent_position(v3f(0,0,0)),
+		m_attachment_rotation(v3f(0,0,0)),
 		m_anim_frame(0),
 		m_anim_num_frames(1),
 		m_anim_framelength(0.2),
@@ -906,6 +918,9 @@ public:
 
 	void updateNodePos()
 	{
+		if(m_attachment_parent != NULL)
+			return;
+
 		if(m_meshnode){
 			m_meshnode->setPosition(pos_translator.vect_show);
 			v3f rot = m_meshnode->getRotation();
@@ -933,51 +948,53 @@ public:
 			addToScene(m_smgr, m_gamedef->tsrc(), m_irr);
 			updateAnimations();
 			updateBonePosRot();
-			updateAttachment();
 		}
 
-		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();
-		}
+		if(m_attachment_parent == NULL) // Attachments should be glued to their parent by Irrlicht
+		{
+			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_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());
+			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());
+				}
 			}
 		}
 
@@ -1193,10 +1210,38 @@ public:
 			}
 		}
 	}
-
-	void updateAttachment()
+	
+	void updateAttachments()
 	{
-		// Code for attachments goes here
+		// REMAINING ATTACHMENT ISSUES:
+		// We get to this function when the object is an attachment that needs to
+		// be attached to its parent. If a bone is set we attach it to that skeletal
+		// bone, otherwise just to the object's origin. Attachments should not copy parent
+		// position as that's laggy... instead the Irrlicht function(s) to attach should
+		// be used. If the parent object is NULL that means this object should be detached.
+		// This function is only called whenever a GENERIC_CMD_SET_ATTACHMENT message is received.
+		
+		// We already attach our entity on the server too (copy position). Reason we attach
+		// to the client as well is first of all lag. The server sends the position
+		// of the child separately than that of the parent, so even on localhost
+		// you'd see the child lagging behind. Models are also client-side, so this is
+		// needed to read bone data and attach to joints.
+		
+		// Functions:
+		// - m_attachment_parent is ClientActiveObject* for the parent entity.
+		// - m_attachment_bone is std::string of the bone, "" means none.
+		// - m_attachment_position is v3f and represents the position offset of the attachment.
+		// - m_attachment_rotation is v3f and represents the rotation offset of the attachment.
+		
+		// Implementation information:
+		// From what I know, we need to get the AnimatedMeshSceneNode of m_attachment_parent then
+		// use parent_node->addChild(m_animated_meshnode) for position attachment. For skeletal
+		// attachment I don't know yet. Same must be used to detach when a NULL parent is received.
+
+		//Useful links:
+		// http://irrlicht.sourceforge.net/forum/viewtopic.php?t=7514
+		// http://www.irrlicht3d.org/wiki/index.php?n=Main.HowToUseTheNewAnimationSystem
+		// Irrlicht documentation: http://irrlicht.sourceforge.net/docu/
 	}
 
 	void processMessage(const std::string &data)
@@ -1225,6 +1270,8 @@ public:
 		}
 		else if(cmd == GENERIC_CMD_UPDATE_POSITION)
 		{
+			// Not sent by the server if the object is an attachment
+			
 			m_position = readV3F1000(is);
 			m_velocity = readV3F1000(is);
 			m_acceleration = readV3F1000(is);
@@ -1238,7 +1285,7 @@ public:
 			// the ground due to sucky collision detection...
 			if(m_prop.physical)
 				m_position += v3f(0,0.002,0);
-			
+				
 			if(do_interpolate){
 				if(!m_prop.physical)
 					pos_translator.update(m_position, is_end_position, update_interval);
@@ -1287,12 +1334,18 @@ public:
 		}
 		else if(cmd == GENERIC_CMD_SET_ATTACHMENT)
 		{
-			// Part of the attachment structure, not used yet!
+			ClientActiveObject *obj;
+			int parent_id = readS16(is);
+			if(parent_id > 0)
+				obj = m_env->getActiveObject(parent_id);
+			else
+				obj = NULL;
+			m_attachment_parent = obj;
+			m_attachment_bone = deSerializeString(is);
+			m_attacmhent_position = readV3F1000(is);
+			m_attachment_rotation = readV3F1000(is);
 
-			// Get properties here.
-
-			updateAttachment();
-			expireVisuals();
+			updateAttachments();
 		}
 		else if(cmd == GENERIC_CMD_PUNCHED)
 		{
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index b23d287f4..7787e33fb 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -218,6 +218,7 @@ public:
 
 		if(pos_f.getDistanceFrom(m_last_sent_position) > 0.05*BS)
 		{
+			// TODO: We shouldn't be sending this when the object is attached, but we can't check m_parent here
 			setBasePosition(pos_f);
 			m_last_sent_position = pos_f;
 
@@ -383,6 +384,7 @@ void LuaEntitySAO::addedToEnvironment(u32 dtime_s)
 	// Create entity from name
 	lua_State *L = m_env->getLua();
 	m_registered = scriptapi_luaentity_add(L, m_id, m_init_name.c_str());
+	m_parent = NULL;
 	
 	if(m_registered){
 		// Get properties
@@ -442,28 +444,39 @@ void LuaEntitySAO::step(float dtime, bool send_recommended)
 
 	m_last_sent_position_timer += dtime;
 	
-	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.25; // Distance per iteration
-		f32 stepheight = 0; // Maximum climbable step height
-		v3f p_pos = m_base_position;
-		v3f p_velocity = m_velocity;
-		v3f p_acceleration = m_acceleration;
-		IGameDef *gamedef = m_env->getGameDef();
-		moveresult = collisionMoveSimple(&m_env->getMap(), gamedef,
-				pos_max_d, box, stepheight, dtime,
-				p_pos, p_velocity, p_acceleration);
-		// Apply results
-		m_base_position = p_pos;
-		m_velocity = p_velocity;
-		m_acceleration = p_acceleration;
-	} else {
-		m_base_position += dtime * m_velocity + 0.5 * dtime
-				* dtime * m_acceleration;
-		m_velocity += dtime * m_acceleration;
+	if(m_parent != NULL)
+	{
+		// REMAINING ATTACHMENT ISSUES:
+		// This is causing a segmentation fault, investigate why!
+		//m_base_position = m_parent->getBasePosition();
+		m_velocity = v3f(0,0,0);
+		m_acceleration = v3f(0,0,0);
+	}
+	else
+	{
+		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.25; // Distance per iteration
+			f32 stepheight = 0; // Maximum climbable step height
+			v3f p_pos = m_base_position;
+			v3f p_velocity = m_velocity;
+			v3f p_acceleration = m_acceleration;
+			IGameDef *gamedef = m_env->getGameDef();
+			moveresult = collisionMoveSimple(&m_env->getMap(), gamedef,
+					pos_max_d, box, stepheight, dtime,
+					p_pos, p_velocity, p_acceleration);
+			// Apply results
+			m_base_position = p_pos;
+			m_velocity = p_velocity;
+			m_acceleration = p_acceleration;
+		} else {
+			m_base_position += dtime * m_velocity + 0.5 * dtime
+					* dtime * m_acceleration;
+			m_velocity += dtime * m_acceleration;
+		}
 	}
 
 	if(m_registered){
@@ -551,6 +564,10 @@ int LuaEntitySAO::punch(v3f dir,
 		m_removed = true;
 		return 0;
 	}
+
+	// It's best that attachments cannot be punched 
+	if(m_parent != NULL)
+		return 0;
 	
 	ItemStack *punchitem = NULL;
 	ItemStack punchitem_static;
@@ -601,12 +618,16 @@ void LuaEntitySAO::rightClick(ServerActiveObject *clicker)
 
 void LuaEntitySAO::setPos(v3f pos)
 {
+	if(m_parent != NULL)
+		return;
 	m_base_position = pos;
 	sendPosition(false, true);
 }
 
 void LuaEntitySAO::moveTo(v3f pos, bool continuous)
 {
+	if(m_parent != NULL)
+		return;
 	m_base_position = pos;
 	if(!continuous)
 		sendPosition(true, true);
@@ -661,14 +682,21 @@ void LuaEntitySAO::setBonePosRot(std::string bone, v3f position, v3f rotation)
 	m_messages_out.push_back(aom);
 }
 
-// Part of the attachment structure, not used yet!
 void LuaEntitySAO::setAttachment(ServerActiveObject *parent, std::string bone, v3f position, v3f rotation)
 {
-	// Parent should be translated from a ServerActiveObject into something
-	// the client will recognize (as a ClientActiveObject) then sent in
-	// gob_cmd_set_attachment that way.
+	// Attachments need to be handled on both the server and client.
+	// If we just attach on the server, we can only copy the position of the parent. Attachments
+	// are still sent to clients at an interval so players would see them following the parent
+	// instead of sticking to it, plus we can't read and attach to skeletal bones.
+	// If we just attach on the client, the server still sees the child at its original location.
+	// This can break some things, so we also give the server the most accurate representation
+	// even if players will only see the client changes since they override server-sent position.
 
-	std::string str = gob_cmd_set_attachment(); // <- parameters here
+	// Server attachment:
+	m_parent = parent;
+
+	// Client attachment:
+	std::string str = gob_cmd_set_attachment(parent->getId(), bone, position, rotation);
 	// create message and add to list
 	ActiveObjectMessage aom(getId(), true, str);
 	m_messages_out.push_back(aom);
@@ -748,6 +776,9 @@ std::string LuaEntitySAO::getPropertyPacket()
 
 void LuaEntitySAO::sendPosition(bool do_interpolate, bool is_movement_end)
 {
+	if(m_parent != NULL)
+		return;
+	
 	m_last_sent_move_precision = m_base_position.getDistanceFrom(
 			m_last_sent_position);
 	m_last_sent_position_timer = 0;
@@ -843,6 +874,7 @@ void PlayerSAO::addedToEnvironment(u32 dtime_s)
 {
 	ServerActiveObject::addedToEnvironment(dtime_s);
 	ServerActiveObject::setBasePosition(m_player->getPosition());
+	m_parent = NULL;
 	m_player->setPlayerSAO(this);
 	m_player->peer_id = m_peer_id;
 	m_last_good_position = m_player->getPosition();
@@ -893,7 +925,7 @@ std::string PlayerSAO::getStaticData()
 }
 
 void PlayerSAO::step(float dtime, bool send_recommended)
-{
+{	
 	if(!m_properties_sent)
 	{
 		m_properties_sent = true;
@@ -905,71 +937,82 @@ void PlayerSAO::step(float dtime, bool send_recommended)
 
 	m_time_from_last_punch += dtime;
 	m_nocheat_dig_time += dtime;
-	
-	if(m_is_singleplayer || g_settings->getBool("disable_anticheat"))
+
+	if(m_parent == NULL)
 	{
-		m_last_good_position = m_player->getPosition();
-		m_last_good_position_age = 0;
-	}
-	else
-	{
-		/*
-			Check player movements
-
-			NOTE: Actually the server should handle player physics like the
-			client does and compare player's position to what is calculated
-			on our side. This is required when eg. players fly due to an
-			explosion. Altough a node-based alternative might be possible
-			too, and much more lightweight.
-		*/
-
-		float player_max_speed = 0;
-		float player_max_speed_up = 0;
-		if(m_privs.count("fast") != 0){
-			// Fast speed
-			player_max_speed = BS * 20;
-			player_max_speed_up = BS * 20;
-		} else {
-			// Normal speed
-			player_max_speed = BS * 4.0;
-			player_max_speed_up = BS * 4.0;
-		}
-		// Tolerance
-		player_max_speed *= 2.5;
-		player_max_speed_up *= 2.5;
-
-		m_last_good_position_age += dtime;
-		if(m_last_good_position_age >= 1.0){
-			float age = m_last_good_position_age;
-			v3f diff = (m_player->getPosition() - m_last_good_position);
-			float d_vert = diff.Y;
-			diff.Y = 0;
-			float d_horiz = diff.getLength();
-			/*infostream<<m_player->getName()<<"'s horizontal speed is "
-					<<(d_horiz/age)<<std::endl;*/
-			if(d_horiz <= age * player_max_speed &&
-					(d_vert < 0 || d_vert < age * player_max_speed_up)){
-				m_last_good_position = m_player->getPosition();
-			} else {
-				actionstream<<"Player "<<m_player->getName()
-						<<" moved too fast; resetting position"
-						<<std::endl;
-				m_player->setPosition(m_last_good_position);
-				m_teleported = true;
-			}
+		if(m_is_singleplayer || g_settings->getBool("disable_anticheat"))
+		{
+			m_last_good_position = m_player->getPosition();
 			m_last_good_position_age = 0;
 		}
+		else
+		{
+			/*
+				Check player movements
+
+				NOTE: Actually the server should handle player physics like the
+				client does and compare player's position to what is calculated
+				on our side. This is required when eg. players fly due to an
+				explosion. Altough a node-based alternative might be possible
+				too, and much more lightweight.
+			*/
+
+			float player_max_speed = 0;
+			float player_max_speed_up = 0;
+			if(m_privs.count("fast") != 0){
+				// Fast speed
+				player_max_speed = BS * 20;
+				player_max_speed_up = BS * 20;
+			} else {
+				// Normal speed
+				player_max_speed = BS * 4.0;
+				player_max_speed_up = BS * 4.0;
+			}
+			// Tolerance
+			player_max_speed *= 2.5;
+			player_max_speed_up *= 2.5;
+
+			m_last_good_position_age += dtime;
+			if(m_last_good_position_age >= 1.0){
+				float age = m_last_good_position_age;
+				v3f diff = (m_player->getPosition() - m_last_good_position);
+				float d_vert = diff.Y;
+				diff.Y = 0;
+				float d_horiz = diff.getLength();
+				/*infostream<<m_player->getName()<<"'s horizontal speed is "
+						<<(d_horiz/age)<<std::endl;*/
+				if(d_horiz <= age * player_max_speed &&
+						(d_vert < 0 || d_vert < age * player_max_speed_up)){
+					m_last_good_position = m_player->getPosition();
+				} else {
+					actionstream<<"Player "<<m_player->getName()
+							<<" moved too fast; resetting position"
+							<<std::endl;
+					m_player->setPosition(m_last_good_position);
+					m_teleported = true;
+				}
+				m_last_good_position_age = 0;
+			}
+		}
 	}
 
 	if(send_recommended == false)
 		return;
 
-	if(m_position_not_sent)
+	// If the object is attached client-side, don't waste bandwidth and send its position to clients
+	if(m_position_not_sent && m_parent == NULL)
 	{
 		m_position_not_sent = false;
 		float update_interval = m_env->getSendRecommendedInterval();
+		v3f pos;
+		// REMAINING ATTACHMENT ISSUES:
+		// This is causing a segmentation fault, investigate why!
+		if(m_parent != NULL)
+			pos = m_parent->getBasePosition();
+		else
+			pos = m_player->getPosition() + v3f(0,BS*1,0);
 		std::string str = gob_cmd_update_position(
-			m_player->getPosition() + v3f(0,BS*1,0),
+			pos,
 			v3f(0,0,0),
 			v3f(0,0,0),
 			m_player->getYaw(),
@@ -1000,12 +1043,16 @@ void PlayerSAO::step(float dtime, bool send_recommended)
 
 void PlayerSAO::setBasePosition(const v3f &position)
 {
+	if(m_parent != NULL)
+		return;
 	ServerActiveObject::setBasePosition(position);
 	m_position_not_sent = true;
 }
 
 void PlayerSAO::setPos(v3f pos)
 {
+	if(m_parent != NULL)
+		return;
 	m_player->setPosition(pos);
 	// Movement caused by this command is always valid
 	m_last_good_position = pos;
@@ -1016,6 +1063,8 @@ void PlayerSAO::setPos(v3f pos)
 
 void PlayerSAO::moveTo(v3f pos, bool continuous)
 {
+	if(m_parent != NULL)
+		return;
 	m_player->setPosition(pos);
 	// Movement caused by this command is always valid
 	m_last_good_position = pos;
@@ -1029,6 +1078,10 @@ int PlayerSAO::punch(v3f dir,
 	ServerActiveObject *puncher,
 	float time_from_last_punch)
 {
+	// It's best that attachments cannot be punched 
+	if(m_parent != NULL)
+		return 0;
+
 	if(!toolcap)
 		return 0;
 
@@ -1126,10 +1179,21 @@ void PlayerSAO::setBonePosRot(std::string bone, v3f position, v3f rotation)
 	m_messages_out.push_back(aom);
 }
 
-// Part of the attachment structure, not used yet!
 void PlayerSAO::setAttachment(ServerActiveObject *parent, std::string bone, v3f position, v3f rotation)
-{	
-	std::string str = gob_cmd_set_attachment(); // <- parameters here
+{
+	// Attachments need to be handled on both the server and client.
+	// If we just attach on the server, we can only copy the position of the parent. Attachments
+	// are still sent to clients at an interval so players would see them following the parent
+	// instead of sticking to it, plus we can't read and attach to skeletal bones.
+	// If we just attach on the client, the server still sees the child at its original location.
+	// This can break some things, so we also give the server the most accurate representation
+	// even if players will only see the client changes since they override server-sent position.
+
+	// Server attachment:
+	m_parent = parent;
+
+	// Client attachment:
+	std::string str = gob_cmd_set_attachment(parent->getId(), bone, position, rotation);
 	// create message and add to list
 	ActiveObjectMessage aom(getId(), true, str);
 	m_messages_out.push_back(aom);
diff --git a/src/content_sao.h b/src/content_sao.h
index a89f2ddd4..e4d81cd2d 100644
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -99,6 +99,7 @@ private:
 	float m_last_sent_position_timer;
 	float m_last_sent_move_precision;
 	bool m_armor_groups_sent;
+	ServerActiveObject *m_parent;
 };
 
 /*
@@ -235,6 +236,7 @@ private:
 	bool m_position_not_sent;
 	ItemGroupList m_armor_groups;
 	bool m_armor_groups_sent;
+	ServerActiveObject *m_parent;
 	bool m_properties_sent;
 	struct ObjectProperties m_prop;
 	// Cached privileges for enforcement
diff --git a/src/genericobject.cpp b/src/genericobject.cpp
index 482dbbc78..480c4209d 100644
--- a/src/genericobject.cpp
+++ b/src/genericobject.cpp
@@ -104,17 +104,6 @@ std::string gob_cmd_set_animations(v2f frames, float frame_speed, float frame_bl
 	return os.str();
 }
 
-// Part of the attachment structure, not used yet!
-std::string gob_cmd_set_attachment() // <- parameters here
-{
-	std::ostringstream os(std::ios::binary);
-	// command 
-	writeU8(os, GENERIC_CMD_SET_ATTACHMENT);
-	// parameters
-	// Parameters go here
-	return os.str();
-}
-
 std::string gob_cmd_set_bone_posrot(std::string bone, v3f position, v3f rotation)
 {
 	std::ostringstream os(std::ios::binary);
@@ -127,6 +116,19 @@ std::string gob_cmd_set_bone_posrot(std::string bone, v3f position, v3f rotation
 	return os.str();
 }
 
+std::string gob_cmd_set_attachment(int parent_id, std::string bone, v3f position, v3f rotation)
+{
+	std::ostringstream os(std::ios::binary);
+	// command 
+	writeU8(os, GENERIC_CMD_SET_ATTACHMENT);
+	// parameters
+	writeS16(os, parent_id);
+	os<<serializeString(bone);
+	writeV3F1000(os, position);
+	writeV3F1000(os, rotation);
+	return os.str();
+}
+
 std::string gob_cmd_punched(s16 damage, s16 result_hp)
 {
 	std::ostringstream os(std::ios::binary);
diff --git a/src/genericobject.h b/src/genericobject.h
index d20e7b3d0..3504b0a46 100644
--- a/src/genericobject.h
+++ b/src/genericobject.h
@@ -61,7 +61,7 @@ std::string gob_cmd_set_animations(v2f frames, float frame_speed, float frame_bl
 
 std::string gob_cmd_set_bone_posrot(std::string bone, v3f position, v3f rotation);
 
-std::string gob_cmd_set_attachment(); // <- parameters here
+std::string gob_cmd_set_attachment(int parent_id, std::string bone, v3f position, v3f rotation);
 
 std::string gob_cmd_punched(s16 damage, s16 result_hp);
 
diff --git a/src/scriptapi.cpp b/src/scriptapi.cpp
index 9c5bbcc5b..3c505c881 100644
--- a/src/scriptapi.cpp
+++ b/src/scriptapi.cpp
@@ -2737,7 +2737,7 @@ private:
 		return 0;
 	}
 
-	// setboneposrot(std::string bone, v3f position, v3f rotation)
+	// setboneposrot(self, std::string bone, v3f position, v3f rotation)
 	static int l_set_bone_posrot(lua_State *L)
 	{
 		ObjectRef *ref = checkobject(L, 1);
@@ -2758,8 +2758,7 @@ private:
 		return 0;
 	}
 
-// Part of the attachment structure, not used yet!
-	// set_attachment() // <- parameters here
+	// set_attachment(self, parent, bone, position, rotation)
 	static int l_set_attachment(lua_State *L)
 	{
 		ObjectRef *ref = checkobject(L, 1);
@@ -2778,8 +2777,6 @@ private:
 		if(!lua_isnil(L, 5))
 			rotation = read_v3f(L, 5);
 		// Do it
-	
-//lua_pushnumber(L, cobj->getId()); // Push id
 
 		co->setAttachment(parent, bone, position, rotation);
 		return 0;

From ba3fd63e29252987d4904ec3c120bce4b6758160 Mon Sep 17 00:00:00 2001
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 28 Oct 2012 17:07:11 +0200
Subject: [PATCH 16/24] Fix some remaining issues with attachments, now they
 work. Tested with object->player and player->player attachments

---
 src/clientobject.h  |   5 ++
 src/content_cao.cpp | 169 +++++++++++++++++++++++++++++++++++++++++---
 src/content_sao.cpp |  77 +++++++++++---------
 src/nodedef.cpp     |   2 +
 4 files changed, 209 insertions(+), 44 deletions(-)

diff --git a/src/clientobject.h b/src/clientobject.h
index 8b0b57147..e08b78c57 100644
--- a/src/clientobject.h
+++ b/src/clientobject.h
@@ -56,6 +56,11 @@ public:
 	virtual core::aabbox3d<f32>* getSelectionBox(){return NULL;}
 	virtual core::aabbox3d<f32>* getCollisionBox(){return NULL;}
 	virtual v3f getPosition(){return v3f(0,0,0);}
+	virtual scene::IMeshSceneNode *getMeshSceneNode(){return NULL;}
+	virtual scene::IAnimatedMeshSceneNode *getAnimatedMeshSceneNode(){return NULL;}
+	virtual scene::IBillboardSceneNode *getSpriteSceneNode(){return NULL;}
+	virtual bool isPlayer(){return false;}
+	virtual bool isLocalPlayer(){return false;}
 	virtual bool doShowSelectionBox(){return true;}
 	
 	// Step object in time
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 613ec6153..60d458318 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -554,7 +554,7 @@ private:
 	// 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
 	ObjectProperties m_prop;
@@ -594,6 +594,7 @@ private:
 	bool m_visuals_expired;
 	float m_step_distance_counter;
 	u8 m_last_light;
+	bool m_is_visible;
 
 public:
 	GenericCAO(IGameDef *gamedef, ClientEnvironment *env):
@@ -634,7 +635,8 @@ public:
 		m_reset_textures_timer(-1),
 		m_visuals_expired(false),
 		m_step_distance_counter(0),
-		m_last_light(255)
+		m_last_light(255),
+		m_is_visible(false)
 	{
 		if(gamedef == NULL)
 			ClientActiveObject::registerType(getType(), create);
@@ -691,7 +693,7 @@ public:
 	}
 	core::aabbox3d<f32>* getSelectionBox()
 	{
-		if(!m_prop.is_visible || m_is_local_player)
+		if(!m_prop.is_visible || !m_is_visible || m_is_local_player)
 			return NULL;
 		return &m_selection_box;
 	}
@@ -700,6 +702,31 @@ public:
 		return pos_translator.vect_show;
 	}
 
+	scene::IMeshSceneNode *getMeshSceneNode()
+	{
+		return m_meshnode;
+	}
+
+	scene::IAnimatedMeshSceneNode *getAnimatedMeshSceneNode()
+	{
+		return m_animated_meshnode;
+	}
+
+	scene::IBillboardSceneNode *getSpriteSceneNode()
+	{
+		return m_spritenode;
+	}
+
+	bool isPlayer()
+	{
+		return m_is_player;
+	}
+
+	bool isLocalPlayer()
+	{
+		return m_is_local_player;
+	}
+
 	void removeFromScene()
 	{
 		if(m_meshnode){
@@ -891,22 +918,27 @@ public:
 		
 	void updateLight(u8 light_at_pos)
 	{
-		bool is_visible = (m_hp != 0);
+		// Objects attached to the local player should always be hidden
+		if(m_attachment_parent != NULL && m_attachment_parent->isLocalPlayer())
+			m_is_visible = false;
+		else
+			m_is_visible = (m_hp != 0);
 		u8 li = decode_light(light_at_pos);
+
 		if(li != m_last_light){
 			m_last_light = li;
 			video::SColor color(255,li,li,li);
 			if(m_meshnode){
 				setMeshColor(m_meshnode->getMesh(), color);
-				m_meshnode->setVisible(is_visible);
+				m_meshnode->setVisible(m_is_visible);
 			}
 			if(m_animated_meshnode){
 				setMeshColor(m_animated_meshnode->getMesh(), color);
-				m_animated_meshnode->setVisible(is_visible);
+				m_animated_meshnode->setVisible(m_is_visible);
 			}
 			if(m_spritenode){
 				m_spritenode->setColor(color);
-				m_spritenode->setVisible(is_visible);
+				m_spritenode->setVisible(m_is_visible);
 			}
 		}
 	}
@@ -948,6 +980,7 @@ public:
 			addToScene(m_smgr, m_gamedef->tsrc(), m_irr);
 			updateAnimations();
 			updateBonePosRot();
+			updateAttachments();
 		}
 
 		if(m_attachment_parent == NULL) // Attachments should be glued to their parent by Irrlicht
@@ -1019,6 +1052,9 @@ public:
 			m_yaw += dtime * m_prop.automatic_rotate * 180 / M_PI;
 			updateNodePos();
 		}
+
+		if(m_animated_meshnode)
+			errorstream<<"Attachment position: "<<m_animated_meshnode->getPosition().X<<","<<m_animated_meshnode->getPosition().Y<<","<<m_animated_meshnode->getPosition().Z<<std::endl;
 	}
 
 	void updateTexturePos()
@@ -1241,7 +1277,120 @@ public:
 		//Useful links:
 		// http://irrlicht.sourceforge.net/forum/viewtopic.php?t=7514
 		// http://www.irrlicht3d.org/wiki/index.php?n=Main.HowToUseTheNewAnimationSystem
+		// http://gamedev.stackexchange.com/questions/27363/finding-the-endpoint-of-a-named-bone-in-irrlicht
 		// Irrlicht documentation: http://irrlicht.sourceforge.net/docu/
+
+		if (m_attachment_parent != NULL && !m_attachment_parent->isLocalPlayer())
+		{
+			// REMAINING ATTACHMENT ISSUES:
+			// The code below should cause the child to get attached, but for some reason it's not working
+			// A debug print confirms both position and absolute position are set accordingly, but the object still shows at origin 0,0,0
+
+			scene::IMeshSceneNode *parent_mesh = NULL;
+			if(m_attachment_parent->getMeshSceneNode())
+				parent_mesh = m_attachment_parent->getMeshSceneNode();
+			scene::IAnimatedMeshSceneNode *parent_animated_mesh = NULL;
+			if(m_attachment_parent->getAnimatedMeshSceneNode())
+				parent_animated_mesh = m_attachment_parent->getAnimatedMeshSceneNode();
+			scene::IBillboardSceneNode *parent_sprite = NULL;
+			if(m_attachment_parent->getSpriteSceneNode())
+				parent_sprite = m_attachment_parent->getSpriteSceneNode();
+
+			scene::IBoneSceneNode *parent_bone = NULL;
+			if(parent_animated_mesh && m_attachment_bone != "")
+				parent_bone = parent_animated_mesh->getJointNode(m_attachment_bone.c_str());
+			if(!parent_bone) // Should be false if the bone doesn't exist on the mesh
+				parent_bone = NULL;
+
+			// TODO: Perhaps use polymorphism here to save code duplication
+			if(m_meshnode){
+				if(parent_bone){
+					m_meshnode->setPosition(parent_bone->getPosition());
+					m_meshnode->setRotation(parent_bone->getRotation());
+					m_meshnode->updateAbsolutePosition();
+					//m_meshnode->setParent(parent_bone);
+				}
+				else
+				{
+					if(parent_mesh){
+						m_meshnode->setPosition(parent_mesh->getPosition());
+						m_meshnode->setRotation(parent_mesh->getRotation());
+						m_meshnode->updateAbsolutePosition();
+						//m_meshnode->setParent(parent_mesh);
+					}
+					else if(parent_animated_mesh){
+						m_meshnode->setPosition(parent_animated_mesh->getPosition());
+						m_meshnode->setRotation(parent_animated_mesh->getRotation());
+						m_meshnode->updateAbsolutePosition();
+						//m_meshnode->setParent(parent_animated_mesh);
+					}
+					else if(parent_sprite){
+						m_meshnode->setPosition(parent_sprite->getPosition());
+						m_meshnode->setRotation(parent_sprite->getRotation());
+						m_meshnode->updateAbsolutePosition();
+						//m_meshnode->setParent(parent_sprite);
+					}
+				}
+			}
+			if(m_animated_meshnode){
+				if(parent_bone){
+					m_animated_meshnode->setPosition(parent_bone->getPosition());
+					m_animated_meshnode->setRotation(parent_bone->getRotation());
+					m_animated_meshnode->updateAbsolutePosition();
+					//m_animated_meshnode->setParent(parent_bone);
+				}
+				else
+				{
+					if(parent_mesh){
+						m_animated_meshnode->setPosition(parent_mesh->getPosition());
+						m_animated_meshnode->setRotation(parent_mesh->getRotation());
+						m_animated_meshnode->updateAbsolutePosition();
+						//m_animated_meshnode->setParent(parent_mesh);
+					}
+					else if(parent_animated_mesh){
+						m_animated_meshnode->setPosition(parent_animated_mesh->getPosition());
+						m_animated_meshnode->setRotation(parent_animated_mesh->getRotation());
+						m_animated_meshnode->updateAbsolutePosition();
+						//m_animated_meshnode->setParent(parent_animated_mesh);
+					}
+					else if(parent_sprite){
+						m_animated_meshnode->setPosition(parent_sprite->getPosition());
+						m_animated_meshnode->setRotation(parent_sprite->getRotation());
+						m_animated_meshnode->updateAbsolutePosition();
+						//m_animated_meshnode->setParent(parent_sprite);
+					}
+				}
+			}
+			if(m_spritenode){
+				if(parent_bone){
+					m_spritenode->setPosition(parent_bone->getPosition());
+					m_spritenode->setRotation(parent_bone->getRotation());
+					m_spritenode->updateAbsolutePosition();
+					//m_spritenode->setParent(parent_bone);
+				}
+				else
+				{
+					if(parent_mesh){
+						m_spritenode->setPosition(parent_mesh->getPosition());
+						m_spritenode->setRotation(parent_mesh->getRotation());
+						m_spritenode->updateAbsolutePosition();
+						//m_spritenode->setParent(parent_mesh);
+					}
+					else if(parent_animated_mesh){
+						m_spritenode->setPosition(parent_animated_mesh->getPosition());
+						m_spritenode->setRotation(parent_animated_mesh->getRotation());
+						m_spritenode->updateAbsolutePosition();
+						//m_spritenode->setParent(parent_animated_mesh);
+					}
+					else if(parent_sprite){
+						m_spritenode->setPosition(parent_sprite->getPosition());
+						m_spritenode->setRotation(parent_sprite->getRotation());
+						m_spritenode->updateAbsolutePosition();
+						//m_spritenode->setParent(parent_sprite);
+					}
+				}
+			}
+		}
 	}
 
 	void processMessage(const std::string &data)
@@ -1334,11 +1483,9 @@ public:
 		}
 		else if(cmd == GENERIC_CMD_SET_ATTACHMENT)
 		{
-			ClientActiveObject *obj;
 			int parent_id = readS16(is);
-			if(parent_id > 0)
-				obj = m_env->getActiveObject(parent_id);
-			else
+			ClientActiveObject *obj = m_env->getActiveObject(parent_id);
+			if(!parent_id || !obj)
 				obj = NULL;
 			m_attachment_parent = obj;
 			m_attachment_bone = deSerializeString(is);
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 7787e33fb..3289f9077 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -444,11 +444,12 @@ void LuaEntitySAO::step(float dtime, bool send_recommended)
 
 	m_last_sent_position_timer += dtime;
 	
+	// Each frame, parent position is copied if the object is attached, otherwise it's calculated normally
+	// If the object gets detached this comes into effect automatically from the last known origin
 	if(m_parent != NULL)
 	{
-		// REMAINING ATTACHMENT ISSUES:
-		// This is causing a segmentation fault, investigate why!
-		//m_base_position = m_parent->getBasePosition();
+		v3f pos = m_parent->getBasePosition();
+		m_base_position = pos;
 		m_velocity = v3f(0,0,0);
 		m_acceleration = v3f(0,0,0);
 	}
@@ -486,20 +487,23 @@ void LuaEntitySAO::step(float dtime, bool send_recommended)
 
 	if(send_recommended == false)
 		return;
-	
-	// TODO: force send when acceleration changes enough?
-	float minchange = 0.2*BS;
-	if(m_last_sent_position_timer > 1.0){
-		minchange = 0.01*BS;
-	} else if(m_last_sent_position_timer > 0.2){
-		minchange = 0.05*BS;
-	}
-	float move_d = m_base_position.getDistanceFrom(m_last_sent_position);
-	move_d += m_last_sent_move_precision;
-	float vel_d = m_velocity.getDistanceFrom(m_last_sent_velocity);
-	if(move_d > minchange || vel_d > minchange ||
-			fabs(m_yaw - m_last_sent_yaw) > 1.0){
-		sendPosition(true, false);
+
+	if(m_parent != NULL)
+	{
+		// TODO: force send when acceleration changes enough?
+		float minchange = 0.2*BS;
+		if(m_last_sent_position_timer > 1.0){
+			minchange = 0.01*BS;
+		} else if(m_last_sent_position_timer > 0.2){
+			minchange = 0.05*BS;
+		}
+		float move_d = m_base_position.getDistanceFrom(m_last_sent_position);
+		move_d += m_last_sent_move_precision;
+		float vel_d = m_velocity.getDistanceFrom(m_last_sent_velocity);
+		if(move_d > minchange || vel_d > minchange ||
+				fabs(m_yaw - m_last_sent_yaw) > 1.0){
+			sendPosition(true, false);
+		}
 	}
 
 	if(m_armor_groups_sent == false){
@@ -686,11 +690,11 @@ void LuaEntitySAO::setAttachment(ServerActiveObject *parent, std::string bone, v
 {
 	// Attachments need to be handled on both the server and client.
 	// If we just attach on the server, we can only copy the position of the parent. Attachments
-	// are still sent to clients at an interval so players would see them following the parent
-	// instead of sticking to it, plus we can't read and attach to skeletal bones.
+	// are still sent to clients at an interval so players might see them lagging, plus we can't
+	// read and attach to skeletal bones.
 	// If we just attach on the client, the server still sees the child at its original location.
-	// This can break some things, so we also give the server the most accurate representation
-	// even if players will only see the client changes since they override server-sent position.
+	// This breaks some things so we also give the server the most accurate representation
+	// even if players only see the client changes.
 
 	// Server attachment:
 	m_parent = parent;
@@ -776,6 +780,7 @@ std::string LuaEntitySAO::getPropertyPacket()
 
 void LuaEntitySAO::sendPosition(bool do_interpolate, bool is_movement_end)
 {
+	// If the object is attached client-side, don't waste bandwidth sending its position to clients
 	if(m_parent != NULL)
 		return;
 	
@@ -925,7 +930,7 @@ std::string PlayerSAO::getStaticData()
 }
 
 void PlayerSAO::step(float dtime, bool send_recommended)
-{	
+{
 	if(!m_properties_sent)
 	{
 		m_properties_sent = true;
@@ -938,7 +943,16 @@ void PlayerSAO::step(float dtime, bool send_recommended)
 	m_time_from_last_punch += dtime;
 	m_nocheat_dig_time += dtime;
 
-	if(m_parent == NULL)
+	// Each frame, parent position is copied if the object is attached, otherwise it's calculated normally
+	// If the object gets detached this comes into effect automatically from the last known origin
+	if(m_parent != NULL)
+	{
+		v3f pos = m_parent->getBasePosition();
+		m_last_good_position = pos;
+		m_last_good_position_age = 0;
+		m_player->setPosition(pos);
+	}
+	else
 	{
 		if(m_is_singleplayer || g_settings->getBool("disable_anticheat"))
 		{
@@ -999,15 +1013,13 @@ void PlayerSAO::step(float dtime, bool send_recommended)
 	if(send_recommended == false)
 		return;
 
-	// If the object is attached client-side, don't waste bandwidth and send its position to clients
+	// If the object is attached client-side, don't waste bandwidth sending its position to clients
 	if(m_position_not_sent && m_parent == NULL)
 	{
 		m_position_not_sent = false;
 		float update_interval = m_env->getSendRecommendedInterval();
 		v3f pos;
-		// REMAINING ATTACHMENT ISSUES:
-		// This is causing a segmentation fault, investigate why!
-		if(m_parent != NULL)
+		if(m_parent != NULL) // Just in case we ever do send attachment position too
 			pos = m_parent->getBasePosition();
 		else
 			pos = m_player->getPosition() + v3f(0,BS*1,0);
@@ -1043,8 +1055,7 @@ void PlayerSAO::step(float dtime, bool send_recommended)
 
 void PlayerSAO::setBasePosition(const v3f &position)
 {
-	if(m_parent != NULL)
-		return;
+	// This needs to be ran for attachments too
 	ServerActiveObject::setBasePosition(position);
 	m_position_not_sent = true;
 }
@@ -1183,11 +1194,11 @@ void PlayerSAO::setAttachment(ServerActiveObject *parent, std::string bone, v3f
 {
 	// Attachments need to be handled on both the server and client.
 	// If we just attach on the server, we can only copy the position of the parent. Attachments
-	// are still sent to clients at an interval so players would see them following the parent
-	// instead of sticking to it, plus we can't read and attach to skeletal bones.
+	// are still sent to clients at an interval so players might see them lagging, plus we can't
+	// read and attach to skeletal bones.
 	// If we just attach on the client, the server still sees the child at its original location.
-	// This can break some things, so we also give the server the most accurate representation
-	// even if players will only see the client changes since they override server-sent position.
+	// This breaks some things so we also give the server the most accurate representation
+	// even if players only see the client changes.
 
 	// Server attachment:
 	m_parent = parent;
diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index 180219ba8..53deea11b 100644
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -254,6 +254,7 @@ void ContentFeatures::serialize(std::ostream &os)
 	os<<serializeString(liquid_alternative_flowing);
 	os<<serializeString(liquid_alternative_source);
 	writeU8(os, liquid_viscosity);
+	writeU8(os, liquid_renewable);
 	writeU8(os, light_source);
 	writeU32(os, damage_per_second);
 	node_box.serialize(os);
@@ -311,6 +312,7 @@ void ContentFeatures::deSerialize(std::istream &is)
 	liquid_alternative_flowing = deSerializeString(is);
 	liquid_alternative_source = deSerializeString(is);
 	liquid_viscosity = readU8(is);
+	liquid_renewable = readU8(is);
 	light_source = readU8(is);
 	damage_per_second = readU32(is);
 	node_box.deSerialize(is);

From d7d759b43f99c999fedd9376edbf5f4e1384dafa Mon Sep 17 00:00:00 2001
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 4 Nov 2012 14:33:30 +0200
Subject: [PATCH 17/24] Enable client-side attachments, add detachment code

---
 src/content_cao.cpp | 132 +++++++++++++++++++++++++++-----------------
 src/content_sao.cpp | 108 +++++++++++++++++++++++++++---------
 src/content_sao.h   |  33 ++++++++++-
 3 files changed, 196 insertions(+), 77 deletions(-)

diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 60d458318..deb9aa903 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -583,7 +583,7 @@ private:
 	std::map<std::string, core::vector2d<v3f> > m_bone_posrot;
 	ClientActiveObject* m_attachment_parent;
 	std::string m_attachment_bone;
-	v3f m_attacmhent_position;
+	v3f m_attachment_position;
 	v3f m_attachment_rotation;
 	int m_anim_frame;
 	int m_anim_num_frames;
@@ -626,7 +626,7 @@ public:
 		// Nothing to do for m_bone_posrot
 		m_attachment_parent(NULL),
 		m_attachment_bone(""),
-		m_attacmhent_position(v3f(0,0,0)),
+		m_attachment_position(v3f(0,0,0)),
 		m_attachment_rotation(v3f(0,0,0)),
 		m_anim_frame(0),
 		m_anim_num_frames(1),
@@ -852,7 +852,6 @@ public:
 			if(mesh)
 			{
 				m_animated_meshnode = smgr->addAnimatedMeshSceneNode(mesh, NULL);
-				m_animated_meshnode->setMD2Animation(scene::EMAT_STAND);
 				m_animated_meshnode->animateJoints(); // Needed for some animations
 				m_animated_meshnode->setScale(v3f(m_prop.visual_size.X,
 						m_prop.visual_size.Y,
@@ -1053,8 +1052,12 @@ public:
 			updateNodePos();
 		}
 
-		if(m_animated_meshnode)
-			errorstream<<"Attachment position: "<<m_animated_meshnode->getPosition().X<<","<<m_animated_meshnode->getPosition().Y<<","<<m_animated_meshnode->getPosition().Z<<std::endl;
+		// REMAINING ATTACHMENT ISSUES:
+		// Absolute Position of attachments is printed differently here than what it's set to in the SetAttachment function.
+		// Apparently here it prints the origin of the parent, but ignores the offset it was actually set to.
+
+		//if(m_animated_meshnode != NULL && m_attachment_parent != NULL)
+		//	errorstream<<"Attachment position, step: "<<m_animated_meshnode->getAbsolutePosition().X<<","<<m_animated_meshnode->getAbsolutePosition().Y<<","<<m_animated_meshnode->getAbsolutePosition().Z<<std::endl;
 	}
 
 	void updateTexturePos()
@@ -1280,11 +1283,42 @@ public:
 		// http://gamedev.stackexchange.com/questions/27363/finding-the-endpoint-of-a-named-bone-in-irrlicht
 		// Irrlicht documentation: http://irrlicht.sourceforge.net/docu/
 
-		if (m_attachment_parent != NULL && !m_attachment_parent->isLocalPlayer())
+		if(m_attachment_parent == NULL || m_attachment_parent->isLocalPlayer()) // Detach
+		{
+			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();
+			}
+		}
+		else // Attach
 		{
 			// REMAINING ATTACHMENT ISSUES:
 			// The code below should cause the child to get attached, but for some reason it's not working
-			// A debug print confirms both position and absolute position are set accordingly, but the object still shows at origin 0,0,0
+			// A debug print confirms both position and absolute position are set accordingly, but the object still doesn't show
+			// Position and Absolute Position were tested to be set properly here
 
 			scene::IMeshSceneNode *parent_mesh = NULL;
 			if(m_attachment_parent->getMeshSceneNode())
@@ -1299,94 +1333,92 @@ public:
 			scene::IBoneSceneNode *parent_bone = NULL;
 			if(parent_animated_mesh && m_attachment_bone != "")
 				parent_bone = parent_animated_mesh->getJointNode(m_attachment_bone.c_str());
-			if(!parent_bone) // Should be false if the bone doesn't exist on the mesh
-				parent_bone = NULL;
 
 			// TODO: Perhaps use polymorphism here to save code duplication
 			if(m_meshnode){
 				if(parent_bone){
-					m_meshnode->setPosition(parent_bone->getPosition());
-					m_meshnode->setRotation(parent_bone->getRotation());
+					m_meshnode->setParent(parent_bone);
+					m_meshnode->setPosition(m_attachment_position);
+					m_meshnode->setRotation(m_attachment_rotation);
 					m_meshnode->updateAbsolutePosition();
-					//m_meshnode->setParent(parent_bone);
 				}
 				else
 				{
 					if(parent_mesh){
-						m_meshnode->setPosition(parent_mesh->getPosition());
-						m_meshnode->setRotation(parent_mesh->getRotation());
+						m_meshnode->setParent(parent_mesh);
+						m_meshnode->setPosition(m_attachment_position);
+						m_meshnode->setRotation(m_attachment_rotation);
 						m_meshnode->updateAbsolutePosition();
-						//m_meshnode->setParent(parent_mesh);
 					}
 					else if(parent_animated_mesh){
-						m_meshnode->setPosition(parent_animated_mesh->getPosition());
-						m_meshnode->setRotation(parent_animated_mesh->getRotation());
+						m_meshnode->setParent(parent_animated_mesh);
+						m_meshnode->setPosition(m_attachment_position);
+						m_meshnode->setRotation(m_attachment_rotation);
 						m_meshnode->updateAbsolutePosition();
-						//m_meshnode->setParent(parent_animated_mesh);
 					}
 					else if(parent_sprite){
-						m_meshnode->setPosition(parent_sprite->getPosition());
-						m_meshnode->setRotation(parent_sprite->getRotation());
+						m_meshnode->setParent(parent_sprite);
+						m_meshnode->setPosition(m_attachment_position);
+						m_meshnode->setRotation(m_attachment_rotation);
 						m_meshnode->updateAbsolutePosition();
-						//m_meshnode->setParent(parent_sprite);
 					}
 				}
 			}
 			if(m_animated_meshnode){
 				if(parent_bone){
-					m_animated_meshnode->setPosition(parent_bone->getPosition());
-					m_animated_meshnode->setRotation(parent_bone->getRotation());
+					m_animated_meshnode->setParent(parent_bone);
+					m_animated_meshnode->setPosition(m_attachment_position);
+					m_animated_meshnode->setRotation(m_attachment_rotation);
 					m_animated_meshnode->updateAbsolutePosition();
-					//m_animated_meshnode->setParent(parent_bone);
 				}
 				else
 				{
 					if(parent_mesh){
-						m_animated_meshnode->setPosition(parent_mesh->getPosition());
-						m_animated_meshnode->setRotation(parent_mesh->getRotation());
+						m_animated_meshnode->setParent(parent_mesh);
+						m_animated_meshnode->setPosition(m_attachment_position);
+						m_animated_meshnode->setRotation(m_attachment_rotation);
 						m_animated_meshnode->updateAbsolutePosition();
-						//m_animated_meshnode->setParent(parent_mesh);
 					}
 					else if(parent_animated_mesh){
-						m_animated_meshnode->setPosition(parent_animated_mesh->getPosition());
-						m_animated_meshnode->setRotation(parent_animated_mesh->getRotation());
+						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();
-						//m_animated_meshnode->setParent(parent_animated_mesh);
 					}
 					else if(parent_sprite){
-						m_animated_meshnode->setPosition(parent_sprite->getPosition());
-						m_animated_meshnode->setRotation(parent_sprite->getRotation());
+						m_animated_meshnode->setParent(parent_sprite);
+						m_animated_meshnode->setPosition(m_attachment_position);
+						m_animated_meshnode->setRotation(m_attachment_rotation);
 						m_animated_meshnode->updateAbsolutePosition();
-						//m_animated_meshnode->setParent(parent_sprite);
 					}
 				}
 			}
 			if(m_spritenode){
 				if(parent_bone){
-					m_spritenode->setPosition(parent_bone->getPosition());
-					m_spritenode->setRotation(parent_bone->getRotation());
+					m_spritenode->setParent(parent_bone);
+					m_spritenode->setPosition(m_attachment_position);
+					m_spritenode->setRotation(m_attachment_rotation);
 					m_spritenode->updateAbsolutePosition();
-					//m_spritenode->setParent(parent_bone);
 				}
 				else
 				{
 					if(parent_mesh){
-						m_spritenode->setPosition(parent_mesh->getPosition());
-						m_spritenode->setRotation(parent_mesh->getRotation());
+						m_spritenode->setParent(parent_mesh);
+						m_spritenode->setPosition(m_attachment_position);
+						m_spritenode->setRotation(m_attachment_rotation);
 						m_spritenode->updateAbsolutePosition();
-						//m_spritenode->setParent(parent_mesh);
 					}
 					else if(parent_animated_mesh){
-						m_spritenode->setPosition(parent_animated_mesh->getPosition());
-						m_spritenode->setRotation(parent_animated_mesh->getRotation());
+						m_spritenode->setParent(parent_animated_mesh);
+						m_spritenode->setPosition(m_attachment_position);
+						m_spritenode->setRotation(m_attachment_rotation);
 						m_spritenode->updateAbsolutePosition();
-						//m_spritenode->setParent(parent_animated_mesh);
 					}
 					else if(parent_sprite){
-						m_spritenode->setPosition(parent_sprite->getPosition());
-						m_spritenode->setRotation(parent_sprite->getRotation());
+						m_spritenode->setParent(parent_sprite);
+						m_spritenode->setPosition(m_attachment_position);
+						m_spritenode->setRotation(m_attachment_rotation);
 						m_spritenode->updateAbsolutePosition();
-						//m_spritenode->setParent(parent_sprite);
 					}
 				}
 			}
@@ -1468,8 +1500,7 @@ public:
 			m_frame_speed = readF1000(is);
 			m_frame_blend = readF1000(is);
 
-			updateAnimations();
-			expireVisuals();
+			expireVisuals(); // Automatically calls the proper function next
 		}
 		else if(cmd == GENERIC_CMD_SET_BONE_POSROT)
 		{
@@ -1478,8 +1509,7 @@ public:
 			v3f rotation = readV3F1000(is);
 			m_bone_posrot[bone] = core::vector2d<v3f>(position, rotation);
 
-			updateBonePosRot();
-			expireVisuals();
+			expireVisuals(); // Automatically calls the proper function next
 		}
 		else if(cmd == GENERIC_CMD_SET_ATTACHMENT)
 		{
@@ -1489,10 +1519,10 @@ public:
 				obj = NULL;
 			m_attachment_parent = obj;
 			m_attachment_bone = deSerializeString(is);
-			m_attacmhent_position = readV3F1000(is);
+			m_attachment_position = readV3F1000(is);
 			m_attachment_rotation = readV3F1000(is);
 
-			updateAttachments();
+			expireVisuals(); // Automatically calls the proper function next
 		}
 		else if(cmd == GENERIC_CMD_PUNCHED)
 		{
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 3289f9077..7857df1aa 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -356,7 +356,10 @@ LuaEntitySAO::LuaEntitySAO(ServerEnvironment *env, v3f pos,
 	m_last_sent_velocity(0,0,0),
 	m_last_sent_position_timer(0),
 	m_last_sent_move_precision(0),
-	m_armor_groups_sent(false)
+	m_armor_groups_sent(false),
+	m_animations_sent(false),
+	m_animations_bone_sent(false),
+	m_attachment_sent(false)
 {
 	// Only register type if no environment supplied
 	if(env == NULL){
@@ -514,6 +517,32 @@ void LuaEntitySAO::step(float dtime, bool send_recommended)
 		ActiveObjectMessage aom(getId(), true, str);
 		m_messages_out.push_back(aom);
 	}
+
+	if(m_animations_sent == false){
+		m_animations_sent = true;
+		std::string str = gob_cmd_set_animations(m_animation_frames, m_animation_speed, m_animation_blend);
+		// create message and add to list
+		ActiveObjectMessage aom(getId(), true, str);
+		m_messages_out.push_back(aom);
+	}
+
+	if(m_animations_bone_sent == false){
+		m_animations_bone_sent = true;
+		for(std::map<std::string, core::vector2d<v3f> >::const_iterator ii = m_animation_bone.begin(); ii != m_animation_bone.end(); ++ii){
+			std::string str = gob_cmd_set_bone_posrot((*ii).first, (*ii).second.X, (*ii).second.Y);
+			// create message and add to list
+			ActiveObjectMessage aom(getId(), true, str);
+			m_messages_out.push_back(aom);
+		}
+	}
+
+	if(m_attachment_sent == false){
+		m_attachment_sent = true;
+		std::string str = gob_cmd_set_attachment(m_attachment_parent_id, m_attachment_bone, m_attachment_position, m_attachment_rotation);
+		// create message and add to list
+		ActiveObjectMessage aom(getId(), true, str);
+		m_messages_out.push_back(aom);
+	}
 }
 
 std::string LuaEntitySAO::getClientInitializationData()
@@ -672,18 +701,16 @@ void LuaEntitySAO::setArmorGroups(const ItemGroupList &armor_groups)
 
 void LuaEntitySAO::setAnimations(v2f frames, float frame_speed, float frame_blend)
 {
-	std::string str = gob_cmd_set_animations(frames, frame_speed, frame_blend);
-	// create message and add to list
-	ActiveObjectMessage aom(getId(), true, str);
-	m_messages_out.push_back(aom);
+	m_animation_frames = frames;
+	m_animation_speed = frame_speed;
+	m_animation_blend = frame_blend;
+	m_animations_sent = false;
 }
 
 void LuaEntitySAO::setBonePosRot(std::string bone, v3f position, v3f rotation)
 {
-	std::string str = gob_cmd_set_bone_posrot(bone, position, rotation);
-	// create message and add to list
-	ActiveObjectMessage aom(getId(), true, str);
-	m_messages_out.push_back(aom);
+	m_animation_bone[bone] = core::vector2d<v3f>(position, rotation);
+	m_animations_bone_sent = false;
 }
 
 void LuaEntitySAO::setAttachment(ServerActiveObject *parent, std::string bone, v3f position, v3f rotation)
@@ -700,10 +727,11 @@ void LuaEntitySAO::setAttachment(ServerActiveObject *parent, std::string bone, v
 	m_parent = parent;
 
 	// Client attachment:
-	std::string str = gob_cmd_set_attachment(parent->getId(), bone, position, rotation);
-	// create message and add to list
-	ActiveObjectMessage aom(getId(), true, str);
-	m_messages_out.push_back(aom);
+	m_attachment_parent_id = parent->getId();
+	m_attachment_bone = bone;
+	m_attachment_position = position;
+	m_attachment_rotation = rotation;
+	m_attachment_sent = false;
 }
 
 ObjectProperties* LuaEntitySAO::accessObjectProperties()
@@ -831,6 +859,9 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, Player *player_, u16 peer_id_,
 	m_properties_sent(true),
 	m_privs(privs),
 	m_is_singleplayer(is_singleplayer),
+	m_animations_sent(false),
+	m_animations_bone_sent(false),
+	m_attachment_sent(false),
 	// public
 	m_teleported(false),
 	m_inventory_not_sent(false),
@@ -1051,6 +1082,32 @@ void PlayerSAO::step(float dtime, bool send_recommended)
 		ActiveObjectMessage aom(getId(), true, str);
 		m_messages_out.push_back(aom);
 	}
+
+	if(m_animations_sent == false){
+		m_animations_sent = true;
+		std::string str = gob_cmd_set_animations(m_animation_frames, m_animation_speed, m_animation_blend);
+		// create message and add to list
+		ActiveObjectMessage aom(getId(), true, str);
+		m_messages_out.push_back(aom);
+	}
+
+	if(m_animations_bone_sent == false){
+		m_animations_bone_sent = true;
+		for(std::map<std::string, core::vector2d<v3f> >::const_iterator ii = m_animation_bone.begin(); ii != m_animation_bone.end(); ++ii){
+			std::string str = gob_cmd_set_bone_posrot((*ii).first, (*ii).second.X, (*ii).second.Y);
+			// create message and add to list
+			ActiveObjectMessage aom(getId(), true, str);
+			m_messages_out.push_back(aom);
+		}
+	}
+
+	if(m_attachment_sent == false){
+		m_attachment_sent = true;
+		std::string str = gob_cmd_set_attachment(m_attachment_parent_id, m_attachment_bone, m_attachment_position, m_attachment_rotation);
+		// create message and add to list
+		ActiveObjectMessage aom(getId(), true, str);
+		m_messages_out.push_back(aom);
+	}
 }
 
 void PlayerSAO::setBasePosition(const v3f &position)
@@ -1176,18 +1233,18 @@ void PlayerSAO::setArmorGroups(const ItemGroupList &armor_groups)
 
 void PlayerSAO::setAnimations(v2f frames, float frame_speed, float frame_blend)
 {
-	std::string str = gob_cmd_set_animations(frames, frame_speed, frame_blend);
-	// create message and add to list
-	ActiveObjectMessage aom(getId(), true, str);
-	m_messages_out.push_back(aom);
+	// store these so they can be updated to clients
+	m_animation_frames = frames;
+	m_animation_speed = frame_speed;
+	m_animation_blend = frame_blend;
+	m_animations_sent = false;
 }
 
 void PlayerSAO::setBonePosRot(std::string bone, v3f position, v3f rotation)
 {
-	std::string str = gob_cmd_set_bone_posrot(bone, position, rotation);
-	// create message and add to list
-	ActiveObjectMessage aom(getId(), true, str);
-	m_messages_out.push_back(aom);
+	// store these so they can be updated to clients
+	m_animation_bone[bone] = core::vector2d<v3f>(position, rotation);
+	m_animations_bone_sent = false;
 }
 
 void PlayerSAO::setAttachment(ServerActiveObject *parent, std::string bone, v3f position, v3f rotation)
@@ -1204,10 +1261,11 @@ void PlayerSAO::setAttachment(ServerActiveObject *parent, std::string bone, v3f
 	m_parent = parent;
 
 	// Client attachment:
-	std::string str = gob_cmd_set_attachment(parent->getId(), bone, position, rotation);
-	// create message and add to list
-	ActiveObjectMessage aom(getId(), true, str);
-	m_messages_out.push_back(aom);
+	m_attachment_parent_id = parent->getId();
+	m_attachment_bone = bone;
+	m_attachment_position = position;
+	m_attachment_rotation = rotation;
+	m_attachment_sent = false;
 }
 
 ObjectProperties* PlayerSAO::accessObjectProperties()
diff --git a/src/content_sao.h b/src/content_sao.h
index e4d81cd2d..5bcd3c77f 100644
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -99,7 +99,21 @@ private:
 	float m_last_sent_position_timer;
 	float m_last_sent_move_precision;
 	bool m_armor_groups_sent;
+	
+	v2f m_animation_frames;
+	float m_animation_speed;
+	float m_animation_blend;
+	bool m_animations_sent;
+
+	std::map<std::string, core::vector2d<v3f> > m_animation_bone;
+	bool m_animations_bone_sent;
+	
 	ServerActiveObject *m_parent;
+	int m_attachment_parent_id;
+	std::string m_attachment_bone;
+	v3f m_attachment_position;
+	v3f m_attachment_rotation;
+	bool m_attachment_sent;
 };
 
 /*
@@ -236,13 +250,30 @@ private:
 	bool m_position_not_sent;
 	ItemGroupList m_armor_groups;
 	bool m_armor_groups_sent;
-	ServerActiveObject *m_parent;
+
+
+
 	bool m_properties_sent;
 	struct ObjectProperties m_prop;
 	// Cached privileges for enforcement
 	std::set<std::string> m_privs;
 	bool m_is_singleplayer;
 
+	v2f m_animation_frames;
+	float m_animation_speed;
+	float m_animation_blend;
+	bool m_animations_sent;
+
+	std::map<std::string, core::vector2d<v3f> > m_animation_bone;
+	bool m_animations_bone_sent;
+	
+	ServerActiveObject *m_parent;
+	int m_attachment_parent_id;
+	std::string m_attachment_bone;
+	v3f m_attachment_position;
+	v3f m_attachment_rotation;
+	bool m_attachment_sent;
+
 public:
 	// Some flags used by Server
 	bool m_teleported;

From 52fcb0b4b9c3e0f80881d0a9295e742687bdfb1c Mon Sep 17 00:00:00 2001
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 4 Nov 2012 23:54:50 +0200
Subject: [PATCH 18/24] Send animations, bone overrides and attachments in
 entity initialization. Clients no longer have to be near an object when an
 animation or attachment is set to see the changes, and newly connected
 clients (or a client that simply renders the object for the first time) will
 get all of those settings. Therefore, the lua script no longer needs to run
 every X seconds either, just once per entity.

Finish fixing the material color code. But it won't work until MineTest has dynamic lighting... another day another feature.

Extra checks for the bone positioning / rotation code

Many checks and consistency improvements to the client attachment code

Make a separate function for checking if a client object is attached. A more in-depth change will be needed here to fix reading of invalid pointers

Use a different method of fetching the parent. Fixes the mass segmentation faults when rendering an attachment (some still happen though)

Major change to how attachments are handled. Fix the last segmentaton fault, which was due to the parent becoming invalid while being refreshed / removed which would bause the child to remain attached to nothing. Parents remove their children when being deleted themselves and add them back when re-added. Attachments are stored inside a 2D a vector which easily allows both a child to find their parent and a parent to find its children.

Remove attachment list entry when an object is being permanently removed. Also avoid duplicate entries in this list when re-attaching the same object

The "big code comments" can now go away. Client attachments almost work properly, and I know what else needs to be done
---
 src/clientobject.cpp  |   2 +-
 src/clientobject.h    |   3 +-
 src/content_cao.cpp   | 309 ++++++++++++++++++++++++++++--------------
 src/content_sao.cpp   |  35 +++--
 src/content_sao.h     |   2 +-
 src/environment.cpp   |   2 +-
 src/genericobject.cpp |   6 +-
 src/genericobject.h   |   6 +-
 8 files changed, 249 insertions(+), 116 deletions(-)

diff --git a/src/clientobject.cpp b/src/clientobject.cpp
index 869bd7483..e1dbaf627 100644
--- a/src/clientobject.cpp
+++ b/src/clientobject.cpp
@@ -36,7 +36,7 @@ ClientActiveObject::ClientActiveObject(u16 id, IGameDef *gamedef,
 
 ClientActiveObject::~ClientActiveObject()
 {
-	removeFromScene();
+	removeFromScene(true);
 }
 
 ClientActiveObject* ClientActiveObject::create(u8 type, IGameDef *gamedef,
diff --git a/src/clientobject.h b/src/clientobject.h
index e08b78c57..ff9f9f37b 100644
--- a/src/clientobject.h
+++ b/src/clientobject.h
@@ -49,7 +49,7 @@ public:
 
 	virtual void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
 			IrrlichtDevice *irr){}
-	virtual void removeFromScene(){}
+	virtual void removeFromScene(bool permanent){}
 	// 0 <= light_at_pos <= LIGHT_SUN
 	virtual void updateLight(u8 light_at_pos){}
 	virtual v3s16 getLightPosition(){return v3s16(0,0,0);}
@@ -61,6 +61,7 @@ public:
 	virtual scene::IBillboardSceneNode *getSpriteSceneNode(){return NULL;}
 	virtual bool isPlayer(){return false;}
 	virtual bool isLocalPlayer(){return false;}
+	virtual void updateParent(){}
 	virtual bool doShowSelectionBox(){return true;}
 	
 	// Step object in time
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index deb9aa903..c2cce3d58 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -51,6 +51,8 @@ struct ToolCapabilities;
 
 core::map<u16, ClientActiveObject::Factory> ClientActiveObject::m_types;
 
+std::vector<core::vector2d<int> > attachment_list; // X is child ID, Y is parent ID
+
 /*
 	SmoothTranslator
 */
@@ -580,8 +582,7 @@ private:
 	v2f m_frames;
 	int m_frame_speed;
 	int m_frame_blend;
-	std::map<std::string, core::vector2d<v3f> > m_bone_posrot;
-	ClientActiveObject* m_attachment_parent;
+	std::map<std::string, core::vector2d<v3f> > m_bone_posrot; // stores position and rotation for each bone name
 	std::string m_attachment_bone;
 	v3f m_attachment_position;
 	v3f m_attachment_rotation;
@@ -624,7 +625,6 @@ public:
 		m_frame_speed(15),
 		m_frame_blend(0),
 		// Nothing to do for m_bone_posrot
-		m_attachment_parent(NULL),
 		m_attachment_bone(""),
 		m_attachment_position(v3f(0,0,0)),
 		m_attachment_rotation(v3f(0,0,0)),
@@ -693,28 +693,43 @@ public:
 	}
 	core::aabbox3d<f32>* getSelectionBox()
 	{
-		if(!m_prop.is_visible || !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 v3f(0,0,0); // Just in case
+		}
 		return pos_translator.vect_show;
 	}
 
 	scene::IMeshSceneNode *getMeshSceneNode()
 	{
-		return m_meshnode;
+		if(m_meshnode)
+			return m_meshnode;
+		return NULL;
 	}
 
 	scene::IAnimatedMeshSceneNode *getAnimatedMeshSceneNode()
 	{
-		return m_animated_meshnode;
+		if(m_animated_meshnode)
+			return m_animated_meshnode;
+		return NULL;
 	}
 
 	scene::IBillboardSceneNode *getSpriteSceneNode()
 	{
-		return m_spritenode;
+		if(m_spritenode)
+			return m_spritenode;
+		return NULL;
 	}
 
 	bool isPlayer()
@@ -727,8 +742,80 @@ public:
 		return m_is_local_player;
 	}
 
-	void removeFromScene()
+	void updateParent()
 	{
+		updateAttachments();
+	}
+
+	ClientActiveObject *getParent()
+	{
+		ClientActiveObject *obj = NULL;
+		for(std::vector<core::vector2d<int> >::const_iterator cii = attachment_list.begin(); cii != attachment_list.end(); cii++)
+		{
+			if(cii->X == this->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)
+	{
+		// bool permanent should be true when removing the object permanently and false when it's only refreshed (and comes back in a few frames)
+
+		// If this object is being permanently removed, delete it from the attachments list
+		if(permanent)
+		{
+			for(std::vector<core::vector2d<int> >::iterator ii = attachment_list.begin(); ii != attachment_list.end(); ii++)
+			{
+				if(ii->X == this->getId()) // This is the ID of our object
+				{
+					attachment_list.erase(ii);
+					break;
+				}
+			}
+		}
+
+		// If this object is being removed, either permanently or just to refresh it, then all
+		// objects attached to it must be unparented else Irrlicht causes a segmentation fault.
+		for(std::vector<core::vector2d<int> >::iterator ii = attachment_list.begin(); ii != attachment_list.end(); ii++)
+		{
+			if(ii->Y == this->getId()) // This is a child of our parent
+			{
+				ClientActiveObject *obj = m_env->getActiveObject(ii->X); // Get the object of the child
+				if(obj)
+				{
+					if(permanent)
+					{
+						// The parent is being permanently removed, so the child stays detached
+						ii->Y = 0;
+						obj->updateParent();
+					}
+					else
+					{
+						// The parent is being refreshed, detach our child enough to avoid bad memory reads
+						// This only stays into effect for a few frames, as addToScene will parent its children back
+						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());
+					}
+				}
+			}
+		}
+
 		if(m_meshnode){
 			m_meshnode->remove();
 			m_meshnode = NULL;
@@ -749,6 +836,18 @@ public:
 		m_smgr = smgr;
 		m_irr = irr;
 
+		// If this object has attachments and is being re-added after having been refreshed, parent its children back.
+		// The parent ID for this child hasn't been changed in attachment_list, so just update its attachments.
+		for(std::vector<core::vector2d<int> >::iterator ii = attachment_list.begin(); ii != attachment_list.end(); ii++)
+		{
+			if(ii->Y == this->getId()) // This is a child of our parent
+			{
+				ClientActiveObject *obj = m_env->getActiveObject(ii->X); // Get the object of the child
+				if(obj)
+					obj->updateParent();
+			}
+		}
+
 		if(m_meshnode != NULL || m_animated_meshnode != NULL || m_spritenode != NULL)
 			return;
 		
@@ -828,7 +927,7 @@ public:
 			mesh->addMeshBuffer(buf);
 			buf->drop();
 			}
-			m_meshnode = smgr->addMeshSceneNode(mesh, NULL);
+			m_meshnode = smgr->addMeshSceneNode(mesh, m_smgr->getRootSceneNode());
 			mesh->drop();
 			// Set it to use the materials of the meshbuffers directly.
 			// This is needed for changing the texture in the future
@@ -837,7 +936,7 @@ public:
 		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);
+			m_meshnode = smgr->addMeshSceneNode(mesh, m_smgr->getRootSceneNode());
 			mesh->drop();
 			
 			m_meshnode->setScale(v3f(m_prop.visual_size.X,
@@ -851,7 +950,7 @@ public:
 			scene::IAnimatedMesh *mesh = smgr->getMesh(m_prop.mesh.c_str());
 			if(mesh)
 			{
-				m_animated_meshnode = smgr->addAnimatedMeshSceneNode(mesh, NULL);
+				m_animated_meshnode = smgr->addAnimatedMeshSceneNode(mesh, m_smgr->getRootSceneNode());
 				m_animated_meshnode->animateJoints(); // Needed for some animations
 				m_animated_meshnode->setScale(v3f(m_prop.visual_size.X,
 						m_prop.visual_size.Y,
@@ -876,7 +975,7 @@ public:
 						irr->getVideoDriver()->getMeshManipulator();
 				scene::IMesh *mesh = manip->createMeshUniquePrimitives(item_mesh);
 
-				m_meshnode = smgr->addMeshSceneNode(mesh, NULL);
+				m_meshnode = smgr->addMeshSceneNode(mesh, m_smgr->getRootSceneNode());
 				mesh->drop();
 				
 				m_meshnode->setScale(v3f(m_prop.visual_size.X/2,
@@ -918,7 +1017,7 @@ public:
 	void updateLight(u8 light_at_pos)
 	{
 		// Objects attached to the local player should always be hidden
-		if(m_attachment_parent != NULL && m_attachment_parent->isLocalPlayer())
+		if(getParent() != NULL && getParent()->isLocalPlayer())
 			m_is_visible = false;
 		else
 			m_is_visible = (m_hp != 0);
@@ -949,7 +1048,7 @@ public:
 
 	void updateNodePos()
 	{
-		if(m_attachment_parent != NULL)
+		if(getParent() != NULL)
 			return;
 
 		if(m_meshnode){
@@ -975,14 +1074,27 @@ public:
 
 		if(m_visuals_expired && m_smgr && m_irr){
 			m_visuals_expired = false;
-			removeFromScene();
+			removeFromScene(false);
 			addToScene(m_smgr, m_gamedef->tsrc(), m_irr);
 			updateAnimations();
 			updateBonePosRot();
 			updateAttachments();
+			return;
 		}
 
-		if(m_attachment_parent == NULL) // Attachments should be glued to their parent by Irrlicht
+		if(getParent() != NULL) // Attachments should be glued to their parent by Irrlicht
+		{
+			// Set these for later
+			if(m_meshnode)
+				m_position = m_meshnode->getAbsolutePosition();
+			if(m_animated_meshnode)
+				m_position = m_animated_meshnode->getAbsolutePosition();
+			if(m_spritenode)
+				m_position = m_spritenode->getAbsolutePosition();
+			m_velocity = v3f(0,0,0);
+			m_acceleration = v3f(0,0,0);
+		}
+		else
 		{
 			if(m_prop.physical){
 				core::aabbox3d<f32> box = m_prop.collisionbox;
@@ -1047,17 +1159,10 @@ public:
 				updateTextures("");
 			}
 		}
-		if(fabs(m_prop.automatic_rotate) > 0.001){
+		if(getParent() == NULL && fabs(m_prop.automatic_rotate) > 0.001){
 			m_yaw += dtime * m_prop.automatic_rotate * 180 / M_PI;
 			updateNodePos();
 		}
-
-		// REMAINING ATTACHMENT ISSUES:
-		// Absolute Position of attachments is printed differently here than what it's set to in the SetAttachment function.
-		// Apparently here it prints the origin of the parent, but ignores the offset it was actually set to.
-
-		//if(m_animated_meshnode != NULL && m_attachment_parent != NULL)
-		//	errorstream<<"Attachment position, step: "<<m_animated_meshnode->getAbsolutePosition().X<<","<<m_animated_meshnode->getAbsolutePosition().Y<<","<<m_animated_meshnode->getAbsolutePosition().Z<<std::endl;
 	}
 
 	void updateTexturePos()
@@ -1123,9 +1228,15 @@ public:
 				m_spritenode->setMaterialTexture(0,
 						tsrc->getTextureRaw(texturestring));
 
-				// Does not work yet with the current lighting settings
-				m_meshnode->getMaterial(0).AmbientColor = m_prop.colors[0];
-				m_meshnode->getMaterial(0).DiffuseColor = m_prop.colors[0];
+				// 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_meshnode->getMaterial(0).AmbientColor = m_prop.colors[0];
+					m_meshnode->getMaterial(0).DiffuseColor = m_prop.colors[0];
+					m_meshnode->getMaterial(0).SpecularColor = m_prop.colors[0];
+				}
 			}
 		}
 		if(m_animated_meshnode)
@@ -1153,9 +1264,12 @@ public:
 				}
 				for (u32 i = 0; i < m_prop.colors.size(); ++i)
 				{
-					// Does not work yet with the current lighting settings
+					// 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];
 				}
 			}
 		}
@@ -1184,9 +1298,15 @@ public:
 					material.getTextureMatrix(0).setTextureTranslate(pos.X, pos.Y);
 					material.getTextureMatrix(0).setTextureScale(size.X, size.Y);
 
-					// Does not work yet with the current lighting settings
-					m_meshnode->getMaterial(i).AmbientColor = m_prop.colors[i];
-					m_meshnode->getMaterial(i).DiffuseColor = m_prop.colors[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.
+					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];
+					}
 				}
 			}
 			else if(m_prop.visual == "upright_sprite")
@@ -1201,9 +1321,15 @@ public:
 					buf->getMaterial().setTexture(0,
 							tsrc->getTextureRaw(tname));
 					
-					// Does not work yet with the current lighting settings
-					m_meshnode->getMaterial(0).AmbientColor = m_prop.colors[0];
-					m_meshnode->getMaterial(0).DiffuseColor = m_prop.colors[0];
+					// 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];
+					}
 				}
 				{
 					std::string tname = "unknown_object.png";
@@ -1216,9 +1342,21 @@ public:
 					buf->getMaterial().setTexture(0,
 							tsrc->getTextureRaw(tname));
 
-					// Does not work yet with the current lighting settings
-					m_meshnode->getMaterial(1).AmbientColor = m_prop.colors[1]; 
-					m_meshnode->getMaterial(1).DiffuseColor = m_prop.colors[1]; 
+					// 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];
+					}
 				}
 			}
 		}
@@ -1226,7 +1364,7 @@ public:
 
 	void updateAnimations()
 	{
-		if(!m_animated_meshnode)
+		if(m_animated_meshnode == NULL)
 			return;
 
 		m_animated_meshnode->setFrameLoop((int)m_frames.X, (int)m_frames.Y);
@@ -1236,14 +1374,17 @@ public:
 
 	void updateBonePosRot()
 	{
-		if(m_bone_posrot.size() > 0)
-		{
-			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_posrot.begin(); ii != m_bone_posrot.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(!m_bone_posrot.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_posrot.begin(); ii != m_bone_posrot.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);
 			}
@@ -1252,38 +1393,7 @@ public:
 	
 	void updateAttachments()
 	{
-		// REMAINING ATTACHMENT ISSUES:
-		// We get to this function when the object is an attachment that needs to
-		// be attached to its parent. If a bone is set we attach it to that skeletal
-		// bone, otherwise just to the object's origin. Attachments should not copy parent
-		// position as that's laggy... instead the Irrlicht function(s) to attach should
-		// be used. If the parent object is NULL that means this object should be detached.
-		// This function is only called whenever a GENERIC_CMD_SET_ATTACHMENT message is received.
-		
-		// We already attach our entity on the server too (copy position). Reason we attach
-		// to the client as well is first of all lag. The server sends the position
-		// of the child separately than that of the parent, so even on localhost
-		// you'd see the child lagging behind. Models are also client-side, so this is
-		// needed to read bone data and attach to joints.
-		
-		// Functions:
-		// - m_attachment_parent is ClientActiveObject* for the parent entity.
-		// - m_attachment_bone is std::string of the bone, "" means none.
-		// - m_attachment_position is v3f and represents the position offset of the attachment.
-		// - m_attachment_rotation is v3f and represents the rotation offset of the attachment.
-		
-		// Implementation information:
-		// From what I know, we need to get the AnimatedMeshSceneNode of m_attachment_parent then
-		// use parent_node->addChild(m_animated_meshnode) for position attachment. For skeletal
-		// attachment I don't know yet. Same must be used to detach when a NULL parent is received.
-
-		//Useful links:
-		// http://irrlicht.sourceforge.net/forum/viewtopic.php?t=7514
-		// http://www.irrlicht3d.org/wiki/index.php?n=Main.HowToUseTheNewAnimationSystem
-		// http://gamedev.stackexchange.com/questions/27363/finding-the-endpoint-of-a-named-bone-in-irrlicht
-		// Irrlicht documentation: http://irrlicht.sourceforge.net/docu/
-
-		if(m_attachment_parent == NULL || m_attachment_parent->isLocalPlayer()) // Detach
+		if(getParent() == NULL || getParent()->isLocalPlayer()) // Detach
 		{
 			if(m_meshnode)
 			{
@@ -1315,25 +1425,21 @@ public:
 		}
 		else // Attach
 		{
-			// REMAINING ATTACHMENT ISSUES:
-			// The code below should cause the child to get attached, but for some reason it's not working
-			// A debug print confirms both position and absolute position are set accordingly, but the object still doesn't show
-			// Position and Absolute Position were tested to be set properly here
-
 			scene::IMeshSceneNode *parent_mesh = NULL;
-			if(m_attachment_parent->getMeshSceneNode())
-				parent_mesh = m_attachment_parent->getMeshSceneNode();
+			if(getParent()->getMeshSceneNode())
+				parent_mesh = getParent()->getMeshSceneNode();
 			scene::IAnimatedMeshSceneNode *parent_animated_mesh = NULL;
-			if(m_attachment_parent->getAnimatedMeshSceneNode())
-				parent_animated_mesh = m_attachment_parent->getAnimatedMeshSceneNode();
+			if(getParent()->getAnimatedMeshSceneNode())
+				parent_animated_mesh = getParent()->getAnimatedMeshSceneNode();
 			scene::IBillboardSceneNode *parent_sprite = NULL;
-			if(m_attachment_parent->getSpriteSceneNode())
-				parent_sprite = m_attachment_parent->getSpriteSceneNode();
+			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){
@@ -1452,7 +1558,6 @@ public:
 		else if(cmd == GENERIC_CMD_UPDATE_POSITION)
 		{
 			// Not sent by the server if the object is an attachment
-			
 			m_position = readV3F1000(is);
 			m_velocity = readV3F1000(is);
 			m_acceleration = readV3F1000(is);
@@ -1462,6 +1567,9 @@ public:
 			bool is_end_position = readU8(is);
 			float update_interval = readF1000(is);
 
+			if(getParent() != NULL) // Just in case
+				return;
+
 			// Place us a bit higher if we're physical, to not sink into
 			// the ground due to sucky collision detection...
 			if(m_prop.physical)
@@ -1500,7 +1608,7 @@ public:
 			m_frame_speed = readF1000(is);
 			m_frame_blend = readF1000(is);
 
-			expireVisuals(); // Automatically calls the proper function next
+			updateAnimations();
 		}
 		else if(cmd == GENERIC_CMD_SET_BONE_POSROT)
 		{
@@ -1509,20 +1617,25 @@ public:
 			v3f rotation = readV3F1000(is);
 			m_bone_posrot[bone] = core::vector2d<v3f>(position, rotation);
 
-			expireVisuals(); // Automatically calls the proper function next
+			updateBonePosRot();
 		}
 		else if(cmd == GENERIC_CMD_SET_ATTACHMENT)
 		{
-			int parent_id = readS16(is);
-			ClientActiveObject *obj = m_env->getActiveObject(parent_id);
-			if(!parent_id || !obj)
-				obj = NULL;
-			m_attachment_parent = obj;
+			// If an entry already exists for this object, delete it first to avoid duplicates
+			for(std::vector<core::vector2d<int> >::iterator ii = attachment_list.begin(); ii != attachment_list.end(); ii++)
+			{
+				if(ii->X == this->getId()) // This is the ID of our object
+				{
+					attachment_list.erase(ii);
+					break;
+				}
+			}
+			attachment_list.push_back(core::vector2d<int>(this->getId(), readS16(is)));
 			m_attachment_bone = deSerializeString(is);
 			m_attachment_position = readV3F1000(is);
 			m_attachment_rotation = readV3F1000(is);
 
-			expireVisuals(); // Automatically calls the proper function next
+			updateAttachments();
 		}
 		else if(cmd == GENERIC_CMD_PUNCHED)
 		{
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 7857df1aa..c906383af 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -520,7 +520,7 @@ void LuaEntitySAO::step(float dtime, bool send_recommended)
 
 	if(m_animations_sent == false){
 		m_animations_sent = true;
-		std::string str = gob_cmd_set_animations(m_animation_frames, m_animation_speed, m_animation_blend);
+		std::string str = gob_cmd_update_animations(m_animation_frames, m_animation_speed, m_animation_blend);
 		// create message and add to list
 		ActiveObjectMessage aom(getId(), true, str);
 		m_messages_out.push_back(aom);
@@ -529,7 +529,7 @@ void LuaEntitySAO::step(float dtime, bool send_recommended)
 	if(m_animations_bone_sent == false){
 		m_animations_bone_sent = true;
 		for(std::map<std::string, core::vector2d<v3f> >::const_iterator ii = m_animation_bone.begin(); ii != m_animation_bone.end(); ++ii){
-			std::string str = gob_cmd_set_bone_posrot((*ii).first, (*ii).second.X, (*ii).second.Y);
+			std::string str = gob_cmd_update_bone_posrot((*ii).first, (*ii).second.X, (*ii).second.Y);
 			// create message and add to list
 			ActiveObjectMessage aom(getId(), true, str);
 			m_messages_out.push_back(aom);
@@ -538,7 +538,7 @@ void LuaEntitySAO::step(float dtime, bool send_recommended)
 
 	if(m_attachment_sent == false){
 		m_attachment_sent = true;
-		std::string str = gob_cmd_set_attachment(m_attachment_parent_id, m_attachment_bone, m_attachment_position, m_attachment_rotation);
+		std::string str = gob_cmd_update_attachment(m_attachment_parent_id, m_attachment_bone, m_attachment_position, m_attachment_rotation);
 		// create message and add to list
 		ActiveObjectMessage aom(getId(), true, str);
 		m_messages_out.push_back(aom);
@@ -555,9 +555,18 @@ std::string LuaEntitySAO::getClientInitializationData()
 	writeV3F1000(os, m_base_position);
 	writeF1000(os, m_yaw);
 	writeS16(os, m_hp);
-	writeU8(os, 2); // number of messages stuffed in here
+
+	writeU8(os, 4 + m_animation_bone.size()); // number of messages stuffed in here
 	os<<serializeLongString(getPropertyPacket()); // message 1
 	os<<serializeLongString(gob_cmd_update_armor_groups(m_armor_groups)); // 2
+	os<<serializeLongString(gob_cmd_update_animations(m_animation_frames, m_animation_speed, m_animation_blend)); // 3
+	if(m_animation_bone.size()){
+		for(std::map<std::string, core::vector2d<v3f> >::const_iterator ii = m_animation_bone.begin(); ii != m_animation_bone.end(); ++ii){
+			os<<serializeLongString(gob_cmd_update_bone_posrot((*ii).first, (*ii).second.X, (*ii).second.Y)); // m_animation_bone.size
+		}
+	}
+	os<<serializeLongString(gob_cmd_update_attachment(m_attachment_parent_id, m_attachment_bone, m_attachment_position, m_attachment_rotation)); // 4
+
 	// return result
 	return os.str();
 }
@@ -948,9 +957,19 @@ std::string PlayerSAO::getClientInitializationData()
 	writeV3F1000(os, m_player->getPosition() + v3f(0,BS*1,0));
 	writeF1000(os, m_player->getYaw());
 	writeS16(os, getHP());
-	writeU8(os, 2); // number of messages stuffed in here
+
+	writeU8(os, 4 + m_animation_bone.size()); // number of messages stuffed in here
 	os<<serializeLongString(getPropertyPacket()); // message 1
 	os<<serializeLongString(gob_cmd_update_armor_groups(m_armor_groups)); // 2
+	os<<serializeLongString(gob_cmd_update_animations(m_animation_frames, m_animation_speed, m_animation_blend)); // 3
+	if(m_animation_bone.size()){
+		for(std::map<std::string, core::vector2d<v3f> >::const_iterator ii = m_animation_bone.begin(); ii != m_animation_bone.end(); ++ii){
+			os<<serializeLongString(gob_cmd_update_bone_posrot((*ii).first, (*ii).second.X, (*ii).second.Y)); // m_animation_bone.size
+		}
+	}
+	os<<serializeLongString(gob_cmd_update_attachment(m_attachment_parent_id, m_attachment_bone, m_attachment_position, m_attachment_rotation)); // 4
+
+	// return result
 	return os.str();
 }
 
@@ -1085,7 +1104,7 @@ void PlayerSAO::step(float dtime, bool send_recommended)
 
 	if(m_animations_sent == false){
 		m_animations_sent = true;
-		std::string str = gob_cmd_set_animations(m_animation_frames, m_animation_speed, m_animation_blend);
+		std::string str = gob_cmd_update_animations(m_animation_frames, m_animation_speed, m_animation_blend);
 		// create message and add to list
 		ActiveObjectMessage aom(getId(), true, str);
 		m_messages_out.push_back(aom);
@@ -1094,7 +1113,7 @@ void PlayerSAO::step(float dtime, bool send_recommended)
 	if(m_animations_bone_sent == false){
 		m_animations_bone_sent = true;
 		for(std::map<std::string, core::vector2d<v3f> >::const_iterator ii = m_animation_bone.begin(); ii != m_animation_bone.end(); ++ii){
-			std::string str = gob_cmd_set_bone_posrot((*ii).first, (*ii).second.X, (*ii).second.Y);
+			std::string str = gob_cmd_update_bone_posrot((*ii).first, (*ii).second.X, (*ii).second.Y);
 			// create message and add to list
 			ActiveObjectMessage aom(getId(), true, str);
 			m_messages_out.push_back(aom);
@@ -1103,7 +1122,7 @@ void PlayerSAO::step(float dtime, bool send_recommended)
 
 	if(m_attachment_sent == false){
 		m_attachment_sent = true;
-		std::string str = gob_cmd_set_attachment(m_attachment_parent_id, m_attachment_bone, m_attachment_position, m_attachment_rotation);
+		std::string str = gob_cmd_update_attachment(m_attachment_parent_id, m_attachment_bone, m_attachment_position, m_attachment_rotation);
 		// create message and add to list
 		ActiveObjectMessage aom(getId(), true, str);
 		m_messages_out.push_back(aom);
diff --git a/src/content_sao.h b/src/content_sao.h
index 5bcd3c77f..9e79ec0e0 100644
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -264,7 +264,7 @@ private:
 	float m_animation_blend;
 	bool m_animations_sent;
 
-	std::map<std::string, core::vector2d<v3f> > m_animation_bone;
+	std::map<std::string, core::vector2d<v3f> > m_animation_bone; // stores position and rotation for each bone name
 	bool m_animations_bone_sent;
 	
 	ServerActiveObject *m_parent;
diff --git a/src/environment.cpp b/src/environment.cpp
index 4abba6359..bf90710d6 100644
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -2315,7 +2315,7 @@ void ClientEnvironment::removeActiveObject(u16 id)
 				<<"id="<<id<<" not found"<<std::endl;
 		return;
 	}
-	obj->removeFromScene();
+	obj->removeFromScene(true);
 	delete obj;
 	m_active_objects.remove(id);
 }
diff --git a/src/genericobject.cpp b/src/genericobject.cpp
index 480c4209d..1976d5c80 100644
--- a/src/genericobject.cpp
+++ b/src/genericobject.cpp
@@ -92,7 +92,7 @@ std::string gob_cmd_set_sprite(
 	return os.str();
 }
 
-std::string gob_cmd_set_animations(v2f frames, float frame_speed, float frame_blend)
+std::string gob_cmd_update_animations(v2f frames, float frame_speed, float frame_blend)
 {
 	std::ostringstream os(std::ios::binary);
 	// command 
@@ -104,7 +104,7 @@ std::string gob_cmd_set_animations(v2f frames, float frame_speed, float frame_bl
 	return os.str();
 }
 
-std::string gob_cmd_set_bone_posrot(std::string bone, v3f position, v3f rotation)
+std::string gob_cmd_update_bone_posrot(std::string bone, v3f position, v3f rotation)
 {
 	std::ostringstream os(std::ios::binary);
 	// command 
@@ -116,7 +116,7 @@ std::string gob_cmd_set_bone_posrot(std::string bone, v3f position, v3f rotation
 	return os.str();
 }
 
-std::string gob_cmd_set_attachment(int parent_id, std::string bone, v3f position, v3f rotation)
+std::string gob_cmd_update_attachment(int parent_id, std::string bone, v3f position, v3f rotation)
 {
 	std::ostringstream os(std::ios::binary);
 	// command 
diff --git a/src/genericobject.h b/src/genericobject.h
index 3504b0a46..34b8a8a51 100644
--- a/src/genericobject.h
+++ b/src/genericobject.h
@@ -57,11 +57,11 @@ std::string gob_cmd_set_sprite(
 	bool select_horiz_by_yawpitch
 );
 
-std::string gob_cmd_set_animations(v2f frames, float frame_speed, float frame_blend);
+std::string gob_cmd_update_animations(v2f frames, float frame_speed, float frame_blend);
 
-std::string gob_cmd_set_bone_posrot(std::string bone, v3f position, v3f rotation);
+std::string gob_cmd_update_bone_posrot(std::string bone, v3f position, v3f rotation);
 
-std::string gob_cmd_set_attachment(int parent_id, std::string bone, v3f position, v3f rotation);
+std::string gob_cmd_update_attachment(int parent_id, std::string bone, v3f position, v3f rotation);
 
 std::string gob_cmd_punched(s16 damage, s16 result_hp);
 

From 9259d028ac99fc699df69ded128df60dece712b9 Mon Sep 17 00:00:00 2001
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Wed, 7 Nov 2012 18:42:38 +0200
Subject: [PATCH 19/24] Update attachments at the ending of the addToScene
 function for parents. And with this... *drum roll* Client-side attachments
 are at last functional and stick visibly.

Fix the last segmentation fault (apparently). So far attachments seem to be fully functional, although removing the parent causes children to go to origin 0,0,0 and possibly still cause such a fault (though this should already be addressed)

Fix a bug in falling code where entities get stuck

Also check if the parent has been removed server-side, and detach the child if so. Fixes children going to origin 0,0,0 when their parent is removed.

Unset all attachment properties when permanently detaching (on both the client and server). Also store less data we don't need

Create a separate function for detaching, and also update lua api documentation

When a child is detached, update its position from the server to clients. This WILL cause it to get positioned slightly differently client side, as the server attachment system only copies parent origin and knows not about mesh / bone transformation. This prevents different clients seeing the object detached in different spots which is most correct

Update the position of attached players to clients. An attached player will see himself move, but this is currently VERY ugly and laggy as it is done by the server (it probably must stay this way too)

Use a different approach for locally attached players. This allows for smooth positio transitions to work, as well at the player turning around freely. Still buggy however
---
 doc/lua_api.txt         |   2 +
 src/content_cao.cpp     | 127 ++++++++++++++++++++++------------------
 src/content_sao.cpp     | 102 +++++++++++++++++++++-----------
 src/content_sao.h       |  14 ++---
 src/guiFormSpecMenu.cpp |   2 -
 src/localplayer.cpp     |   7 +++
 src/localplayer.h       |   4 ++
 src/scriptapi.cpp       |  17 ++++--
 src/server.cpp          |   4 +-
 src/serverobject.h      |   2 +-
 10 files changed, 173 insertions(+), 108 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index cb84b5459..45ee7648b 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -1104,6 +1104,8 @@ methods:
 - set_wielded_item(item): replaces the wielded item, returns true if successful
 - set_armor_groups({group1=rating, group2=rating, ...})
 - set_animations({x=1,y=1}, frame_speed=15, frame_blend=0)
+- set_attachment(parent, "", {x=0,y=0,z=0}, {x=0,y=0,z=0})
+- set_detachment()
 - set_bone_posrot("", {x=0,y=0,z=0}, {x=0,y=0,z=0})
 - set_properties(object property table)
 LuaEntitySAO-only: (no-op for other objects)
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index c2cce3d58..821862c9b 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -768,14 +768,23 @@ public:
 
 	void removeFromScene(bool permanent)
 	{
-		// bool permanent should be true when removing the object permanently and false when it's only refreshed (and comes back in a few frames)
-
-		// If this object is being permanently removed, delete it from the attachments list
-		if(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 = attachment_list.begin(); ii != attachment_list.end(); ii++)
 			{
-				if(ii->X == this->getId()) // This is the ID of our object
+				if(ii->Y == this->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->updateParent();
+				}
+			}
+			// Delete this object from the attachments list
+			for(std::vector<core::vector2d<int> >::iterator ii = attachment_list.begin(); ii != attachment_list.end(); ii++)
+			{
+				if(ii->X == this->getId()) // Is our object
 				{
 					attachment_list.erase(ii);
 					break;
@@ -783,39 +792,6 @@ public:
 			}
 		}
 
-		// If this object is being removed, either permanently or just to refresh it, then all
-		// objects attached to it must be unparented else Irrlicht causes a segmentation fault.
-		for(std::vector<core::vector2d<int> >::iterator ii = attachment_list.begin(); ii != attachment_list.end(); ii++)
-		{
-			if(ii->Y == this->getId()) // This is a child of our parent
-			{
-				ClientActiveObject *obj = m_env->getActiveObject(ii->X); // Get the object of the child
-				if(obj)
-				{
-					if(permanent)
-					{
-						// The parent is being permanently removed, so the child stays detached
-						ii->Y = 0;
-						obj->updateParent();
-					}
-					else
-					{
-						// The parent is being refreshed, detach our child enough to avoid bad memory reads
-						// This only stays into effect for a few frames, as addToScene will parent its children back
-						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());
-					}
-				}
-			}
-		}
-
 		if(m_meshnode){
 			m_meshnode->remove();
 			m_meshnode = NULL;
@@ -836,18 +812,6 @@ public:
 		m_smgr = smgr;
 		m_irr = irr;
 
-		// If this object has attachments and is being re-added after having been refreshed, parent its children back.
-		// The parent ID for this child hasn't been changed in attachment_list, so just update its attachments.
-		for(std::vector<core::vector2d<int> >::iterator ii = attachment_list.begin(); ii != attachment_list.end(); ii++)
-		{
-			if(ii->Y == this->getId()) // This is a child of our parent
-			{
-				ClientActiveObject *obj = m_env->getActiveObject(ii->X); // Get the object of the child
-				if(obj)
-					obj->updateParent();
-			}
-		}
-
 		if(m_meshnode != NULL || m_animated_meshnode != NULL || m_spritenode != NULL)
 			return;
 		
@@ -1074,14 +1038,45 @@ public:
 
 		if(m_visuals_expired && m_smgr && m_irr){
 			m_visuals_expired = false;
+
+			// Attachments, part 1: All attached objects must be unparented first, or Irrlicht causes a segmentation fault
+			for(std::vector<core::vector2d<int> >::iterator ii = attachment_list.begin(); ii != attachment_list.end(); ii++)
+			{
+				if(ii->Y == this->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);
 			updateAnimations();
 			updateBonePosRot();
 			updateAttachments();
-			return;
-		}
 
+			// Attachments, part 2: Now that the parent has been refreshed, put its attachments back
+			for(std::vector<core::vector2d<int> >::iterator ii = attachment_list.begin(); ii != attachment_list.end(); ii++)
+			{
+				if(ii->Y == this->getId()) // This is a child of our parent
+				{
+					ClientActiveObject *obj = m_env->getActiveObject(ii->X); // Get the object of the child
+					if(obj)
+						obj->updateParent();
+				}
+			}
+		}
 		if(getParent() != NULL) // Attachments should be glued to their parent by Irrlicht
 		{
 			// Set these for later
@@ -1093,6 +1088,12 @@ public:
 				m_position = m_spritenode->getAbsolutePosition();
 			m_velocity = v3f(0,0,0);
 			m_acceleration = v3f(0,0,0);
+
+			if(m_is_local_player) // Update local player attachment position
+			{
+				LocalPlayer *player = m_env->getLocalPlayer();
+				player->overridePosition = getParent()->getPosition();
+			}
 		}
 		else
 		{
@@ -1422,6 +1423,11 @@ public:
 				m_spritenode->setRotation(old_rotation);
 				m_spritenode->updateAbsolutePosition();
 			}
+			if(m_is_local_player)
+			{
+				LocalPlayer *player = m_env->getLocalPlayer();
+				player->isAttached = false;
+			}
 		}
 		else // Attach
 		{
@@ -1528,6 +1534,12 @@ public:
 					}
 				}
 			}
+			if(m_is_local_player)
+			{
+				LocalPlayer *player = m_env->getLocalPlayer();
+				player->isAttached = true;
+				player->overridePosition = m_attachment_position;
+			}
 		}
 	}
 
@@ -1557,7 +1569,8 @@ public:
 		}
 		else if(cmd == GENERIC_CMD_UPDATE_POSITION)
 		{
-			// Not sent by the server if the object is an attachment
+			// 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);
@@ -1567,14 +1580,14 @@ public:
 			bool is_end_position = readU8(is);
 			float update_interval = readF1000(is);
 
-			if(getParent() != NULL) // Just in case
-				return;
-
 			// 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_prop.physical)
 					pos_translator.update(m_position, is_end_position, update_interval);
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index c906383af..963e4b43a 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -218,7 +218,6 @@ public:
 
 		if(pos_f.getDistanceFrom(m_last_sent_position) > 0.05*BS)
 		{
-			// TODO: We shouldn't be sending this when the object is attached, but we can't check m_parent here
 			setBasePosition(pos_f);
 			m_last_sent_position = pos_f;
 
@@ -387,7 +386,6 @@ void LuaEntitySAO::addedToEnvironment(u32 dtime_s)
 	// Create entity from name
 	lua_State *L = m_env->getLua();
 	m_registered = scriptapi_luaentity_add(L, m_id, m_init_name.c_str());
-	m_parent = NULL;
 	
 	if(m_registered){
 		// Get properties
@@ -434,6 +432,17 @@ ServerActiveObject* LuaEntitySAO::create(ServerEnvironment *env, v3f pos,
 	return sao;
 }
 
+bool LuaEntitySAO::isAttached()
+{
+	if(!m_attachment_parent_id)
+		return false;
+	// Check if the parent still exists
+	ServerActiveObject *obj = m_env->getActiveObject(m_attachment_parent_id);
+	if(obj)
+		return true;
+	return false;
+}
+
 void LuaEntitySAO::step(float dtime, bool send_recommended)
 {
 	if(!m_properties_sent)
@@ -445,13 +454,23 @@ void LuaEntitySAO::step(float dtime, bool send_recommended)
 		m_messages_out.push_back(aom);
 	}
 
+	// If attached, check that our parent is still there. If it isn't, detach.
+	if(m_attachment_parent_id && !isAttached())
+	{
+		m_attachment_parent_id = 0;
+		m_attachment_bone = "";
+		m_attachment_position = v3f(0,0,0);
+		m_attachment_rotation = v3f(0,0,0);
+		sendPosition(false, true);
+	}
+
 	m_last_sent_position_timer += dtime;
-	
+
 	// Each frame, parent position is copied if the object is attached, otherwise it's calculated normally
 	// If the object gets detached this comes into effect automatically from the last known origin
-	if(m_parent != NULL)
+	if(isAttached())
 	{
-		v3f pos = m_parent->getBasePosition();
+		v3f pos = m_env->getActiveObject(m_attachment_parent_id)->getBasePosition();
 		m_base_position = pos;
 		m_velocity = v3f(0,0,0);
 		m_acceleration = v3f(0,0,0);
@@ -491,7 +510,7 @@ void LuaEntitySAO::step(float dtime, bool send_recommended)
 	if(send_recommended == false)
 		return;
 
-	if(m_parent != NULL)
+	if(!isAttached())
 	{
 		// TODO: force send when acceleration changes enough?
 		float minchange = 0.2*BS;
@@ -608,7 +627,7 @@ int LuaEntitySAO::punch(v3f dir,
 	}
 
 	// It's best that attachments cannot be punched 
-	if(m_parent != NULL)
+	if(isAttached())
 		return 0;
 	
 	ItemStack *punchitem = NULL;
@@ -660,7 +679,7 @@ void LuaEntitySAO::rightClick(ServerActiveObject *clicker)
 
 void LuaEntitySAO::setPos(v3f pos)
 {
-	if(m_parent != NULL)
+	if(isAttached())
 		return;
 	m_base_position = pos;
 	sendPosition(false, true);
@@ -668,7 +687,7 @@ void LuaEntitySAO::setPos(v3f pos)
 
 void LuaEntitySAO::moveTo(v3f pos, bool continuous)
 {
-	if(m_parent != NULL)
+	if(isAttached())
 		return;
 	m_base_position = pos;
 	if(!continuous)
@@ -722,7 +741,7 @@ void LuaEntitySAO::setBonePosRot(std::string bone, v3f position, v3f rotation)
 	m_animations_bone_sent = false;
 }
 
-void LuaEntitySAO::setAttachment(ServerActiveObject *parent, std::string bone, v3f position, v3f rotation)
+void LuaEntitySAO::setAttachment(int parent_id, std::string bone, v3f position, v3f rotation)
 {
 	// Attachments need to be handled on both the server and client.
 	// If we just attach on the server, we can only copy the position of the parent. Attachments
@@ -732,11 +751,7 @@ void LuaEntitySAO::setAttachment(ServerActiveObject *parent, std::string bone, v
 	// This breaks some things so we also give the server the most accurate representation
 	// even if players only see the client changes.
 
-	// Server attachment:
-	m_parent = parent;
-
-	// Client attachment:
-	m_attachment_parent_id = parent->getId();
+	m_attachment_parent_id = parent_id;
 	m_attachment_bone = bone;
 	m_attachment_position = position;
 	m_attachment_rotation = rotation;
@@ -818,7 +833,7 @@ std::string LuaEntitySAO::getPropertyPacket()
 void LuaEntitySAO::sendPosition(bool do_interpolate, bool is_movement_end)
 {
 	// If the object is attached client-side, don't waste bandwidth sending its position to clients
-	if(m_parent != NULL)
+	if(isAttached())
 		return;
 	
 	m_last_sent_move_precision = m_base_position.getDistanceFrom(
@@ -872,7 +887,7 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, Player *player_, u16 peer_id_,
 	m_animations_bone_sent(false),
 	m_attachment_sent(false),
 	// public
-	m_teleported(false),
+	m_moved(false),
 	m_inventory_not_sent(false),
 	m_hp_not_sent(false),
 	m_wielded_item_not_sent(false)
@@ -919,7 +934,6 @@ void PlayerSAO::addedToEnvironment(u32 dtime_s)
 {
 	ServerActiveObject::addedToEnvironment(dtime_s);
 	ServerActiveObject::setBasePosition(m_player->getPosition());
-	m_parent = NULL;
 	m_player->setPlayerSAO(this);
 	m_player->peer_id = m_peer_id;
 	m_last_good_position = m_player->getPosition();
@@ -979,6 +993,17 @@ std::string PlayerSAO::getStaticData()
 	return "";
 }
 
+bool PlayerSAO::isAttached()
+{
+	if(!m_attachment_parent_id)
+		return false;
+	// Check if the parent still exists
+	ServerActiveObject *obj = m_env->getActiveObject(m_attachment_parent_id);
+	if(obj)
+		return true;
+	return false;
+}
+
 void PlayerSAO::step(float dtime, bool send_recommended)
 {
 	if(!m_properties_sent)
@@ -990,14 +1015,25 @@ void PlayerSAO::step(float dtime, bool send_recommended)
 		m_messages_out.push_back(aom);
 	}
 
+	// If attached, check that our parent is still there. If it isn't, detach.
+	if(m_attachment_parent_id && !isAttached())
+	{
+		m_attachment_parent_id = 0;
+		m_attachment_bone = "";
+		m_attachment_position = v3f(0,0,0);
+		m_attachment_rotation = v3f(0,0,0);
+		m_player->setPosition(m_last_good_position);
+		m_moved = true;
+	}
+
 	m_time_from_last_punch += dtime;
 	m_nocheat_dig_time += dtime;
 
 	// Each frame, parent position is copied if the object is attached, otherwise it's calculated normally
 	// If the object gets detached this comes into effect automatically from the last known origin
-	if(m_parent != NULL)
+	if(isAttached())
 	{
-		v3f pos = m_parent->getBasePosition();
+		v3f pos = m_env->getActiveObject(m_attachment_parent_id)->getBasePosition();
 		m_last_good_position = pos;
 		m_last_good_position_age = 0;
 		m_player->setPosition(pos);
@@ -1053,7 +1089,7 @@ void PlayerSAO::step(float dtime, bool send_recommended)
 							<<" moved too fast; resetting position"
 							<<std::endl;
 					m_player->setPosition(m_last_good_position);
-					m_teleported = true;
+					m_moved = true;
 				}
 				m_last_good_position_age = 0;
 			}
@@ -1064,13 +1100,13 @@ void PlayerSAO::step(float dtime, bool send_recommended)
 		return;
 
 	// If the object is attached client-side, don't waste bandwidth sending its position to clients
-	if(m_position_not_sent && m_parent == NULL)
+	if(m_position_not_sent && !isAttached())
 	{
 		m_position_not_sent = false;
 		float update_interval = m_env->getSendRecommendedInterval();
 		v3f pos;
-		if(m_parent != NULL) // Just in case we ever do send attachment position too
-			pos = m_parent->getBasePosition();
+		if(isAttached()) // Just in case we ever do send attachment position too
+			pos = m_env->getActiveObject(m_attachment_parent_id)->getBasePosition();
 		else
 			pos = m_player->getPosition() + v3f(0,BS*1,0);
 		std::string str = gob_cmd_update_position(
@@ -1138,26 +1174,26 @@ void PlayerSAO::setBasePosition(const v3f &position)
 
 void PlayerSAO::setPos(v3f pos)
 {
-	if(m_parent != NULL)
+	if(isAttached())
 		return;
 	m_player->setPosition(pos);
 	// Movement caused by this command is always valid
 	m_last_good_position = pos;
 	m_last_good_position_age = 0;
 	// Force position change on client
-	m_teleported = true;
+	m_moved = true;
 }
 
 void PlayerSAO::moveTo(v3f pos, bool continuous)
 {
-	if(m_parent != NULL)
+	if(isAttached())
 		return;
 	m_player->setPosition(pos);
 	// Movement caused by this command is always valid
 	m_last_good_position = pos;
 	m_last_good_position_age = 0;
 	// Force position change on client
-	m_teleported = true;
+	m_moved = true;
 }
 
 int PlayerSAO::punch(v3f dir,
@@ -1166,7 +1202,7 @@ int PlayerSAO::punch(v3f dir,
 	float time_from_last_punch)
 {
 	// It's best that attachments cannot be punched 
-	if(m_parent != NULL)
+	if(isAttached())
 		return 0;
 
 	if(!toolcap)
@@ -1266,7 +1302,7 @@ void PlayerSAO::setBonePosRot(std::string bone, v3f position, v3f rotation)
 	m_animations_bone_sent = false;
 }
 
-void PlayerSAO::setAttachment(ServerActiveObject *parent, std::string bone, v3f position, v3f rotation)
+void PlayerSAO::setAttachment(int parent_id, std::string bone, v3f position, v3f rotation)
 {
 	// Attachments need to be handled on both the server and client.
 	// If we just attach on the server, we can only copy the position of the parent. Attachments
@@ -1276,11 +1312,7 @@ void PlayerSAO::setAttachment(ServerActiveObject *parent, std::string bone, v3f
 	// This breaks some things so we also give the server the most accurate representation
 	// even if players only see the client changes.
 
-	// Server attachment:
-	m_parent = parent;
-
-	// Client attachment:
-	m_attachment_parent_id = parent->getId();
+	m_attachment_parent_id = parent_id;
 	m_attachment_bone = bone;
 	m_attachment_position = position;
 	m_attachment_rotation = rotation;
diff --git a/src/content_sao.h b/src/content_sao.h
index 9e79ec0e0..f6e0bac5b 100644
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -46,6 +46,7 @@ public:
 	virtual void addedToEnvironment(u32 dtime_s);
 	static ServerActiveObject* create(ServerEnvironment *env, v3f pos,
 			const std::string &data);
+	bool isAttached();
 	void step(float dtime, bool send_recommended);
 	std::string getClientInitializationData();
 	std::string getStaticData();
@@ -63,7 +64,7 @@ public:
 	void setArmorGroups(const ItemGroupList &armor_groups);
 	void setAnimations(v2f frames, float frame_speed, float frame_blend);
 	void setBonePosRot(std::string bone, v3f position, v3f rotation);
-	void setAttachment(ServerActiveObject *parent, std::string bone, v3f position, v3f rotation);
+	void setAttachment(int parent_id, std::string bone, v3f position, v3f rotation);
 	ObjectProperties* accessObjectProperties();
 	void notifyObjectPropertiesModified();
 	/* LuaEntitySAO-specific */
@@ -107,8 +108,7 @@ private:
 
 	std::map<std::string, core::vector2d<v3f> > m_animation_bone;
 	bool m_animations_bone_sent;
-	
-	ServerActiveObject *m_parent;
+
 	int m_attachment_parent_id;
 	std::string m_attachment_bone;
 	v3f m_attachment_position;
@@ -142,6 +142,7 @@ public:
 	bool unlimitedTransferDistance() const;
 	std::string getClientInitializationData();
 	std::string getStaticData();
+	bool isAttached();
 	void step(float dtime, bool send_recommended);
 	void setBasePosition(const v3f &position);
 	void setPos(v3f pos);
@@ -162,7 +163,7 @@ public:
 	void setArmorGroups(const ItemGroupList &armor_groups);
 	void setAnimations(v2f frames, float frame_speed, float frame_blend);
 	void setBonePosRot(std::string bone, v3f position, v3f rotation);
-	void setAttachment(ServerActiveObject *parent, std::string bone, v3f position, v3f rotation);
+	void setAttachment(int parent_id, std::string bone, v3f position, v3f rotation);
 	ObjectProperties* accessObjectProperties();
 	void notifyObjectPropertiesModified();
 
@@ -266,8 +267,7 @@ private:
 
 	std::map<std::string, core::vector2d<v3f> > m_animation_bone; // stores position and rotation for each bone name
 	bool m_animations_bone_sent;
-	
-	ServerActiveObject *m_parent;
+
 	int m_attachment_parent_id;
 	std::string m_attachment_bone;
 	v3f m_attachment_position;
@@ -276,7 +276,7 @@ private:
 
 public:
 	// Some flags used by Server
-	bool m_teleported;
+	bool m_moved;
 	bool m_inventory_not_sent;
 	bool m_hp_not_sent;
 	bool m_wielded_item_not_sent;
diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index 4db020c11..7f638830f 100644
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -714,7 +714,6 @@ void GUIFormSpecMenu::drawMenu()
 		Draw backgrounds
 	*/
 	for(u32 i=0; i<m_backgrounds.size(); i++)
-	{
 		const ImageDrawSpec &spec = m_backgrounds[i];
 		video::ITexture *texture =
 				m_gamedef->tsrc()->getTextureRaw(spec.name);
@@ -728,7 +727,6 @@ void GUIFormSpecMenu::drawMenu()
 			core::rect<s32>(core::position2d<s32>(0,0),
 					core::dimension2di(texture->getOriginalSize())),
 			NULL/*&AbsoluteClippingRect*/, colors, true);
-	}
 	
 	/*
 		Draw images
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 4b5e53fea..ecfa4467c 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -53,6 +53,13 @@ LocalPlayer::~LocalPlayer()
 void LocalPlayer::move(f32 dtime, Map &map, f32 pos_max_d,
 		core::list<CollisionInfo> *collision_info)
 {
+	// Copy parent position if local player is attached
+	if(isAttached)
+	{
+		setPosition(overridePosition);
+		return;
+	}
+
 	INodeDefManager *nodemgr = m_gamedef->ndef();
 
 	v3f position = getPosition();
diff --git a/src/localplayer.h b/src/localplayer.h
index fb57e6538..b613fdb0f 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -79,6 +79,10 @@ public:
 	{
 		return true;
 	}
+
+	bool isAttached;
+
+	v3f overridePosition;
 	
 	void move(f32 dtime, Map &map, f32 pos_max_d,
 			core::list<CollisionInfo> *collision_info);
diff --git a/src/scriptapi.cpp b/src/scriptapi.cpp
index 3c505c881..9fd55b2e3 100644
--- a/src/scriptapi.cpp
+++ b/src/scriptapi.cpp
@@ -2723,7 +2723,6 @@ private:
 		ServerActiveObject *co = getobject(ref);
 		if(co == NULL) return 0;
 		// Do it
-
 		v2f frames = v2f(1, 1);
 		if(!lua_isnil(L, 2))
 			frames = read_v2f(L, 2);
@@ -2744,7 +2743,6 @@ private:
 		ServerActiveObject *co = getobject(ref);
 		if(co == NULL) return 0;
 		// Do it
-
 		std::string bone = "";
 		if(!lua_isnil(L, 2))
 			bone = lua_tostring(L, 2);
@@ -2767,6 +2765,7 @@ private:
 		ServerActiveObject *parent = getobject(parent_ref);
 		if(co == NULL) return 0;
 		if(parent == NULL) return 0;
+		// Do it
 		std::string bone = "";
 		if(!lua_isnil(L, 3))
 			bone = lua_tostring(L, 3);
@@ -2776,9 +2775,18 @@ private:
 		v3f rotation = v3f(0, 0, 0);
 		if(!lua_isnil(L, 5))
 			rotation = read_v3f(L, 5);
-		// Do it
+		co->setAttachment(parent->getId(), bone, position, rotation);
+		return 0;
+	}
 
-		co->setAttachment(parent, bone, position, rotation);
+	// set_detachment(self)
+	static int l_set_detachment(lua_State *L)
+	{
+		ObjectRef *ref = checkobject(L, 1);
+		ServerActiveObject *co = getobject(ref);
+		if(co == NULL) return 0;
+		// Do it
+		co->setAttachment(0, "", v3f(0,0,0), v3f(0,0,0));
 		return 0;
 	}
 
@@ -3099,6 +3107,7 @@ const luaL_reg ObjectRef::methods[] = {
 	method(ObjectRef, set_animations),
 	method(ObjectRef, set_bone_posrot),
 	method(ObjectRef, set_attachment),
+	method(ObjectRef, set_detachment),
 	method(ObjectRef, set_properties),
 	// LuaEntitySAO-only
 	method(ObjectRef, setvelocity),
diff --git a/src/server.cpp b/src/server.cpp
index 930938ecb..1a401bb62 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -1371,9 +1371,9 @@ void Server::AsyncRunStep()
 			/*
 				Send player inventories and HPs if necessary
 			*/
-			if(playersao->m_teleported){
+			if(playersao->m_moved){
 				SendMovePlayer(client->peer_id);
-				playersao->m_teleported = false;
+				playersao->m_moved = false;
 			}
 			if(playersao->m_inventory_not_sent){
 				UpdateCrafting(client->peer_id);
diff --git a/src/serverobject.h b/src/serverobject.h
index 3dcb99552..a0886ed1e 100644
--- a/src/serverobject.h
+++ b/src/serverobject.h
@@ -156,7 +156,7 @@ public:
 	{}
 	virtual void setBonePosRot(std::string bone, v3f position, v3f rotation)
 	{}
-	virtual void setAttachment(ServerActiveObject *parent, std::string bone, v3f position, v3f rotation)
+	virtual void setAttachment(int parent_id, std::string bone, v3f position, v3f rotation)
 	{}
 	virtual ObjectProperties* accessObjectProperties()
 	{ return NULL; }

From 4d656963e42766a7c0250b1e0931638933f1b917 Mon Sep 17 00:00:00 2001
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Fri, 9 Nov 2012 16:45:29 +0200
Subject: [PATCH 20/24] Fix more things I forgot for attached players. Such
 players will now properly see themselves moving when attached, and the server
 will read their position accordingly

Fix attached players being able to bob their view and generate foostep sounds by pressing a movement key (running in place)
---
 src/content_cao.cpp |  1 -
 src/localplayer.cpp | 23 ++++++++++++++++-------
 src/nodedef.cpp     |  2 --
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 821862c9b..c3575af1f 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -1538,7 +1538,6 @@ public:
 			{
 				LocalPlayer *player = m_env->getLocalPlayer();
 				player->isAttached = true;
-				player->overridePosition = m_attachment_position;
 			}
 		}
 	}
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index ecfa4467c..63400cc29 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -34,6 +34,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 LocalPlayer::LocalPlayer(IGameDef *gamedef):
 	Player(gamedef),
+	isAttached(false),
+	overridePosition(v3f(0,0,0)),
 	m_sneak_node(32767,32767,32767),
 	m_sneak_node_exists(false),
 	m_old_node_below(32767,32767,32767),
@@ -53,6 +55,12 @@ LocalPlayer::~LocalPlayer()
 void LocalPlayer::move(f32 dtime, Map &map, f32 pos_max_d,
 		core::list<CollisionInfo> *collision_info)
 {
+	INodeDefManager *nodemgr = m_gamedef->ndef();
+
+	v3f position = getPosition();
+
+	v3f old_speed = m_speed;
+
 	// Copy parent position if local player is attached
 	if(isAttached)
 	{
@@ -60,12 +68,6 @@ void LocalPlayer::move(f32 dtime, Map &map, f32 pos_max_d,
 		return;
 	}
 
-	INodeDefManager *nodemgr = m_gamedef->ndef();
-
-	v3f position = getPosition();
-
-	v3f old_speed = m_speed;
-
 	// Skip collision detection if a special movement mode is used
 	bool fly_allowed = m_gamedef->checkLocalPrivilege("fly");
 	bool free_move = fly_allowed && g_settings->getBool("free_move");
@@ -359,7 +361,14 @@ void LocalPlayer::applyControl(float dtime)
 	
 	setPitch(control.pitch);
 	setYaw(control.yaw);
-	
+
+	// Nullify speed and don't run positioning code if the player is attached
+	if(isAttached)
+	{
+		setSpeed(v3f(0,0,0));
+		return;
+	}
+
 	v3f move_direction = v3f(0,0,1);
 	move_direction.rotateXZBy(getYaw());
 	
diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index 53deea11b..180219ba8 100644
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -254,7 +254,6 @@ void ContentFeatures::serialize(std::ostream &os)
 	os<<serializeString(liquid_alternative_flowing);
 	os<<serializeString(liquid_alternative_source);
 	writeU8(os, liquid_viscosity);
-	writeU8(os, liquid_renewable);
 	writeU8(os, light_source);
 	writeU32(os, damage_per_second);
 	node_box.serialize(os);
@@ -312,7 +311,6 @@ void ContentFeatures::deSerialize(std::istream &is)
 	liquid_alternative_flowing = deSerializeString(is);
 	liquid_alternative_source = deSerializeString(is);
 	liquid_viscosity = readU8(is);
-	liquid_renewable = readU8(is);
 	light_source = readU8(is);
 	damage_per_second = readU32(is);
 	node_box.deSerialize(is);

From fa67b46c042ed4df97102dabf9f1e7bc454b2acb Mon Sep 17 00:00:00 2001
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Fri, 9 Nov 2012 21:51:45 +0200
Subject: [PATCH 21/24] Allow Vanessa's texture filtering / mipmap patch to
 work on models, as well as all other node types

Initialize m_bone_posrot too

Update pos_translator for attached players, which should fix a bug noticed with carts where a detached player would travel from the detachment spot to where it was detached

Don't make attachments possible to right-click either

Properly apply object and text visibility for local attachments, and fix them showing when they shouldn't
---
 src/content_cao.cpp | 68 +++++++++++++++++++++++++++++++++++++--------
 src/content_sao.cpp | 15 +++++-----
 2 files changed, 63 insertions(+), 20 deletions(-)

diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index c3575af1f..09cc4818a 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -40,6 +40,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #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>
@@ -586,6 +587,7 @@ private:
 	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;
@@ -624,10 +626,11 @@ public:
 		m_frames(v2f(0,0)),
 		m_frame_speed(15),
 		m_frame_blend(0),
-		// Nothing to do for m_bone_posrot
+		m_bone_posrot(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),
@@ -891,7 +894,7 @@ public:
 			mesh->addMeshBuffer(buf);
 			buf->drop();
 			}
-			m_meshnode = smgr->addMeshSceneNode(mesh, m_smgr->getRootSceneNode());
+			m_meshnode = smgr->addMeshSceneNode(mesh, NULL);
 			mesh->drop();
 			// Set it to use the materials of the meshbuffers directly.
 			// This is needed for changing the texture in the future
@@ -900,7 +903,7 @@ public:
 		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, m_smgr->getRootSceneNode());
+			m_meshnode = smgr->addMeshSceneNode(mesh, NULL);
 			mesh->drop();
 			
 			m_meshnode->setScale(v3f(m_prop.visual_size.X,
@@ -914,7 +917,7 @@ public:
 			scene::IAnimatedMesh *mesh = smgr->getMesh(m_prop.mesh.c_str());
 			if(mesh)
 			{
-				m_animated_meshnode = smgr->addAnimatedMeshSceneNode(mesh, m_smgr->getRootSceneNode());
+				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,
@@ -939,7 +942,7 @@ public:
 						irr->getVideoDriver()->getMeshManipulator();
 				scene::IMesh *mesh = manip->createMeshUniquePrimitives(item_mesh);
 
-				m_meshnode = smgr->addMeshSceneNode(mesh, m_smgr->getRootSceneNode());
+				m_meshnode = smgr->addMeshSceneNode(mesh, NULL);
 				mesh->drop();
 				
 				m_meshnode->setScale(v3f(m_prop.visual_size.X/2,
@@ -981,7 +984,7 @@ public:
 	void updateLight(u8 light_at_pos)
 	{
 		// Objects attached to the local player should always be hidden
-		if(getParent() != NULL && getParent()->isLocalPlayer())
+		if(m_attached_to_local)
 			m_is_visible = false;
 		else
 			m_is_visible = (m_hp != 0);
@@ -1002,6 +1005,9 @@ public:
 				m_spritenode->setColor(color);
 				m_spritenode->setVisible(m_is_visible);
 			}
+			if(m_textnode){
+				m_textnode->setVisible(m_is_visible);
+			}
 		}
 	}
 
@@ -1034,8 +1040,6 @@ public:
 
 	void step(float dtime, ClientEnvironment *env)
 	{
-		v3f lastpos = pos_translator.vect_show;
-
 		if(m_visuals_expired && m_smgr && m_irr){
 			m_visuals_expired = false;
 
@@ -1077,6 +1081,17 @@ public:
 				}
 			}
 		}
+
+		// 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);
+
 		if(getParent() != NULL) // Attachments should be glued to their parent by Irrlicht
 		{
 			// Set these for later
@@ -1088,6 +1103,7 @@ public:
 				m_position = m_spritenode->getAbsolutePosition();
 			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
 			{
@@ -1097,6 +1113,8 @@ public:
 		}
 		else
 		{
+			v3f lastpos = pos_translator.vect_show;
+
 			if(m_prop.physical){
 				core::aabbox3d<f32> box = m_prop.collisionbox;
 				box.MinEdge *= BS;
@@ -1218,6 +1236,10 @@ public:
 	{
 		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_prop.visual == "sprite")
@@ -1234,10 +1256,14 @@ public:
 				// has directional lighting, it should work automatically.
 				if(m_prop.colors.size() >= 1)
 				{
-					m_meshnode->getMaterial(0).AmbientColor = m_prop.colors[0];
-					m_meshnode->getMaterial(0).DiffuseColor = m_prop.colors[0];
-					m_meshnode->getMaterial(0).SpecularColor = m_prop.colors[0];
+					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)
@@ -1262,6 +1288,10 @@ public:
 					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)
 				{
@@ -1308,6 +1338,10 @@ public:
 						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_prop.visual == "upright_sprite")
@@ -1331,6 +1365,10 @@ public:
 						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";
@@ -1358,6 +1396,10 @@ public:
 						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);
 				}
 			}
 		}
@@ -1394,7 +1436,9 @@ public:
 	
 	void updateAttachments()
 	{
-		if(getParent() == NULL || getParent()->isLocalPlayer()) // Detach
+		m_attached_to_local = getParent() != NULL && getParent()->isLocalPlayer();
+
+		if(getParent() == NULL || m_attached_to_local) // Detach or don't attach
 		{
 			if(m_meshnode)
 			{
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 963e4b43a..59f6c3c64 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -579,10 +579,8 @@ std::string LuaEntitySAO::getClientInitializationData()
 	os<<serializeLongString(getPropertyPacket()); // message 1
 	os<<serializeLongString(gob_cmd_update_armor_groups(m_armor_groups)); // 2
 	os<<serializeLongString(gob_cmd_update_animations(m_animation_frames, m_animation_speed, m_animation_blend)); // 3
-	if(m_animation_bone.size()){
-		for(std::map<std::string, core::vector2d<v3f> >::const_iterator ii = m_animation_bone.begin(); ii != m_animation_bone.end(); ++ii){
-			os<<serializeLongString(gob_cmd_update_bone_posrot((*ii).first, (*ii).second.X, (*ii).second.Y)); // m_animation_bone.size
-		}
+	for(std::map<std::string, core::vector2d<v3f> >::const_iterator ii = m_animation_bone.begin(); ii != m_animation_bone.end(); ++ii){
+		os<<serializeLongString(gob_cmd_update_bone_posrot((*ii).first, (*ii).second.X, (*ii).second.Y)); // m_animation_bone.size
 	}
 	os<<serializeLongString(gob_cmd_update_attachment(m_attachment_parent_id, m_attachment_bone, m_attachment_position, m_attachment_rotation)); // 4
 
@@ -673,6 +671,9 @@ void LuaEntitySAO::rightClick(ServerActiveObject *clicker)
 {
 	if(!m_registered)
 		return;
+	// It's best that attachments cannot be clicked
+	if(isAttached())
+		return;
 	lua_State *L = m_env->getLua();
 	scriptapi_luaentity_rightclick(L, m_id, clicker);
 }
@@ -976,10 +977,8 @@ std::string PlayerSAO::getClientInitializationData()
 	os<<serializeLongString(getPropertyPacket()); // message 1
 	os<<serializeLongString(gob_cmd_update_armor_groups(m_armor_groups)); // 2
 	os<<serializeLongString(gob_cmd_update_animations(m_animation_frames, m_animation_speed, m_animation_blend)); // 3
-	if(m_animation_bone.size()){
-		for(std::map<std::string, core::vector2d<v3f> >::const_iterator ii = m_animation_bone.begin(); ii != m_animation_bone.end(); ++ii){
-			os<<serializeLongString(gob_cmd_update_bone_posrot((*ii).first, (*ii).second.X, (*ii).second.Y)); // m_animation_bone.size
-		}
+	for(std::map<std::string, core::vector2d<v3f> >::const_iterator ii = m_animation_bone.begin(); ii != m_animation_bone.end(); ++ii){
+		os<<serializeLongString(gob_cmd_update_bone_posrot((*ii).first, (*ii).second.X, (*ii).second.Y)); // m_animation_bone.size
 	}
 	os<<serializeLongString(gob_cmd_update_attachment(m_attachment_parent_id, m_attachment_bone, m_attachment_position, m_attachment_rotation)); // 4
 

From 756db8174aa6a05eb998cfcec8eb5127053c5ea9 Mon Sep 17 00:00:00 2001
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Mon, 12 Nov 2012 16:35:10 +0200
Subject: [PATCH 22/24] A bunch of fixes

No longer hide players who are dead. With models, a death animation should be used instead

Some changes requested by celeron55

Rename a lot of things in the code, and use better lua api function names

Minor code corrections

Bump protocol version up, since the models / animations / attachments code creates new client<->server messages
---
 doc/lua_api.txt         |   8 +--
 src/client.cpp          |   8 +--
 src/clientobject.h      |   2 +-
 src/clientserver.h      |   7 ++-
 src/content_cao.cpp     | 119 +++++++++++++++++-----------------------
 src/content_sao.cpp     |  80 +++++++++++++--------------
 src/content_sao.h       |  24 ++++----
 src/environment.h       |   2 +
 src/genericobject.cpp   |   8 +--
 src/genericobject.h     |   8 +--
 src/guiFormSpecMenu.cpp |   2 +
 src/scriptapi.cpp       |  28 +++++-----
 src/serverobject.h      |   4 +-
 13 files changed, 144 insertions(+), 156 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 45ee7648b..fc51cb2f7 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -1103,10 +1103,10 @@ methods:
 - get_wielded_item() -> ItemStack
 - set_wielded_item(item): replaces the wielded item, returns true if successful
 - set_armor_groups({group1=rating, group2=rating, ...})
-- set_animations({x=1,y=1}, frame_speed=15, frame_blend=0)
-- set_attachment(parent, "", {x=0,y=0,z=0}, {x=0,y=0,z=0})
-- set_detachment()
-- set_bone_posrot("", {x=0,y=0,z=0}, {x=0,y=0,z=0})
+- set_animation({x=1,y=1}, frame_speed=15, frame_blend=0)
+- set_attach(parent, "", {x=0,y=0,z=0}, {x=0,y=0,z=0})
+- set_detach()
+- set_bone_position("", {x=0,y=0,z=0}, {x=0,y=0,z=0})
 - set_properties(object property table)
 LuaEntitySAO-only: (no-op for other objects)
 - setvelocity({x=num, y=num, z=num})
diff --git a/src/client.cpp b/src/client.cpp
index 7f5421747..9a056806b 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -821,8 +821,8 @@ bool Client::loadMedia(const std::string &data, const std::string &filename)
 	name = removeStringEnd(filename, image_ext);
 	if(name != "")
 	{
-		verbosestream<<"Client: Storing image into Irrlicht: "
-				<<"\""<<filename<<"\""<<std::endl;
+		verbosestream<<"Client: Attempting to load image "
+		<<"file \""<<filename<<"\""<<std::endl;
 
 		io::IFileSystem *irrfs = m_device->getFileSystem();
 		video::IVideoDriver *vdrv = m_device->getVideoDriver();
@@ -855,8 +855,8 @@ bool Client::loadMedia(const std::string &data, const std::string &filename)
 	name = removeStringEnd(filename, sound_ext);
 	if(name != "")
 	{
-		verbosestream<<"Client: Storing sound into Irrlicht: "
-				<<"\""<<filename<<"\""<<std::endl;
+		verbosestream<<"Client: Attempting to load sound "
+		<<"file \""<<filename<<"\""<<std::endl;
 		m_sound->loadSoundData(name, data);
 		return true;
 	}
diff --git a/src/clientobject.h b/src/clientobject.h
index ff9f9f37b..852d2c76b 100644
--- a/src/clientobject.h
+++ b/src/clientobject.h
@@ -61,7 +61,7 @@ public:
 	virtual scene::IBillboardSceneNode *getSpriteSceneNode(){return NULL;}
 	virtual bool isPlayer(){return false;}
 	virtual bool isLocalPlayer(){return false;}
-	virtual void updateParent(){}
+	virtual void setAttachments(){}
 	virtual bool doShowSelectionBox(){return true;}
 	
 	// Step object in time
diff --git a/src/clientserver.h b/src/clientserver.h
index 82e485d95..15a602fc8 100644
--- a/src/clientserver.h
+++ b/src/clientserver.h
@@ -67,9 +67,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 		TOCLIENT_DETACHED_INVENTORY
 	PROTOCOL_VERSION 13:
 		InventoryList field "Width" (deserialization fails with old versions)
+	PROTOCOL_VERSION 14:
+		New messages for mesh and bone animation, as well as attachments
+		GENERIC_CMD_SET_ANIMATION
+		GENERIC_CMD_SET_BONE_POSITION
+		GENERIC_CMD_SET_ATTACHMENT
 */
 
-#define PROTOCOL_VERSION 13
+#define PROTOCOL_VERSION 14
 
 #define PROTOCOL_ID 0x4f457403
 
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 09cc4818a..9c1171e1f 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -52,8 +52,6 @@ struct ToolCapabilities;
 
 core::map<u16, ClientActiveObject::Factory> ClientActiveObject::m_types;
 
-std::vector<core::vector2d<int> > attachment_list; // X is child ID, Y is parent ID
-
 /*
 	SmoothTranslator
 */
@@ -580,10 +578,10 @@ private:
 	v2s16 m_tx_basepos;
 	bool m_initial_tx_basepos_set;
 	bool m_tx_select_horiz_by_yawpitch;
-	v2f m_frames;
-	int m_frame_speed;
-	int m_frame_blend;
-	std::map<std::string, core::vector2d<v3f> > m_bone_posrot; // stores position and rotation for each bone name
+	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;
@@ -623,10 +621,10 @@ public:
 		m_tx_basepos(0,0),
 		m_initial_tx_basepos_set(false),
 		m_tx_select_horiz_by_yawpitch(false),
-		m_frames(v2f(0,0)),
-		m_frame_speed(15),
-		m_frame_blend(0),
-		m_bone_posrot(std::map<std::string, core::vector2d<v3f> >()),
+		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)),
@@ -709,7 +707,7 @@ public:
 				return m_animated_meshnode->getAbsolutePosition();
 			if(m_spritenode)
 				return m_spritenode->getAbsolutePosition();
-			return v3f(0,0,0); // Just in case
+			return m_position;
 		}
 		return pos_translator.vect_show;
 	}
@@ -745,7 +743,7 @@ public:
 		return m_is_local_player;
 	}
 
-	void updateParent()
+	void setAttachments()
 	{
 		updateAttachments();
 	}
@@ -753,9 +751,9 @@ public:
 	ClientActiveObject *getParent()
 	{
 		ClientActiveObject *obj = NULL;
-		for(std::vector<core::vector2d<int> >::const_iterator cii = attachment_list.begin(); cii != attachment_list.end(); cii++)
+		for(std::vector<core::vector2d<int> >::const_iterator cii = m_env->attachment_list.begin(); cii != m_env->attachment_list.end(); cii++)
 		{
-			if(cii->X == this->getId()){ // This ID is our child
+			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);
@@ -774,22 +772,22 @@ public:
 		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 = attachment_list.begin(); ii != attachment_list.end(); ii++)
+			for(std::vector<core::vector2d<int> >::iterator ii = m_env->attachment_list.begin(); ii != m_env->attachment_list.end(); ii++)
 			{
-				if(ii->Y == this->getId()) // Is a child of our object
+				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->updateParent();
+						obj->setAttachments();
 				}
 			}
 			// Delete this object from the attachments list
-			for(std::vector<core::vector2d<int> >::iterator ii = attachment_list.begin(); ii != attachment_list.end(); ii++)
+			for(std::vector<core::vector2d<int> >::iterator ii = m_env->attachment_list.begin(); ii != m_env->attachment_list.end(); ii++)
 			{
-				if(ii->X == this->getId()) // Is our object
+				if(ii->X == getId()) // Is our object
 				{
-					attachment_list.erase(ii);
+					m_env->attachment_list.erase(ii);
 					break;
 				}
 			}
@@ -983,31 +981,16 @@ public:
 		
 	void updateLight(u8 light_at_pos)
 	{
-		// Objects attached to the local player should always be hidden
-		if(m_attached_to_local)
-			m_is_visible = false;
-		else
-			m_is_visible = (m_hp != 0);
 		u8 li = decode_light(light_at_pos);
-
 		if(li != m_last_light){
 			m_last_light = li;
 			video::SColor color(255,li,li,li);
-			if(m_meshnode){
+			if(m_meshnode)
 				setMeshColor(m_meshnode->getMesh(), color);
-				m_meshnode->setVisible(m_is_visible);
-			}
-			if(m_animated_meshnode){
+			if(m_animated_meshnode)
 				setMeshColor(m_animated_meshnode->getMesh(), color);
-				m_animated_meshnode->setVisible(m_is_visible);
-			}
-			if(m_spritenode){
+			if(m_spritenode)
 				m_spritenode->setColor(color);
-				m_spritenode->setVisible(m_is_visible);
-			}
-			if(m_textnode){
-				m_textnode->setVisible(m_is_visible);
-			}
 		}
 	}
 
@@ -1044,9 +1027,9 @@ public:
 			m_visuals_expired = false;
 
 			// Attachments, part 1: All attached objects must be unparented first, or Irrlicht causes a segmentation fault
-			for(std::vector<core::vector2d<int> >::iterator ii = attachment_list.begin(); ii != attachment_list.end(); ii++)
+			for(std::vector<core::vector2d<int> >::iterator ii = m_env->attachment_list.begin(); ii != m_env->attachment_list.end(); ii++)
 			{
-				if(ii->Y == this->getId()) // This is a child of our parent
+				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)
@@ -1066,18 +1049,18 @@ public:
 
 			removeFromScene(false);
 			addToScene(m_smgr, m_gamedef->tsrc(), m_irr);
-			updateAnimations();
-			updateBonePosRot();
+			updateAnimation();
+			updateBonePosition();
 			updateAttachments();
 
 			// Attachments, part 2: Now that the parent has been refreshed, put its attachments back
-			for(std::vector<core::vector2d<int> >::iterator ii = attachment_list.begin(); ii != attachment_list.end(); ii++)
+			for(std::vector<core::vector2d<int> >::iterator ii = m_env->attachment_list.begin(); ii != m_env->attachment_list.end(); ii++)
 			{
-				if(ii->Y == this->getId()) // This is a child of our parent
+				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->updateParent();
+						obj->setAttachments();
 				}
 			}
 		}
@@ -1095,12 +1078,7 @@ public:
 		if(getParent() != NULL) // Attachments should be glued to their parent by Irrlicht
 		{
 			// Set these for later
-			if(m_meshnode)
-				m_position = m_meshnode->getAbsolutePosition();
-			if(m_animated_meshnode)
-				m_position = m_animated_meshnode->getAbsolutePosition();
-			if(m_spritenode)
-				m_position = m_spritenode->getAbsolutePosition();
+			m_position = getPosition();
 			m_velocity = v3f(0,0,0);
 			m_acceleration = v3f(0,0,0);
 			pos_translator.vect_show = m_position;
@@ -1405,23 +1383,23 @@ public:
 		}
 	}
 
-	void updateAnimations()
+	void updateAnimation()
 	{
 		if(m_animated_meshnode == NULL)
 			return;
 
-		m_animated_meshnode->setFrameLoop((int)m_frames.X, (int)m_frames.Y);
-		m_animated_meshnode->setAnimationSpeed(m_frame_speed);
-		m_animated_meshnode->setTransitionTime(m_frame_blend);
+		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 updateBonePosRot()
+	void updateBonePosition()
 	{
-		if(!m_bone_posrot.size() || m_animated_meshnode == NULL)
+		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_posrot.begin(); ii != m_bone_posrot.end(); ++ii){
+		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;
@@ -1437,6 +1415,7 @@ public:
 	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
 		{
@@ -1658,35 +1637,35 @@ public:
 
 			updateTexturePos();
 		}
-		else if(cmd == GENERIC_CMD_SET_ANIMATIONS)
+		else if(cmd == GENERIC_CMD_SET_ANIMATION)
 		{
-			m_frames = readV2F1000(is);
-			m_frame_speed = readF1000(is);
-			m_frame_blend = readF1000(is);
+			m_animation_range = readV2F1000(is);
+			m_animation_speed = readF1000(is);
+			m_animation_blend = readF1000(is);
 
-			updateAnimations();
+			updateAnimation();
 		}
-		else if(cmd == GENERIC_CMD_SET_BONE_POSROT)
+		else if(cmd == GENERIC_CMD_SET_BONE_POSITION)
 		{
 			std::string bone = deSerializeString(is);
 			v3f position = readV3F1000(is);
 			v3f rotation = readV3F1000(is);
-			m_bone_posrot[bone] = core::vector2d<v3f>(position, rotation);
+			m_bone_position[bone] = core::vector2d<v3f>(position, rotation);
 
-			updateBonePosRot();
+			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 = attachment_list.begin(); ii != attachment_list.end(); ii++)
+			for(std::vector<core::vector2d<int> >::iterator ii = m_env->attachment_list.begin(); ii != m_env->attachment_list.end(); ii++)
 			{
-				if(ii->X == this->getId()) // This is the ID of our object
+				if(ii->X == getId()) // This is the ID of our object
 				{
-					attachment_list.erase(ii);
+					m_env->attachment_list.erase(ii);
 					break;
 				}
 			}
-			attachment_list.push_back(core::vector2d<int>(this->getId(), readS16(is)));
+			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);
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 59f6c3c64..406bd9c68 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -356,8 +356,8 @@ LuaEntitySAO::LuaEntitySAO(ServerEnvironment *env, v3f pos,
 	m_last_sent_position_timer(0),
 	m_last_sent_move_precision(0),
 	m_armor_groups_sent(false),
-	m_animations_sent(false),
-	m_animations_bone_sent(false),
+	m_animation_sent(false),
+	m_bone_position_sent(false),
 	m_attachment_sent(false)
 {
 	// Only register type if no environment supplied
@@ -537,18 +537,18 @@ void LuaEntitySAO::step(float dtime, bool send_recommended)
 		m_messages_out.push_back(aom);
 	}
 
-	if(m_animations_sent == false){
-		m_animations_sent = true;
-		std::string str = gob_cmd_update_animations(m_animation_frames, m_animation_speed, m_animation_blend);
+	if(m_animation_sent == false){
+		m_animation_sent = true;
+		std::string str = gob_cmd_update_animation(m_animation_range, m_animation_speed, m_animation_blend);
 		// create message and add to list
 		ActiveObjectMessage aom(getId(), true, str);
 		m_messages_out.push_back(aom);
 	}
 
-	if(m_animations_bone_sent == false){
-		m_animations_bone_sent = true;
-		for(std::map<std::string, core::vector2d<v3f> >::const_iterator ii = m_animation_bone.begin(); ii != m_animation_bone.end(); ++ii){
-			std::string str = gob_cmd_update_bone_posrot((*ii).first, (*ii).second.X, (*ii).second.Y);
+	if(m_bone_position_sent == false){
+		m_bone_position_sent = true;
+		for(std::map<std::string, core::vector2d<v3f> >::const_iterator ii = m_bone_position.begin(); ii != m_bone_position.end(); ++ii){
+			std::string str = gob_cmd_update_bone_position((*ii).first, (*ii).second.X, (*ii).second.Y);
 			// create message and add to list
 			ActiveObjectMessage aom(getId(), true, str);
 			m_messages_out.push_back(aom);
@@ -575,12 +575,12 @@ std::string LuaEntitySAO::getClientInitializationData()
 	writeF1000(os, m_yaw);
 	writeS16(os, m_hp);
 
-	writeU8(os, 4 + m_animation_bone.size()); // number of messages stuffed in here
+	writeU8(os, 4 + m_bone_position.size()); // number of messages stuffed in here
 	os<<serializeLongString(getPropertyPacket()); // message 1
 	os<<serializeLongString(gob_cmd_update_armor_groups(m_armor_groups)); // 2
-	os<<serializeLongString(gob_cmd_update_animations(m_animation_frames, m_animation_speed, m_animation_blend)); // 3
-	for(std::map<std::string, core::vector2d<v3f> >::const_iterator ii = m_animation_bone.begin(); ii != m_animation_bone.end(); ++ii){
-		os<<serializeLongString(gob_cmd_update_bone_posrot((*ii).first, (*ii).second.X, (*ii).second.Y)); // m_animation_bone.size
+	os<<serializeLongString(gob_cmd_update_animation(m_animation_range, m_animation_speed, m_animation_blend)); // 3
+	for(std::map<std::string, core::vector2d<v3f> >::const_iterator ii = m_bone_position.begin(); ii != m_bone_position.end(); ++ii){
+		os<<serializeLongString(gob_cmd_update_bone_position((*ii).first, (*ii).second.X, (*ii).second.Y)); // m_bone_position.size
 	}
 	os<<serializeLongString(gob_cmd_update_attachment(m_attachment_parent_id, m_attachment_bone, m_attachment_position, m_attachment_rotation)); // 4
 
@@ -728,18 +728,18 @@ void LuaEntitySAO::setArmorGroups(const ItemGroupList &armor_groups)
 	m_armor_groups_sent = false;
 }
 
-void LuaEntitySAO::setAnimations(v2f frames, float frame_speed, float frame_blend)
+void LuaEntitySAO::setAnimation(v2f frame_range, float frame_speed, float frame_blend)
 {
-	m_animation_frames = frames;
+	m_animation_range = frame_range;
 	m_animation_speed = frame_speed;
 	m_animation_blend = frame_blend;
-	m_animations_sent = false;
+	m_animation_sent = false;
 }
 
-void LuaEntitySAO::setBonePosRot(std::string bone, v3f position, v3f rotation)
+void LuaEntitySAO::setBonePosition(std::string bone, v3f position, v3f rotation)
 {
-	m_animation_bone[bone] = core::vector2d<v3f>(position, rotation);
-	m_animations_bone_sent = false;
+	m_bone_position[bone] = core::vector2d<v3f>(position, rotation);
+	m_bone_position_sent = false;
 }
 
 void LuaEntitySAO::setAttachment(int parent_id, std::string bone, v3f position, v3f rotation)
@@ -884,8 +884,8 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, Player *player_, u16 peer_id_,
 	m_properties_sent(true),
 	m_privs(privs),
 	m_is_singleplayer(is_singleplayer),
-	m_animations_sent(false),
-	m_animations_bone_sent(false),
+	m_animation_sent(false),
+	m_bone_position_sent(false),
 	m_attachment_sent(false),
 	// public
 	m_moved(false),
@@ -914,7 +914,7 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, Player *player_, u16 peer_id_,
 	m_prop.colors.push_back(video::SColor(255, 255, 255, 255));
 	m_prop.spritediv = v2s16(1,1);
 	// end of default appearance
-	m_prop.is_visible = (getHP() != 0); // TODO: Use a death animation instead for mesh players
+	m_prop.is_visible = true;
 	m_prop.makes_footstep_sound = true;
 }
 
@@ -973,12 +973,12 @@ std::string PlayerSAO::getClientInitializationData()
 	writeF1000(os, m_player->getYaw());
 	writeS16(os, getHP());
 
-	writeU8(os, 4 + m_animation_bone.size()); // number of messages stuffed in here
+	writeU8(os, 4 + m_bone_position.size()); // number of messages stuffed in here
 	os<<serializeLongString(getPropertyPacket()); // message 1
 	os<<serializeLongString(gob_cmd_update_armor_groups(m_armor_groups)); // 2
-	os<<serializeLongString(gob_cmd_update_animations(m_animation_frames, m_animation_speed, m_animation_blend)); // 3
-	for(std::map<std::string, core::vector2d<v3f> >::const_iterator ii = m_animation_bone.begin(); ii != m_animation_bone.end(); ++ii){
-		os<<serializeLongString(gob_cmd_update_bone_posrot((*ii).first, (*ii).second.X, (*ii).second.Y)); // m_animation_bone.size
+	os<<serializeLongString(gob_cmd_update_animation(m_animation_range, m_animation_speed, m_animation_blend)); // 3
+	for(std::map<std::string, core::vector2d<v3f> >::const_iterator ii = m_bone_position.begin(); ii != m_bone_position.end(); ++ii){
+		os<<serializeLongString(gob_cmd_update_bone_position((*ii).first, (*ii).second.X, (*ii).second.Y)); // m_bone_position.size
 	}
 	os<<serializeLongString(gob_cmd_update_attachment(m_attachment_parent_id, m_attachment_bone, m_attachment_position, m_attachment_rotation)); // 4
 
@@ -1137,18 +1137,18 @@ void PlayerSAO::step(float dtime, bool send_recommended)
 		m_messages_out.push_back(aom);
 	}
 
-	if(m_animations_sent == false){
-		m_animations_sent = true;
-		std::string str = gob_cmd_update_animations(m_animation_frames, m_animation_speed, m_animation_blend);
+	if(m_animation_sent == false){
+		m_animation_sent = true;
+		std::string str = gob_cmd_update_animation(m_animation_range, m_animation_speed, m_animation_blend);
 		// create message and add to list
 		ActiveObjectMessage aom(getId(), true, str);
 		m_messages_out.push_back(aom);
 	}
 
-	if(m_animations_bone_sent == false){
-		m_animations_bone_sent = true;
-		for(std::map<std::string, core::vector2d<v3f> >::const_iterator ii = m_animation_bone.begin(); ii != m_animation_bone.end(); ++ii){
-			std::string str = gob_cmd_update_bone_posrot((*ii).first, (*ii).second.X, (*ii).second.Y);
+	if(m_bone_position_sent == false){
+		m_bone_position_sent = true;
+		for(std::map<std::string, core::vector2d<v3f> >::const_iterator ii = m_bone_position.begin(); ii != m_bone_position.end(); ++ii){
+			std::string str = gob_cmd_update_bone_position((*ii).first, (*ii).second.X, (*ii).second.Y);
 			// create message and add to list
 			ActiveObjectMessage aom(getId(), true, str);
 			m_messages_out.push_back(aom);
@@ -1285,20 +1285,20 @@ void PlayerSAO::setArmorGroups(const ItemGroupList &armor_groups)
 	m_armor_groups_sent = false;
 }
 
-void PlayerSAO::setAnimations(v2f frames, float frame_speed, float frame_blend)
+void PlayerSAO::setAnimation(v2f frame_range, float frame_speed, float frame_blend)
 {
 	// store these so they can be updated to clients
-	m_animation_frames = frames;
+	m_animation_range = frame_range;
 	m_animation_speed = frame_speed;
 	m_animation_blend = frame_blend;
-	m_animations_sent = false;
+	m_animation_sent = false;
 }
 
-void PlayerSAO::setBonePosRot(std::string bone, v3f position, v3f rotation)
+void PlayerSAO::setBonePosition(std::string bone, v3f position, v3f rotation)
 {
 	// store these so they can be updated to clients
-	m_animation_bone[bone] = core::vector2d<v3f>(position, rotation);
-	m_animations_bone_sent = false;
+	m_bone_position[bone] = core::vector2d<v3f>(position, rotation);
+	m_bone_position_sent = false;
 }
 
 void PlayerSAO::setAttachment(int parent_id, std::string bone, v3f position, v3f rotation)
@@ -1381,7 +1381,7 @@ void PlayerSAO::disconnected()
 
 std::string PlayerSAO::getPropertyPacket()
 {
-	m_prop.is_visible = (getHP() != 0);
+	m_prop.is_visible = (true);
 	return gob_cmd_set_properties(m_prop);
 }
 
diff --git a/src/content_sao.h b/src/content_sao.h
index f6e0bac5b..392c3f923 100644
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -62,8 +62,8 @@ public:
 	void setHP(s16 hp);
 	s16 getHP() const;
 	void setArmorGroups(const ItemGroupList &armor_groups);
-	void setAnimations(v2f frames, float frame_speed, float frame_blend);
-	void setBonePosRot(std::string bone, v3f position, v3f rotation);
+	void setAnimation(v2f frame_range, float frame_speed, float frame_blend);
+	void setBonePosition(std::string bone, v3f position, v3f rotation);
 	void setAttachment(int parent_id, std::string bone, v3f position, v3f rotation);
 	ObjectProperties* accessObjectProperties();
 	void notifyObjectPropertiesModified();
@@ -101,13 +101,13 @@ private:
 	float m_last_sent_move_precision;
 	bool m_armor_groups_sent;
 	
-	v2f m_animation_frames;
+	v2f m_animation_range;
 	float m_animation_speed;
 	float m_animation_blend;
-	bool m_animations_sent;
+	bool m_animation_sent;
 
-	std::map<std::string, core::vector2d<v3f> > m_animation_bone;
-	bool m_animations_bone_sent;
+	std::map<std::string, core::vector2d<v3f> > m_bone_position;
+	bool m_bone_position_sent;
 
 	int m_attachment_parent_id;
 	std::string m_attachment_bone;
@@ -161,8 +161,8 @@ public:
 	void setHP(s16 hp);
 	
 	void setArmorGroups(const ItemGroupList &armor_groups);
-	void setAnimations(v2f frames, float frame_speed, float frame_blend);
-	void setBonePosRot(std::string bone, v3f position, v3f rotation);
+	void setAnimation(v2f frame_range, float frame_speed, float frame_blend);
+	void setBonePosition(std::string bone, v3f position, v3f rotation);
 	void setAttachment(int parent_id, std::string bone, v3f position, v3f rotation);
 	ObjectProperties* accessObjectProperties();
 	void notifyObjectPropertiesModified();
@@ -260,13 +260,13 @@ private:
 	std::set<std::string> m_privs;
 	bool m_is_singleplayer;
 
-	v2f m_animation_frames;
+	v2f m_animation_range;
 	float m_animation_speed;
 	float m_animation_blend;
-	bool m_animations_sent;
+	bool m_animation_sent;
 
-	std::map<std::string, core::vector2d<v3f> > m_animation_bone; // stores position and rotation for each bone name
-	bool m_animations_bone_sent;
+	std::map<std::string, core::vector2d<v3f> > m_bone_position; // Stores position and rotation for each bone name
+	bool m_bone_position_sent;
 
 	int m_attachment_parent_id;
 	std::string m_attachment_bone;
diff --git a/src/environment.h b/src/environment.h
index 042229038..e2028d614 100644
--- a/src/environment.h
+++ b/src/environment.h
@@ -463,6 +463,8 @@ public:
 	
 	// Get event from queue. CEE_NONE is returned if queue is empty.
 	ClientEnvEvent getClientEvent();
+
+	std::vector<core::vector2d<int> > attachment_list; // X is child ID, Y is parent ID
 	
 private:
 	ClientMap *m_map;
diff --git a/src/genericobject.cpp b/src/genericobject.cpp
index 1976d5c80..654548fa1 100644
--- a/src/genericobject.cpp
+++ b/src/genericobject.cpp
@@ -92,11 +92,11 @@ std::string gob_cmd_set_sprite(
 	return os.str();
 }
 
-std::string gob_cmd_update_animations(v2f frames, float frame_speed, float frame_blend)
+std::string gob_cmd_update_animation(v2f frames, float frame_speed, float frame_blend)
 {
 	std::ostringstream os(std::ios::binary);
 	// command 
-	writeU8(os, GENERIC_CMD_SET_ANIMATIONS);
+	writeU8(os, GENERIC_CMD_SET_ANIMATION);
 	// parameters
 	writeV2F1000(os, frames);
 	writeF1000(os, frame_speed);
@@ -104,11 +104,11 @@ std::string gob_cmd_update_animations(v2f frames, float frame_speed, float frame
 	return os.str();
 }
 
-std::string gob_cmd_update_bone_posrot(std::string bone, v3f position, v3f rotation)
+std::string gob_cmd_update_bone_position(std::string bone, v3f position, v3f rotation)
 {
 	std::ostringstream os(std::ios::binary);
 	// command 
-	writeU8(os, GENERIC_CMD_SET_BONE_POSROT);
+	writeU8(os, GENERIC_CMD_SET_BONE_POSITION);
 	// parameters
 	os<<serializeString(bone);
 	writeV3F1000(os, position);
diff --git a/src/genericobject.h b/src/genericobject.h
index 34b8a8a51..a46a9474f 100644
--- a/src/genericobject.h
+++ b/src/genericobject.h
@@ -28,8 +28,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define GENERIC_CMD_UPDATE_POSITION 1
 #define GENERIC_CMD_SET_TEXTURE_MOD 2
 #define GENERIC_CMD_SET_SPRITE 3
-#define GENERIC_CMD_SET_ANIMATIONS 4
-#define GENERIC_CMD_SET_BONE_POSROT 5
+#define GENERIC_CMD_SET_ANIMATION 4
+#define GENERIC_CMD_SET_BONE_POSITION 5
 #define GENERIC_CMD_SET_ATTACHMENT 6
 #define GENERIC_CMD_PUNCHED 7
 #define GENERIC_CMD_UPDATE_ARMOR_GROUPS 8
@@ -57,9 +57,9 @@ std::string gob_cmd_set_sprite(
 	bool select_horiz_by_yawpitch
 );
 
-std::string gob_cmd_update_animations(v2f frames, float frame_speed, float frame_blend);
+std::string gob_cmd_update_animation(v2f frames, float frame_speed, float frame_blend);
 
-std::string gob_cmd_update_bone_posrot(std::string bone, v3f position, v3f rotation);
+std::string gob_cmd_update_bone_position(std::string bone, v3f position, v3f rotation);
 
 std::string gob_cmd_update_attachment(int parent_id, std::string bone, v3f position, v3f rotation);
 
diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index 7f638830f..4db020c11 100644
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -714,6 +714,7 @@ void GUIFormSpecMenu::drawMenu()
 		Draw backgrounds
 	*/
 	for(u32 i=0; i<m_backgrounds.size(); i++)
+	{
 		const ImageDrawSpec &spec = m_backgrounds[i];
 		video::ITexture *texture =
 				m_gamedef->tsrc()->getTextureRaw(spec.name);
@@ -727,6 +728,7 @@ void GUIFormSpecMenu::drawMenu()
 			core::rect<s32>(core::position2d<s32>(0,0),
 					core::dimension2di(texture->getOriginalSize())),
 			NULL/*&AbsoluteClippingRect*/, colors, true);
+	}
 	
 	/*
 		Draw images
diff --git a/src/scriptapi.cpp b/src/scriptapi.cpp
index 9fd55b2e3..2b2ccfcec 100644
--- a/src/scriptapi.cpp
+++ b/src/scriptapi.cpp
@@ -2716,8 +2716,8 @@ private:
 		return 0;
 	}
 
-	// setanimations(self, frames, frame_speed, frame_blend)
-	static int l_set_animations(lua_State *L)
+	// set_animation(self, frame_range, frame_speed, frame_blend)
+	static int l_set_animation(lua_State *L)
 	{
 		ObjectRef *ref = checkobject(L, 1);
 		ServerActiveObject *co = getobject(ref);
@@ -2732,12 +2732,12 @@ private:
 		float frame_blend = 0;
 		if(!lua_isnil(L, 4))
 			frame_blend = lua_tonumber(L, 4);
-		co->setAnimations(frames, frame_speed, frame_blend);
+		co->setAnimation(frames, frame_speed, frame_blend);
 		return 0;
 	}
 
-	// setboneposrot(self, std::string bone, v3f position, v3f rotation)
-	static int l_set_bone_posrot(lua_State *L)
+	// set_bone_position(self, std::string bone, v3f position, v3f rotation)
+	static int l_set_bone_position(lua_State *L)
 	{
 		ObjectRef *ref = checkobject(L, 1);
 		ServerActiveObject *co = getobject(ref);
@@ -2752,12 +2752,12 @@ private:
 		v3f rotation = v3f(0, 0, 0);
 		if(!lua_isnil(L, 4))
 			rotation = read_v3f(L, 4);
-		co->setBonePosRot(bone, position, rotation);
+		co->setBonePosition(bone, position, rotation);
 		return 0;
 	}
 
-	// set_attachment(self, parent, bone, position, rotation)
-	static int l_set_attachment(lua_State *L)
+	// set_attach(self, parent, bone, position, rotation)
+	static int l_set_attach(lua_State *L)
 	{
 		ObjectRef *ref = checkobject(L, 1);
 		ObjectRef *parent_ref = checkobject(L, 2);
@@ -2779,8 +2779,8 @@ private:
 		return 0;
 	}
 
-	// set_detachment(self)
-	static int l_set_detachment(lua_State *L)
+	// set_detach(self)
+	static int l_set_detach(lua_State *L)
 	{
 		ObjectRef *ref = checkobject(L, 1);
 		ServerActiveObject *co = getobject(ref);
@@ -3104,10 +3104,10 @@ const luaL_reg ObjectRef::methods[] = {
 	method(ObjectRef, get_wielded_item),
 	method(ObjectRef, set_wielded_item),
 	method(ObjectRef, set_armor_groups),
-	method(ObjectRef, set_animations),
-	method(ObjectRef, set_bone_posrot),
-	method(ObjectRef, set_attachment),
-	method(ObjectRef, set_detachment),
+	method(ObjectRef, set_animation),
+	method(ObjectRef, set_bone_position),
+	method(ObjectRef, set_attach),
+	method(ObjectRef, set_detach),
 	method(ObjectRef, set_properties),
 	// LuaEntitySAO-only
 	method(ObjectRef, setvelocity),
diff --git a/src/serverobject.h b/src/serverobject.h
index a0886ed1e..1bbd3e4e8 100644
--- a/src/serverobject.h
+++ b/src/serverobject.h
@@ -152,9 +152,9 @@ public:
 
 	virtual void setArmorGroups(const ItemGroupList &armor_groups)
 	{}
-	virtual void setAnimations(v2f frames, float frame_speed, float frame_blend)
+	virtual void setAnimation(v2f frames, float frame_speed, float frame_blend)
 	{}
-	virtual void setBonePosRot(std::string bone, v3f position, v3f rotation)
+	virtual void setBonePosition(std::string bone, v3f position, v3f rotation)
 	{}
 	virtual void setAttachment(int parent_id, std::string bone, v3f position, v3f rotation)
 	{}

From 3d1c481f0bdf03b59871237d810685278e87613b Mon Sep 17 00:00:00 2001
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu, 22 Nov 2012 21:01:31 +0200
Subject: [PATCH 23/24] RealBadAngel's patch which allows the lua api to read
 pressed player keys. This should make it possible to change the player's
 animation based on what he is doing

Correct lua api version number

Always update animations and attachments after the entity is added to scene client side. Fixes animations not being applied in client initialization for some reason. Attachments should be re-tested now just to be safe.

Fix a segmentation fault caused by reaching materials that didn't exist in a loop for setting texture
---
 doc/lua_api.txt     |  8 ++++--
 src/client.cpp      | 10 +++----
 src/clientserver.h  |  4 ++-
 src/content_cao.cpp | 12 ++++----
 src/game.cpp        | 16 +++++++++++
 src/localplayer.h   | 50 --------------------------------
 src/player.h        | 69 +++++++++++++++++++++++++++++++++++++++++++--
 src/scriptapi.cpp   | 51 ++++++++++++++++++++++++++++++++-
 src/server.cpp      | 14 ++++++++-
 9 files changed, 165 insertions(+), 69 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index fc51cb2f7..0c093b7ee 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -1,4 +1,4 @@
-Minetest Lua Modding API Reference 0.4.0
+Minetest Lua Modding API Reference 0.4.3
 ==========================================
 More information at http://c55.me/minetest/
 
@@ -1132,7 +1132,11 @@ Player-only: (no-op for other objects)
   ^ Redefine player's inventory form
   ^ Should usually be called in on_joinplayer
 - get_inventory_formspec() -> formspec string
-
+- get_player_control(): returns table with player pressed keys
+	{jump=bool,right=bool,left=bool,LMB=bool,RMB=bool,sneak=bool,aux1=bool,down=bool,up=bool}
+- get_player_control_bits(): returns integer with bit packed player pressed keys
+	bit nr/meaning: 0/up ,1/down ,2/left ,3/right ,4/jump ,5/aux1 ,6/sneak ,7/LMB ,8/RMB
+	
 InvRef: Reference to an inventory
 methods:
 - is_empty(listname): return true if list is empty
diff --git a/src/client.cpp b/src/client.cpp
index 9a056806b..f72c4b654 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1984,7 +1984,7 @@ void Client::sendPlayerPos()
 	v3s32 speed(sf.X*100, sf.Y*100, sf.Z*100);
 	s32 pitch = myplayer->getPitch() * 100;
 	s32 yaw = myplayer->getYaw() * 100;
-
+	u32 keyPressed=myplayer->keyPressed;
 	/*
 		Format:
 		[0] u16 command
@@ -1992,15 +1992,15 @@ void Client::sendPlayerPos()
 		[2+12] v3s32 speed*100
 		[2+12+12] s32 pitch*100
 		[2+12+12+4] s32 yaw*100
+		[2+12+12+4+4] u32 keyPressed
 	*/
-
-	SharedBuffer<u8> data(2+12+12+4+4);
+	SharedBuffer<u8> data(2+12+12+4+4+4);
 	writeU16(&data[0], TOSERVER_PLAYERPOS);
 	writeV3S32(&data[2], position);
 	writeV3S32(&data[2+12], speed);
 	writeS32(&data[2+12+12], pitch);
-	writeS32(&data[2+12+12+4], yaw);
-
+	writeS32(&data[2+12+12+4], yaw);	
+	writeU32(&data[2+12+12+4+4], keyPressed);
 	// Send as unreliable
 	Send(0, data, false);
 }
diff --git a/src/clientserver.h b/src/clientserver.h
index 15a602fc8..ba535a66b 100644
--- a/src/clientserver.h
+++ b/src/clientserver.h
@@ -68,7 +68,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	PROTOCOL_VERSION 13:
 		InventoryList field "Width" (deserialization fails with old versions)
 	PROTOCOL_VERSION 14:
-		New messages for mesh and bone animation, as well as attachments
+		Added transfer of player pressed keys to the server
+		Added new messages for mesh and bone animation, as well as attachments
 		GENERIC_CMD_SET_ANIMATION
 		GENERIC_CMD_SET_BONE_POSITION
 		GENERIC_CMD_SET_ATTACHMENT
@@ -371,6 +372,7 @@ enum ToServerCommand
 		[2+12] v3s32 speed*100
 		[2+12+12] s32 pitch*100
 		[2+12+12+4] s32 yaw*100
+		[2+12+12+4+4] u32 keyPressed
 	*/
 
 	TOSERVER_GOTBLOCKS = 0x24,
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 9c1171e1f..339c9f248 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -970,8 +970,11 @@ public:
 					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()
@@ -1049,9 +1052,6 @@ public:
 
 			removeFromScene(false);
 			addToScene(m_smgr, m_gamedef->tsrc(), m_irr);
-			updateAnimation();
-			updateBonePosition();
-			updateAttachments();
 
 			// 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++)
@@ -1248,7 +1248,7 @@ public:
 		{
 			if(m_prop.visual == "mesh")
 			{
-				for (u32 i = 0; i < m_prop.textures.size(); ++i)
+				for (u32 i = 0; i < m_prop.textures.size() && i < m_animated_meshnode->getMaterialCount(); ++i)
 				{
 					std::string texturestring = m_prop.textures[i];
 					if(texturestring == "")
@@ -1271,7 +1271,7 @@ public:
 					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)
+				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
diff --git a/src/game.cpp b/src/game.cpp
index a1a197219..5ce214cb8 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1881,6 +1881,8 @@ void the_game(
 			bool a_jump,
 			bool a_superspeed,
 			bool a_sneak,
+			bool a_LMB,
+			bool a_RMB,
 			float a_pitch,
 			float a_yaw*/
 			PlayerControl control(
@@ -1891,10 +1893,24 @@ void the_game(
 				input->isKeyDown(getKeySetting("keymap_jump")),
 				input->isKeyDown(getKeySetting("keymap_special1")),
 				input->isKeyDown(getKeySetting("keymap_sneak")),
+				input->getLeftState(),
+				input->getRightState(),
 				camera_pitch,
 				camera_yaw
 			);
 			client.setPlayerControl(control);
+			u32 keyPressed=
+			1*(int)input->isKeyDown(getKeySetting("keymap_forward"))+
+			2*(int)input->isKeyDown(getKeySetting("keymap_backward"))+
+			4*(int)input->isKeyDown(getKeySetting("keymap_left"))+
+			8*(int)input->isKeyDown(getKeySetting("keymap_right"))+
+			16*(int)input->isKeyDown(getKeySetting("keymap_jump"))+
+			32*(int)input->isKeyDown(getKeySetting("keymap_special1"))+
+			64*(int)input->isKeyDown(getKeySetting("keymap_sneak"))+
+			128*(int)input->getLeftState()+
+			256*(int)input->getRightState();
+			LocalPlayer* player = client.getEnv().getLocalPlayer();
+			player->keyPressed=keyPressed;
 		}
 		
 		/*
diff --git a/src/localplayer.h b/src/localplayer.h
index b613fdb0f..9d1829db8 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -22,53 +22,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "player.h"
 
-struct PlayerControl
-{
-	PlayerControl()
-	{
-		up = false;
-		down = false;
-		left = false;
-		right = false;
-		jump = false;
-		aux1 = false;
-		sneak = false;
-		pitch = 0;
-		yaw = 0;
-	}
-	PlayerControl(
-		bool a_up,
-		bool a_down,
-		bool a_left,
-		bool a_right,
-		bool a_jump,
-		bool a_aux1,
-		bool a_sneak,
-		float a_pitch,
-		float a_yaw
-	)
-	{
-		up = a_up;
-		down = a_down;
-		left = a_left;
-		right = a_right;
-		jump = a_jump;
-		aux1 = a_aux1;
-		sneak = a_sneak;
-		pitch = a_pitch;
-		yaw = a_yaw;
-	}
-	bool up;
-	bool down;
-	bool left;
-	bool right;
-	bool jump;
-	bool aux1;
-	bool sneak;
-	float pitch;
-	float yaw;
-};
-
 class LocalPlayer : public Player
 {
 public:
@@ -91,9 +44,6 @@ public:
 	void applyControl(float dtime);
 
 	v3s16 getStandingNodePos();
-	
-	PlayerControl control;
-
 private:
 	// This is used for determining the sneaking range
 	v3s16 m_sneak_node;
diff --git a/src/player.h b/src/player.h
index 47f34c178..6c7c1e4ea 100644
--- a/src/player.h
+++ b/src/player.h
@@ -28,6 +28,61 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #define PLAYERNAME_ALLOWED_CHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_"
 
+struct PlayerControl
+{
+	PlayerControl()
+	{
+		up = false;
+		down = false;
+		left = false;
+		right = false;
+		jump = false;
+		aux1 = false;
+		sneak = false;
+		LMB = false;
+		RMB = false;
+		pitch = 0;
+		yaw = 0;
+	}
+	PlayerControl(
+		bool a_up,
+		bool a_down,
+		bool a_left,
+		bool a_right,
+		bool a_jump,
+		bool a_aux1,
+		bool a_sneak,
+		bool a_LMB,
+		bool a_RMB,
+		float a_pitch,
+		float a_yaw
+	)
+	{
+		up = a_up;
+		down = a_down;
+		left = a_left;
+		right = a_right;
+		jump = a_jump;
+		aux1 = a_aux1;
+		sneak = a_sneak;
+		LMB = a_LMB;
+		RMB = a_RMB;
+		pitch = a_pitch;
+		yaw = a_yaw;
+	}
+	bool up;
+	bool down;
+	bool left;
+	bool right;
+	bool jump;
+	bool aux1;
+	bool sneak;
+	bool LMB;
+	bool RMB;
+	float pitch;
+	float yaw;
+};
+
 class Map;
 class IGameDef;
 struct CollisionInfo;
@@ -155,9 +210,17 @@ public:
 	u16 hp;
 
 	u16 peer_id;
-
+	
 	std::string inventory_formspec;
-
+	
+	PlayerControl control;
+	PlayerControl getPlayerControl()
+	{
+		return control;
+	}
+	
+	u32 keyPressed;
+	
 protected:
 	IGameDef *m_gamedef;
 
@@ -182,7 +245,7 @@ public:
 	void setPlayerSAO(PlayerSAO *sao)
 	{ m_sao = sao; }
 	void setPosition(const v3f &position);
-
+	
 private:
 	PlayerSAO *m_sao;
 };
diff --git a/src/scriptapi.cpp b/src/scriptapi.cpp
index 2b2ccfcec..91100d311 100644
--- a/src/scriptapi.cpp
+++ b/src/scriptapi.cpp
@@ -3025,7 +3025,54 @@ private:
 		lua_pushlstring(L, formspec.c_str(), formspec.size());
 		return 1;
 	}
-
+	
+	// get_player_control(self)
+	static int l_get_player_control(lua_State *L)
+	{
+		ObjectRef *ref = checkobject(L, 1);
+		Player *player = getplayer(ref);
+		if(player == NULL){
+			lua_pushlstring(L, "", 0);
+			return 1;
+		}
+		// Do it
+		PlayerControl control = player->getPlayerControl();
+		lua_newtable(L);
+		lua_pushboolean(L, control.up);
+		lua_setfield(L, -2, "up");
+		lua_pushboolean(L, control.down);
+		lua_setfield(L, -2, "down");
+		lua_pushboolean(L, control.left);
+		lua_setfield(L, -2, "left");
+		lua_pushboolean(L, control.right);
+		lua_setfield(L, -2, "right");
+		lua_pushboolean(L, control.jump);
+		lua_setfield(L, -2, "jump");
+		lua_pushboolean(L, control.aux1);
+		lua_setfield(L, -2, "aux1");
+		lua_pushboolean(L, control.sneak);
+		lua_setfield(L, -2, "sneak");
+		lua_pushboolean(L, control.LMB);
+		lua_setfield(L, -2, "LMB");
+		lua_pushboolean(L, control.RMB);
+		lua_setfield(L, -2, "RMB");
+		return 1;
+	}
+	
+	// get_player_control_bits(self)
+	static int l_get_player_control_bits(lua_State *L)
+	{
+		ObjectRef *ref = checkobject(L, 1);
+		Player *player = getplayer(ref);
+		if(player == NULL){
+			lua_pushlstring(L, "", 0);
+			return 1;
+		}
+		// Do it	
+		lua_pushnumber(L, player->keyPressed);
+		return 1;
+	}
+	
 public:
 	ObjectRef(ServerActiveObject *object):
 		m_object(object)
@@ -3128,6 +3175,8 @@ const luaL_reg ObjectRef::methods[] = {
 	method(ObjectRef, get_look_yaw),
 	method(ObjectRef, set_inventory_formspec),
 	method(ObjectRef, get_inventory_formspec),
+	method(ObjectRef, get_player_control),
+	method(ObjectRef, get_player_control_bits),
 	{0,0}
 };
 
diff --git a/src/server.cpp b/src/server.cpp
index 1a401bb62..ac243a29c 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -2369,7 +2369,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
 
 	if(command == TOSERVER_PLAYERPOS)
 	{
-		if(datasize < 2+12+12+4+4)
+		if(datasize < 2+12+12+4+4+4)
 			return;
 	
 		u32 start = 0;
@@ -2377,6 +2377,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
 		v3s32 ss = readV3S32(&data[start+2+12]);
 		f32 pitch = (f32)readS32(&data[2+12+12]) / 100.0;
 		f32 yaw = (f32)readS32(&data[2+12+12+4]) / 100.0;
+		u32 keyPressed = (u32)readU32(&data[2+12+12+4+4]);
 		v3f position((f32)ps.X/100., (f32)ps.Y/100., (f32)ps.Z/100.);
 		v3f speed((f32)ss.X/100., (f32)ss.Y/100., (f32)ss.Z/100.);
 		pitch = wrapDegrees(pitch);
@@ -2386,6 +2387,16 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
 		player->setSpeed(speed);
 		player->setPitch(pitch);
 		player->setYaw(yaw);
+		player->keyPressed=keyPressed;
+		player->control.up = (bool)(keyPressed&1);
+		player->control.down = (bool)(keyPressed&2);
+		player->control.left = (bool)(keyPressed&4);
+		player->control.right = (bool)(keyPressed&8);
+		player->control.jump = (bool)(keyPressed&16);
+		player->control.aux1 = (bool)(keyPressed&32);
+		player->control.sneak = (bool)(keyPressed&64);
+		player->control.LMB = (bool)(keyPressed&128);
+		player->control.RMB = (bool)(keyPressed&256);
 		
 		/*infostream<<"Server::ProcessData(): Moved player "<<peer_id<<" to "
 				<<"("<<position.X<<","<<position.Y<<","<<position.Z<<")"
@@ -3166,6 +3177,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
 			}
 
 		} // action == 4
+		
 
 		/*
 			Catch invalid actions

From c8acc373c14e1015a9da8ff8e2b6da76857959a8 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Sun, 25 Nov 2012 21:11:45 +0200
Subject: [PATCH 24/24] Update ContentFeatures serialization format now as
 PROTOCOL_VERSION was changed

---
 src/nodedef.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index 180219ba8..38c04a59d 100644
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -217,7 +217,7 @@ void ContentFeatures::reset()
 
 void ContentFeatures::serialize(std::ostream &os)
 {
-	writeU8(os, 5); // version
+	writeU8(os, 6); // version
 	os<<serializeString(name);
 	writeU16(os, groups.size());
 	for(ItemGroupList::const_iterator
@@ -254,6 +254,7 @@ void ContentFeatures::serialize(std::ostream &os)
 	os<<serializeString(liquid_alternative_flowing);
 	os<<serializeString(liquid_alternative_source);
 	writeU8(os, liquid_viscosity);
+	writeU8(os, liquid_renewable);
 	writeU8(os, light_source);
 	writeU32(os, damage_per_second);
 	node_box.serialize(os);
@@ -265,13 +266,12 @@ void ContentFeatures::serialize(std::ostream &os)
 	serializeSimpleSoundSpec(sound_dug, os);
 	// Stuff below should be moved to correct place in a version that otherwise changes
 	// the protocol version
-	writeU8(os, liquid_renewable);
 }
 
 void ContentFeatures::deSerialize(std::istream &is)
 {
 	int version = readU8(is);
-	if(version != 5)
+	if(version != 6)
 		throw SerializationError("unsupported ContentFeatures version");
 	name = deSerializeString(is);
 	groups.clear();
@@ -311,6 +311,7 @@ void ContentFeatures::deSerialize(std::istream &is)
 	liquid_alternative_flowing = deSerializeString(is);
 	liquid_alternative_source = deSerializeString(is);
 	liquid_viscosity = readU8(is);
+	liquid_renewable = readU8(is);
 	light_source = readU8(is);
 	damage_per_second = readU32(is);
 	node_box.deSerialize(is);
@@ -325,7 +326,6 @@ void ContentFeatures::deSerialize(std::istream &is)
 	try{
 		// Stuff below should be moved to correct place in a version that
 		// otherwise changes the protocol version
-		liquid_renewable = readU8(is);
 	}catch(SerializationError &e) {};
 }