X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fcontent_cao.cpp;h=fc1df377a7875624a56156ca2df98741f78b5f34;hb=04172e3dd0bf1b2645c4bbc0c819e4e3a5ab87e3;hp=eed5a8337ed1855a72f83cfc849ed6fe4f289d40;hpb=ae2b7f952368174aeac90a5076eadd90ddc7fff3;p=dragonfireclient.git

diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index eed5a8337..fc1df377a 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -20,16 +20,24 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "content_cao.h"
 #include "tile.h"
 #include "environment.h"
+#include "collision.h"
 #include "settings.h"
 #include <ICameraSceneNode.h>
 #include <ITextSceneNode.h>
+#include <IBillboardSceneNode.h>
 #include "serialization.h" // For decompressZlib
 #include "gamedef.h"
 #include "clientobject.h"
 #include "content_object.h"
+#include "mesh.h"
 #include "utility.h" // For IntervalLimiter
+#include "itemdef.h"
+#include "tool.h"
+#include "content_cso.h"
+#include "sound.h"
+#include "nodedef.h"
 class Settings;
-#include "MyBillboardSceneNode.h"
+struct ToolCapabilities;
 
 core::map<u16, ClientActiveObject::Factory> ClientActiveObject::m_types;
 
@@ -114,6 +122,18 @@ struct SmoothTranslator
 	}
 };
 
+/*
+	Other stuff
+*/
+
+static void setBillboardTextureMatrix(scene::IBillboardSceneNode *bill,
+		float txs, float tys, int col, int row)
+{
+	video::SMaterial& material = bill->getMaterial(0);
+	core::matrix4& matrix = material.getTextureMatrix(0);
+	matrix.setTextureTranslate(txs*col, tys*row);
+	matrix.setTextureScale(txs, tys);
+}
 
 /*
 	TestCAO
@@ -148,262 +168,6 @@ class TestCAO : public ClientActiveObject
 	v3f m_position;
 };
 
-/*
-	ItemCAO
-*/
-
-class ItemCAO : public ClientActiveObject
-{
-public:
-	ItemCAO(IGameDef *gamedef, ClientEnvironment *env);
-	virtual ~ItemCAO();
-	
-	u8 getType() const
-	{
-		return ACTIVEOBJECT_TYPE_ITEM;
-	}
-	
-	static ClientActiveObject* create(IGameDef *gamedef, ClientEnvironment *env);
-
-	void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
-			IrrlichtDevice *irr);
-	void removeFromScene();
-	void updateLight(u8 light_at_pos);
-	v3s16 getLightPosition();
-	void updateNodePos();
-
-	void step(float dtime, ClientEnvironment *env);
-
-	void processMessage(const std::string &data);
-
-	void initialize(const std::string &data);
-	
-	core::aabbox3d<f32>* getSelectionBox()
-		{return &m_selection_box;}
-	v3f getPosition()
-		{return m_position;}
-
-private:
-	core::aabbox3d<f32> m_selection_box;
-	scene::IMeshSceneNode *m_node;
-	v3f m_position;
-	std::string m_inventorystring;
-};
-
-/*
-	RatCAO
-*/
-
-class RatCAO : public ClientActiveObject
-{
-public:
-	RatCAO(IGameDef *gamedef, ClientEnvironment *env);
-	virtual ~RatCAO();
-	
-	u8 getType() const
-	{
-		return ACTIVEOBJECT_TYPE_RAT;
-	}
-	
-	static ClientActiveObject* create(IGameDef *gamedef, ClientEnvironment *env);
-
-	void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
-			IrrlichtDevice *irr);
-	void removeFromScene();
-	void updateLight(u8 light_at_pos);
-	v3s16 getLightPosition();
-	void updateNodePos();
-
-	void step(float dtime, ClientEnvironment *env);
-
-	void processMessage(const std::string &data);
-
-	void initialize(const std::string &data);
-	
-	core::aabbox3d<f32>* getSelectionBox()
-		{return &m_selection_box;}
-	v3f getPosition()
-		{return pos_translator.vect_show;}
-		//{return m_position;}
-
-private:
-	core::aabbox3d<f32> m_selection_box;
-	scene::IMeshSceneNode *m_node;
-	v3f m_position;
-	float m_yaw;
-	SmoothTranslator pos_translator;
-};
-
-/*
-	Oerkki1CAO
-*/
-
-class Oerkki1CAO : public ClientActiveObject
-{
-public:
-	Oerkki1CAO(IGameDef *gamedef, ClientEnvironment *env);
-	virtual ~Oerkki1CAO();
-	
-	u8 getType() const
-	{
-		return ACTIVEOBJECT_TYPE_OERKKI1;
-	}
-	
-	static ClientActiveObject* create(IGameDef *gamedef, ClientEnvironment *env);
-
-	void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
-			IrrlichtDevice *irr);
-	void removeFromScene();
-	void updateLight(u8 light_at_pos);
-	v3s16 getLightPosition();
-	void updateNodePos();
-
-	void step(float dtime, ClientEnvironment *env);
-
-	void processMessage(const std::string &data);
-
-	void initialize(const std::string &data);
-	
-	core::aabbox3d<f32>* getSelectionBox()
-		{return &m_selection_box;}
-	v3f getPosition()
-		{return pos_translator.vect_show;}
-		//{return m_position;}
-
-	// If returns true, punch will not be sent to the server
-	bool directReportPunch(const std::string &toolname, v3f dir);
-
-private:
-	IntervalLimiter m_attack_interval;
-	core::aabbox3d<f32> m_selection_box;
-	scene::IMeshSceneNode *m_node;
-	v3f m_position;
-	float m_yaw;
-	SmoothTranslator pos_translator;
-	float m_damage_visual_timer;
-	bool m_damage_texture_enabled;
-};
-
-/*
-	FireflyCAO
-*/
-
-class FireflyCAO : public ClientActiveObject
-{
-public:
-	FireflyCAO(IGameDef *gamedef, ClientEnvironment *env);
-	virtual ~FireflyCAO();
-	
-	u8 getType() const
-	{
-		return ACTIVEOBJECT_TYPE_FIREFLY;
-	}
-	
-	static ClientActiveObject* create(IGameDef *gamedef, ClientEnvironment *env);
-
-	void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
-			IrrlichtDevice *irr);
-	void removeFromScene();
-	void updateLight(u8 light_at_pos);
-	v3s16 getLightPosition();
-	void updateNodePos();
-
-	void step(float dtime, ClientEnvironment *env);
-
-	void processMessage(const std::string &data);
-
-	void initialize(const std::string &data);
-	
-	core::aabbox3d<f32>* getSelectionBox()
-		{return &m_selection_box;}
-	v3f getPosition()
-		{return m_position;}
-
-private:
-	core::aabbox3d<f32> m_selection_box;
-	scene::IMeshSceneNode *m_node;
-	v3f m_position;
-	float m_yaw;
-	SmoothTranslator pos_translator;
-};
-
-/*
-	MobV2CAO
-*/
-
-class MobV2CAO : public ClientActiveObject
-{
-public:
-	MobV2CAO(IGameDef *gamedef, ClientEnvironment *env);
-	virtual ~MobV2CAO();
-	
-	u8 getType() const
-	{
-		return ACTIVEOBJECT_TYPE_MOBV2;
-	}
-	
-	static ClientActiveObject* create(IGameDef *gamedef, ClientEnvironment *env);
-
-	void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
-			IrrlichtDevice *irr);
-	void removeFromScene();
-	void updateLight(u8 light_at_pos);
-	v3s16 getLightPosition();
-	void updateNodePos();
-
-	void step(float dtime, ClientEnvironment *env);
-
-	void processMessage(const std::string &data);
-
-	void initialize(const std::string &data);
-	
-	core::aabbox3d<f32>* getSelectionBox()
-		{return &m_selection_box;}
-	v3f getPosition()
-		{return pos_translator.vect_show;}
-		//{return m_position;}
-	bool doShowSelectionBox(){return false;}
-
-	// If returns true, punch will not be sent to the server
-	bool directReportPunch(const std::string &toolname, v3f dir);
-
-private:
-	void setLooks(const std::string &looks);
-	
-	IntervalLimiter m_attack_interval;
-	core::aabbox3d<f32> m_selection_box;
-	scene::MyBillboardSceneNode *m_node;
-	v3f m_position;
-	std::string m_texture_name;
-	float m_yaw;
-	SmoothTranslator pos_translator;
-	bool m_walking;
-	float m_walking_unset_timer;
-	float m_walk_timer;
-	int m_walk_frame;
-	float m_damage_visual_timer;
-	u8 m_last_light;
-	bool m_shooting;
-	float m_shooting_unset_timer;
-	v2f m_sprite_size;
-	float m_sprite_y;
-	bool m_bright_shooting;
-	std::string m_sprite_type;
-	int m_simple_anim_frames;
-	float m_simple_anim_frametime;
-	bool m_lock_full_brightness;
-	int m_player_hit_damage;
-	float m_player_hit_distance;
-	float m_player_hit_interval;
-	float m_player_hit_timer;
-
-	Settings *m_properties;
-};
-
-/*
-	TestCAO
-*/
-
 // Prototype
 TestCAO proto_TestCAO(NULL, NULL);
 
@@ -518,6 +282,50 @@ void TestCAO::processMessage(const std::string &data)
 	ItemCAO
 */
 
+class ItemCAO : public ClientActiveObject
+{
+public:
+	ItemCAO(IGameDef *gamedef, ClientEnvironment *env);
+	virtual ~ItemCAO();
+	
+	u8 getType() const
+	{
+		return ACTIVEOBJECT_TYPE_ITEM;
+	}
+	
+	static ClientActiveObject* create(IGameDef *gamedef, ClientEnvironment *env);
+
+	void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
+			IrrlichtDevice *irr);
+	void removeFromScene();
+	void updateLight(u8 light_at_pos);
+	v3s16 getLightPosition();
+	void updateNodePos();
+	void updateInfoText();
+	void updateTexture();
+
+	void step(float dtime, ClientEnvironment *env);
+
+	void processMessage(const std::string &data);
+
+	void initialize(const std::string &data);
+	
+	core::aabbox3d<f32>* getSelectionBox()
+		{return &m_selection_box;}
+	v3f getPosition()
+		{return m_position;}
+	
+	std::string infoText()
+		{return m_infotext;}
+
+private:
+	core::aabbox3d<f32> m_selection_box;
+	scene::IMeshSceneNode *m_node;
+	v3f m_position;
+	std::string m_itemstring;
+	std::string m_infotext;
+};
+
 #include "inventory.h"
 
 // Prototype
@@ -529,588 +337,22 @@ ItemCAO::ItemCAO(IGameDef *gamedef, ClientEnvironment *env):
 	m_node(NULL),
 	m_position(v3f(0,10*BS,0))
 {
-	ClientActiveObject::registerType(getType(), create);
+	if(!gamedef && !env)
+	{
+		ClientActiveObject::registerType(getType(), create);
+	}
 }
 
 ItemCAO::~ItemCAO()
 {
 }
 
-ClientActiveObject* ItemCAO::create(IGameDef *gamedef, ClientEnvironment *env)
-{
-	return new ItemCAO(gamedef, env);
-}
-
-void ItemCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
-			IrrlichtDevice *irr)
-{
-	if(m_node != NULL)
-		return;
-	
-	//video::IVideoDriver* driver = smgr->getVideoDriver();
-	
-	scene::SMesh *mesh = new scene::SMesh();
-	scene::IMeshBuffer *buf = new scene::SMeshBuffer();
-	video::SColor c(255,255,255,255);
-	video::S3DVertex vertices[4] =
-	{
-		/*video::S3DVertex(-BS/2,-BS/4,0, 0,0,0, c, 0,1),
-		video::S3DVertex(BS/2,-BS/4,0, 0,0,0, c, 1,1),
-		video::S3DVertex(BS/2,BS/4,0, 0,0,0, c, 1,0),
-		video::S3DVertex(-BS/2,BS/4,0, 0,0,0, c, 0,0),*/
-		video::S3DVertex(BS/3.,0,0, 0,0,0, c, 0,1),
-		video::S3DVertex(-BS/3.,0,0, 0,0,0, c, 1,1),
-		video::S3DVertex(-BS/3.,0+BS*2./3.,0, 0,0,0, c, 1,0),
-		video::S3DVertex(BS/3.,0+BS*2./3.,0, 0,0,0, c, 0,0),
-	};
-	u16 indices[] = {0,1,2,2,3,0};
-	buf->append(vertices, 4, indices, 6);
-	// Set material
-	buf->getMaterial().setFlag(video::EMF_LIGHTING, false);
-	buf->getMaterial().setFlag(video::EMF_BACK_FACE_CULLING, false);
-	//buf->getMaterial().setTexture(0, NULL);
-	// Initialize with the stick texture
-	buf->getMaterial().setTexture(0, tsrc->getTextureRaw("stick.png"));
-	buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, false);
-	buf->getMaterial().setFlag(video::EMF_FOG_ENABLE, true);
-	buf->getMaterial().MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
-	// Add to mesh
-	mesh->addMeshBuffer(buf);
-	buf->drop();
-	m_node = 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
-	m_node->setReadOnlyMaterials(true);
-	updateNodePos();
-
-	/*
-		Update image of node
-	*/
-
-	// Create an inventory item to see what is its image
-	std::istringstream is(m_inventorystring, std::ios_base::binary);
-	video::ITexture *texture = NULL;
-	try{
-		InventoryItem *item = NULL;
-		item = InventoryItem::deSerialize(is, m_gamedef);
-		infostream<<__FUNCTION_NAME<<": m_inventorystring=\""
-				<<m_inventorystring<<"\" -> item="<<item
-				<<std::endl;
-		if(item)
-		{
-			texture = item->getImage();
-			delete item;
-		}
-	}
-	catch(SerializationError &e)
-	{
-		infostream<<"WARNING: "<<__FUNCTION_NAME
-				<<": error deSerializing inventorystring \""
-				<<m_inventorystring<<"\""<<std::endl;
-	}
-	
-	// Set meshbuffer texture
-	buf->getMaterial().setTexture(0, texture);
-}
-
-void ItemCAO::removeFromScene()
-{
-	if(m_node == NULL)
-		return;
-
-	m_node->remove();
-	m_node = NULL;
-}
-
-void ItemCAO::updateLight(u8 light_at_pos)
-{
-	if(m_node == NULL)
-		return;
-
-	u8 li = decode_light(light_at_pos);
-	video::SColor color(255,li,li,li);
-	setMeshVerticesColor(m_node->getMesh(), color);
-}
-
-v3s16 ItemCAO::getLightPosition()
-{
-	return floatToInt(m_position, BS);
-}
-
-void ItemCAO::updateNodePos()
-{
-	if(m_node == NULL)
-		return;
-
-	m_node->setPosition(m_position);
-}
-
-void ItemCAO::step(float dtime, ClientEnvironment *env)
-{
-	if(m_node)
-	{
-		/*v3f rot = m_node->getRotation();
-		rot.Y += dtime * 120;
-		m_node->setRotation(rot);*/
-		LocalPlayer *player = env->getLocalPlayer();
-		assert(player);
-		v3f rot = m_node->getRotation();
-		rot.Y = 180.0 - (player->getYaw());
-		m_node->setRotation(rot);
-	}
-}
-
-void ItemCAO::processMessage(const std::string &data)
-{
-	//infostream<<"ItemCAO: Got message"<<std::endl;
-	std::istringstream is(data, std::ios::binary);
-	// command
-	u8 cmd = readU8(is);
-	if(cmd == 0)
-	{
-		// pos
-		m_position = readV3F1000(is);
-		updateNodePos();
-	}
-}
-
-void ItemCAO::initialize(const std::string &data)
-{
-	infostream<<"ItemCAO: Got init data"<<std::endl;
-	
-	{
-		std::istringstream is(data, std::ios::binary);
-		// version
-		u8 version = readU8(is);
-		// check version
-		if(version != 0)
-			return;
-		// pos
-		m_position = readV3F1000(is);
-		// inventorystring
-		m_inventorystring = deSerializeString(is);
-	}
-	
-	updateNodePos();
-}
-
-/*
-	RatCAO
-*/
-
-#include "inventory.h"
-
-// Prototype
-RatCAO proto_RatCAO(NULL, NULL);
-
-RatCAO::RatCAO(IGameDef *gamedef, ClientEnvironment *env):
-	ClientActiveObject(0, gamedef, env),
-	m_selection_box(-BS/3.,0.0,-BS/3., BS/3.,BS/2.,BS/3.),
-	m_node(NULL),
-	m_position(v3f(0,10*BS,0)),
-	m_yaw(0)
-{
-	ClientActiveObject::registerType(getType(), create);
-}
-
-RatCAO::~RatCAO()
-{
-}
-
-ClientActiveObject* RatCAO::create(IGameDef *gamedef, ClientEnvironment *env)
-{
-	return new RatCAO(gamedef, env);
-}
-
-void RatCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
-			IrrlichtDevice *irr)
-{
-	if(m_node != NULL)
-		return;
-	
-	//video::IVideoDriver* driver = smgr->getVideoDriver();
-	
-	scene::SMesh *mesh = new scene::SMesh();
-	scene::IMeshBuffer *buf = new scene::SMeshBuffer();
-	video::SColor c(255,255,255,255);
-	video::S3DVertex vertices[4] =
-	{
-		video::S3DVertex(-BS/2,0,0, 0,0,0, c, 0,1),
-		video::S3DVertex(BS/2,0,0, 0,0,0, c, 1,1),
-		video::S3DVertex(BS/2,BS/2,0, 0,0,0, c, 1,0),
-		video::S3DVertex(-BS/2,BS/2,0, 0,0,0, c, 0,0),
-	};
-	u16 indices[] = {0,1,2,2,3,0};
-	buf->append(vertices, 4, indices, 6);
-	// Set material
-	buf->getMaterial().setFlag(video::EMF_LIGHTING, false);
-	buf->getMaterial().setFlag(video::EMF_BACK_FACE_CULLING, false);
-	//buf->getMaterial().setTexture(0, NULL);
-	buf->getMaterial().setTexture(0, tsrc->getTextureRaw("rat.png"));
-	buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, false);
-	buf->getMaterial().setFlag(video::EMF_FOG_ENABLE, true);
-	buf->getMaterial().MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
-	// Add to mesh
-	mesh->addMeshBuffer(buf);
-	buf->drop();
-	m_node = 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
-	m_node->setReadOnlyMaterials(true);
-	updateNodePos();
-}
-
-void RatCAO::removeFromScene()
-{
-	if(m_node == NULL)
-		return;
-
-	m_node->remove();
-	m_node = NULL;
-}
-
-void RatCAO::updateLight(u8 light_at_pos)
-{
-	if(m_node == NULL)
-		return;
-
-	u8 li = decode_light(light_at_pos);
-	video::SColor color(255,li,li,li);
-	setMeshVerticesColor(m_node->getMesh(), color);
-}
-
-v3s16 RatCAO::getLightPosition()
-{
-	return floatToInt(m_position+v3f(0,BS*0.5,0), BS);
-}
-
-void RatCAO::updateNodePos()
-{
-	if(m_node == NULL)
-		return;
-
-	//m_node->setPosition(m_position);
-	m_node->setPosition(pos_translator.vect_show);
-
-	v3f rot = m_node->getRotation();
-	rot.Y = 180.0 - m_yaw;
-	m_node->setRotation(rot);
-}
-
-void RatCAO::step(float dtime, ClientEnvironment *env)
-{
-	pos_translator.translate(dtime);
-	updateNodePos();
-}
-
-void RatCAO::processMessage(const std::string &data)
-{
-	//infostream<<"RatCAO: Got message"<<std::endl;
-	std::istringstream is(data, std::ios::binary);
-	// command
-	u8 cmd = readU8(is);
-	if(cmd == 0)
-	{
-		// pos
-		m_position = readV3F1000(is);
-		pos_translator.update(m_position);
-		// yaw
-		m_yaw = readF1000(is);
-		updateNodePos();
-	}
-}
-
-void RatCAO::initialize(const std::string &data)
-{
-	//infostream<<"RatCAO: Got init data"<<std::endl;
-	
-	{
-		std::istringstream is(data, std::ios::binary);
-		// version
-		u8 version = readU8(is);
-		// check version
-		if(version != 0)
-			return;
-		// pos
-		m_position = readV3F1000(is);
-		pos_translator.init(m_position);
-	}
-	
-	updateNodePos();
-}
-
-/*
-	Oerkki1CAO
-*/
-
-#include "inventory.h"
-
-// Prototype
-Oerkki1CAO proto_Oerkki1CAO(NULL, NULL);
-
-Oerkki1CAO::Oerkki1CAO(IGameDef *gamedef, ClientEnvironment *env):
-	ClientActiveObject(0, gamedef, env),
-	m_selection_box(-BS/3.,0.0,-BS/3., BS/3.,BS*2.,BS/3.),
-	m_node(NULL),
-	m_position(v3f(0,10*BS,0)),
-	m_yaw(0),
-	m_damage_visual_timer(0),
-	m_damage_texture_enabled(false)
-{
-	ClientActiveObject::registerType(getType(), create);
-}
-
-Oerkki1CAO::~Oerkki1CAO()
-{
-}
-
-ClientActiveObject* Oerkki1CAO::create(IGameDef *gamedef, ClientEnvironment *env)
-{
-	return new Oerkki1CAO(gamedef, env);
-}
-
-void Oerkki1CAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
-			IrrlichtDevice *irr)
-{
-	if(m_node != NULL)
-		return;
-	
-	//video::IVideoDriver* driver = smgr->getVideoDriver();
-	
-	scene::SMesh *mesh = new scene::SMesh();
-	scene::IMeshBuffer *buf = new scene::SMeshBuffer();
-	video::SColor c(255,255,255,255);
-	video::S3DVertex vertices[4] =
-	{
-		video::S3DVertex(-BS/2-BS,0,0, 0,0,0, c, 0,1),
-		video::S3DVertex(BS/2+BS,0,0, 0,0,0, c, 1,1),
-		video::S3DVertex(BS/2+BS,BS*2,0, 0,0,0, c, 1,0),
-		video::S3DVertex(-BS/2-BS,BS*2,0, 0,0,0, c, 0,0),
-	};
-	u16 indices[] = {0,1,2,2,3,0};
-	buf->append(vertices, 4, indices, 6);
-	// Set material
-	buf->getMaterial().setFlag(video::EMF_LIGHTING, false);
-	buf->getMaterial().setFlag(video::EMF_BACK_FACE_CULLING, false);
-	//buf->getMaterial().setTexture(0, NULL);
-	buf->getMaterial().setTexture(0, tsrc->getTextureRaw("oerkki1.png"));
-	buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, false);
-	buf->getMaterial().setFlag(video::EMF_FOG_ENABLE, true);
-	buf->getMaterial().MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
-	// Add to mesh
-	mesh->addMeshBuffer(buf);
-	buf->drop();
-	m_node = 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
-	m_node->setReadOnlyMaterials(true);
-	updateNodePos();
-}
-
-void Oerkki1CAO::removeFromScene()
-{
-	if(m_node == NULL)
-		return;
-
-	m_node->remove();
-	m_node = NULL;
-}
-
-void Oerkki1CAO::updateLight(u8 light_at_pos)
-{
-	if(m_node == NULL)
-		return;
-	
-	if(light_at_pos <= 2)
-	{
-		m_node->setVisible(false);
-		return;
-	}
-
-	m_node->setVisible(true);
-
-	u8 li = decode_light(light_at_pos);
-	video::SColor color(255,li,li,li);
-	setMeshVerticesColor(m_node->getMesh(), color);
-}
-
-v3s16 Oerkki1CAO::getLightPosition()
-{
-	return floatToInt(m_position+v3f(0,BS*1.5,0), BS);
-}
-
-void Oerkki1CAO::updateNodePos()
-{
-	if(m_node == NULL)
-		return;
-
-	//m_node->setPosition(m_position);
-	m_node->setPosition(pos_translator.vect_show);
-
-	v3f rot = m_node->getRotation();
-	rot.Y = 180.0 - m_yaw + 90.0;
-	m_node->setRotation(rot);
-}
-
-void Oerkki1CAO::step(float dtime, ClientEnvironment *env)
-{
-	ITextureSource *tsrc = m_gamedef->tsrc();
-
-	pos_translator.translate(dtime);
-	updateNodePos();
-
-	LocalPlayer *player = env->getLocalPlayer();
-	assert(player);
-	
-	v3f playerpos = player->getPosition();
-	v2f playerpos_2d(playerpos.X,playerpos.Z);
-	v2f objectpos_2d(m_position.X,m_position.Z);
-
-	if(fabs(m_position.Y - playerpos.Y) < 1.5*BS &&
-			objectpos_2d.getDistanceFrom(playerpos_2d) < 1.5*BS)
-	{
-		if(m_attack_interval.step(dtime, 0.5))
-		{
-			env->damageLocalPlayer(2);
-		}
-	}
-
-	if(m_damage_visual_timer > 0)
-	{
-		if(!m_damage_texture_enabled)
-		{
-			// Enable damage texture
-			if(m_node)
-			{
-				/*video::IVideoDriver* driver =
-					m_node->getSceneManager()->getVideoDriver();*/
-				
-				scene::IMesh *mesh = m_node->getMesh();
-				if(mesh == NULL)
-					return;
-				
-				u16 mc = mesh->getMeshBufferCount();
-				for(u16 j=0; j<mc; j++)
-				{
-					scene::IMeshBuffer *buf = mesh->getMeshBuffer(j);
-					buf->getMaterial().setTexture(0,
-							tsrc->getTextureRaw("oerkki1_damaged.png"));
-				}
-			}
-			m_damage_texture_enabled = true;
-		}
-		m_damage_visual_timer -= dtime;
-	}
-	else
-	{
-		if(m_damage_texture_enabled)
-		{
-			// Disable damage texture
-			if(m_node)
-			{
-				/*video::IVideoDriver* driver =
-					m_node->getSceneManager()->getVideoDriver();*/
-				
-				scene::IMesh *mesh = m_node->getMesh();
-				if(mesh == NULL)
-					return;
-				
-				u16 mc = mesh->getMeshBufferCount();
-				for(u16 j=0; j<mc; j++)
-				{
-					scene::IMeshBuffer *buf = mesh->getMeshBuffer(j);
-					buf->getMaterial().setTexture(0,
-							tsrc->getTextureRaw("oerkki1.png"));
-				}
-			}
-			m_damage_texture_enabled = false;
-		}
-	}
-}
-
-void Oerkki1CAO::processMessage(const std::string &data)
-{
-	//infostream<<"Oerkki1CAO: Got message"<<std::endl;
-	std::istringstream is(data, std::ios::binary);
-	// command
-	u8 cmd = readU8(is);
-	if(cmd == 0)
-	{
-		// pos
-		m_position = readV3F1000(is);
-		pos_translator.update(m_position);
-		// yaw
-		m_yaw = readF1000(is);
-		updateNodePos();
-	}
-	else if(cmd == 1)
-	{
-		//u16 damage = readU8(is);
-		m_damage_visual_timer = 1.0;
-	}
-}
-
-void Oerkki1CAO::initialize(const std::string &data)
-{
-	//infostream<<"Oerkki1CAO: Got init data"<<std::endl;
-	
-	{
-		std::istringstream is(data, std::ios::binary);
-		// version
-		u8 version = readU8(is);
-		// check version
-		if(version != 0)
-			return;
-		// pos
-		m_position = readV3F1000(is);
-		pos_translator.init(m_position);
-	}
-	
-	updateNodePos();
-}
-
-bool Oerkki1CAO::directReportPunch(const std::string &toolname, v3f dir)
-{
-	m_damage_visual_timer = 1.0;
-
-	m_position += dir * BS;
-	pos_translator.sharpen();
-	pos_translator.update(m_position);
-	updateNodePos();
-	
-	return false;
-}
-
-/*
-	FireflyCAO
-*/
-
-// Prototype
-FireflyCAO proto_FireflyCAO(NULL, NULL);
-
-FireflyCAO::FireflyCAO(IGameDef *gamedef, ClientEnvironment *env):
-	ClientActiveObject(0, gamedef, env),
-	m_selection_box(-BS/3.,0.0,-BS/3., BS/3.,BS/2.,BS/3.),
-	m_node(NULL),
-	m_position(v3f(0,10*BS,0)),
-	m_yaw(0)
-{
-	ClientActiveObject::registerType(getType(), create);
-}
-
-FireflyCAO::~FireflyCAO()
-{
-}
-
-ClientActiveObject* FireflyCAO::create(IGameDef *gamedef, ClientEnvironment *env)
+ClientActiveObject* ItemCAO::create(IGameDef *gamedef, ClientEnvironment *env)
 {
-	return new FireflyCAO(gamedef, env);
+	return new ItemCAO(gamedef, env);
 }
 
-void FireflyCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
+void ItemCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
 			IrrlichtDevice *irr)
 {
 	if(m_node != NULL)
@@ -1123,18 +365,22 @@ void FireflyCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
 	video::SColor c(255,255,255,255);
 	video::S3DVertex vertices[4] =
 	{
-		video::S3DVertex(0,0,0, 0,0,0, c, 0,1),
-		video::S3DVertex(BS/2,0,0, 0,0,0, c, 1,1),
-		video::S3DVertex(BS/2,BS/2,0, 0,0,0, c, 1,0),
-		video::S3DVertex(0,BS/2,0, 0,0,0, c, 0,0),
+		/*video::S3DVertex(-BS/2,-BS/4,0, 0,0,0, c, 0,1),
+		video::S3DVertex(BS/2,-BS/4,0, 0,0,0, c, 1,1),
+		video::S3DVertex(BS/2,BS/4,0, 0,0,0, c, 1,0),
+		video::S3DVertex(-BS/2,BS/4,0, 0,0,0, c, 0,0),*/
+		video::S3DVertex(BS/3.,0,0, 0,0,0, c, 0,1),
+		video::S3DVertex(-BS/3.,0,0, 0,0,0, c, 1,1),
+		video::S3DVertex(-BS/3.,0+BS*2./3.,0, 0,0,0, c, 1,0),
+		video::S3DVertex(BS/3.,0+BS*2./3.,0, 0,0,0, c, 0,0),
 	};
 	u16 indices[] = {0,1,2,2,3,0};
 	buf->append(vertices, 4, indices, 6);
 	// Set material
 	buf->getMaterial().setFlag(video::EMF_LIGHTING, false);
 	buf->getMaterial().setFlag(video::EMF_BACK_FACE_CULLING, false);
-	//buf->getMaterial().setTexture(0, NULL);
-	buf->getMaterial().setTexture(0, tsrc->getTextureRaw("firefly.png"));
+	// Initialize with a generated placeholder texture
+	buf->getMaterial().setTexture(0, tsrc->getTextureRaw(""));
 	buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, false);
 	buf->getMaterial().setFlag(video::EMF_FOG_ENABLE, true);
 	buf->getMaterial().MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
@@ -1143,13 +389,16 @@ void FireflyCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
 	buf->drop();
 	m_node = 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
-	m_node->setReadOnlyMaterials(true);
 	updateNodePos();
+
+	/*
+		Update image of node
+	*/
+
+	updateTexture();
 }
 
-void FireflyCAO::removeFromScene()
+void ItemCAO::removeFromScene()
 {
 	if(m_node == NULL)
 		return;
@@ -1158,488 +407,129 @@ void FireflyCAO::removeFromScene()
 	m_node = NULL;
 }
 
-void FireflyCAO::updateLight(u8 light_at_pos)
+void ItemCAO::updateLight(u8 light_at_pos)
 {
 	if(m_node == NULL)
 		return;
 
-	u8 li = 255;
+	u8 li = decode_light(light_at_pos);
 	video::SColor color(255,li,li,li);
-	setMeshVerticesColor(m_node->getMesh(), color);
+	setMeshColor(m_node->getMesh(), color);
 }
 
-v3s16 FireflyCAO::getLightPosition()
+v3s16 ItemCAO::getLightPosition()
 {
-	return floatToInt(m_position+v3f(0,BS*0.5,0), BS);
+	return floatToInt(m_position + v3f(0,0.5*BS,0), BS);
 }
 
-void FireflyCAO::updateNodePos()
+void ItemCAO::updateNodePos()
 {
 	if(m_node == NULL)
 		return;
 
-	//m_node->setPosition(m_position);
-	m_node->setPosition(pos_translator.vect_show);
-
-	v3f rot = m_node->getRotation();
-	rot.Y = 180.0 - m_yaw;
-	m_node->setRotation(rot);
-}
-
-void FireflyCAO::step(float dtime, ClientEnvironment *env)
-{
-	pos_translator.translate(dtime);
-	updateNodePos();
+	m_node->setPosition(m_position);
 }
 
-void FireflyCAO::processMessage(const std::string &data)
+void ItemCAO::updateInfoText()
 {
-	//infostream<<"FireflyCAO: Got message"<<std::endl;
-	std::istringstream is(data, std::ios::binary);
-	// command
-	u8 cmd = readU8(is);
-	if(cmd == 0)
-	{
-		// pos
-		m_position = readV3F1000(is);
-		pos_translator.update(m_position);
-		// yaw
-		m_yaw = readF1000(is);
-		updateNodePos();
+	try{
+		IItemDefManager *idef = m_gamedef->idef();
+		ItemStack item;
+		item.deSerialize(m_itemstring, idef);
+		if(item.isKnown(idef))
+			m_infotext = item.getDefinition(idef).description;
+		else
+			m_infotext = "Unknown item: '" + m_itemstring + "'";
+		if(item.count >= 2)
+			m_infotext += " (" + itos(item.count) + ")";
 	}
-}
-
-void FireflyCAO::initialize(const std::string &data)
-{
-	//infostream<<"FireflyCAO: Got init data"<<std::endl;
-	
+	catch(SerializationError &e)
 	{
-		std::istringstream is(data, std::ios::binary);
-		// version
-		u8 version = readU8(is);
-		// check version
-		if(version != 0)
-			return;
-		// pos
-		m_position = readV3F1000(is);
-		pos_translator.init(m_position);
-	}
-	
-	updateNodePos();
-}
-
-/*
-	MobV2CAO
-*/
-
-// Prototype
-MobV2CAO proto_MobV2CAO(NULL, NULL);
-
-MobV2CAO::MobV2CAO(IGameDef *gamedef, ClientEnvironment *env):
-	ClientActiveObject(0, gamedef, env),
-	m_selection_box(-0.4*BS,-0.4*BS,-0.4*BS, 0.4*BS,0.8*BS,0.4*BS),
-	m_node(NULL),
-	m_position(v3f(0,10*BS,0)),
-	m_yaw(0),
-	m_walking(false),
-	m_walking_unset_timer(0),
-	m_walk_timer(0),
-	m_walk_frame(0),
-	m_damage_visual_timer(0),
-	m_last_light(0),
-	m_shooting(0),
-	m_shooting_unset_timer(0),
-	m_sprite_size(BS,BS),
-	m_sprite_y(0),
-	m_bright_shooting(false),
-	m_lock_full_brightness(false),
-	m_player_hit_timer(0)
-{
-	ClientActiveObject::registerType(getType(), create);
-
-	m_properties = new Settings;
-}
-
-MobV2CAO::~MobV2CAO()
-{
-	delete m_properties;
-}
-
-ClientActiveObject* MobV2CAO::create(IGameDef *gamedef, ClientEnvironment *env)
-{
-	return new MobV2CAO(gamedef, env);
-}
-
-void MobV2CAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
-			IrrlichtDevice *irr)
-{
-	if(m_node != NULL)
-		return;
-	
-	/*infostream<<"MobV2CAO::addToScene using texture_name="<<
-			m_texture_name<<std::endl;*/
-	std::string texture_string = m_texture_name +
-			"^[makealpha:128,0,0^[makealpha:128,128,0";
-	
-	scene::MyBillboardSceneNode *bill = new scene::MyBillboardSceneNode(
-			smgr->getRootSceneNode(), smgr, -1, v3f(0,0,0), v2f(1,1));
-	bill->setMaterialTexture(0, tsrc->getTextureRaw(texture_string));
-	bill->setMaterialFlag(video::EMF_LIGHTING, false);
-	bill->setMaterialFlag(video::EMF_BILINEAR_FILTER, false);
-	bill->setMaterialType(video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF);
-	bill->setMaterialFlag(video::EMF_FOG_ENABLE, true);
-	bill->setColor(video::SColor(255,0,0,0));
-	bill->setVisible(false); /* Set visible when brightness is known */
-	bill->setSize(m_sprite_size);
-	if(m_sprite_type == "humanoid_1"){
-		const float txp = 1./192;
-		const float txs = txp*32;
-		const float typ = 1./240;
-		const float tys = typ*48;
-		bill->setTCoords(0, v2f(txs*1, tys*1));
-		bill->setTCoords(1, v2f(txs*1, tys*0));
-		bill->setTCoords(2, v2f(txs*0, tys*0));
-		bill->setTCoords(3, v2f(txs*0, tys*1));
-	} else if(m_sprite_type == "simple"){
-		const float txs = 1.0;
-		const float tys = 1.0 / m_simple_anim_frames;
-		bill->setTCoords(0, v2f(txs*1, tys*1));
-		bill->setTCoords(1, v2f(txs*1, tys*0));
-		bill->setTCoords(2, v2f(txs*0, tys*0));
-		bill->setTCoords(3, v2f(txs*0, tys*1));
-	} else {
-		infostream<<"MobV2CAO: Unknown sprite type \""<<m_sprite_type<<"\""
-				<<std::endl;
+		m_infotext = "Unknown item: '" + m_itemstring + "'";
 	}
-
-	m_node = bill;
-
-	updateNodePos();
 }
 
-void MobV2CAO::removeFromScene()
+void ItemCAO::updateTexture()
 {
 	if(m_node == NULL)
 		return;
 
-	m_node->drop();
-	m_node->remove();
-	m_node = NULL;
-}
-
-void MobV2CAO::updateLight(u8 light_at_pos)
-{
-	if(m_lock_full_brightness)
-		light_at_pos = 15;
-	
-	m_last_light = light_at_pos;
-
-	if(m_node == NULL)
-		return;
-	
-	if(m_damage_visual_timer > 0)
-		return;
-	
-	if(m_shooting && m_bright_shooting)
-		return;
+	// Create an inventory item to see what is its image
+	std::istringstream is(m_itemstring, std::ios_base::binary);
+	video::ITexture *texture = NULL;
+	try{
+		IItemDefManager *idef = m_gamedef->idef();
+		ItemStack item;
+		item.deSerialize(is, idef);
+		texture = item.getDefinition(idef).inventory_texture;
+	}
+	catch(SerializationError &e)
+	{
+		infostream<<"WARNING: "<<__FUNCTION_NAME
+				<<": error deSerializing itemstring \""
+				<<m_itemstring<<std::endl;
+	}
 	
-	/*if(light_at_pos <= 2){
-		m_node->setVisible(false);
-		return;
-	}*/
-
-	m_node->setVisible(true);
-
-	u8 li = decode_light(light_at_pos);
-	video::SColor color(255,li,li,li);
-	m_node->setColor(color);
-}
-
-v3s16 MobV2CAO::getLightPosition()
-{
-	return floatToInt(m_position+v3f(0,0,0), BS);
+	// Set meshbuffer texture
+	m_node->getMaterial(0).setTexture(0, texture);
 }
 
-void MobV2CAO::updateNodePos()
-{
-	if(m_node == NULL)
-		return;
-
-	m_node->setPosition(pos_translator.vect_show + v3f(0,m_sprite_y,0));
-}
 
-void MobV2CAO::step(float dtime, ClientEnvironment *env)
+void ItemCAO::step(float dtime, ClientEnvironment *env)
 {
-	scene::MyBillboardSceneNode *bill = m_node;
-	if(!bill)
-		return;
-
-	pos_translator.translate(dtime);
-	
-	if(m_sprite_type == "humanoid_1"){
-		scene::ICameraSceneNode* camera = m_node->getSceneManager()->getActiveCamera();
-		if(!camera)
-			return;
-		v3f cam_to_mob = m_node->getAbsolutePosition() - camera->getAbsolutePosition();
-		cam_to_mob.normalize();
-		int col = 0;
-		if(cam_to_mob.Y > 0.75)
-			col = 5;
-		else if(cam_to_mob.Y < -0.75)
-			col = 4;
-		else{
-			float mob_dir = atan2(cam_to_mob.Z, cam_to_mob.X) / PI * 180.;
-			float dir = mob_dir - m_yaw;
-			dir = wrapDegrees_180(dir);
-			//infostream<<"id="<<m_id<<" dir="<<dir<<std::endl;
-			if(fabs(wrapDegrees_180(dir - 0)) <= 45.1)
-				col = 2;
-			else if(fabs(wrapDegrees_180(dir - 90)) <= 45.1)
-				col = 3;
-			else if(fabs(wrapDegrees_180(dir - 180)) <= 45.1)
-				col = 0;
-			else if(fabs(wrapDegrees_180(dir + 90)) <= 45.1)
-				col = 1;
-			else
-				col = 4;
-		}
-
-		int row = 0;
-		if(m_shooting){
-			row = 3;
-		} else if(m_walking){
-			m_walk_timer += dtime;
-			if(m_walk_timer >= 0.5){
-				m_walk_frame = (m_walk_frame + 1) % 2;
-				m_walk_timer = 0;
-			}
-			if(m_walk_frame == 0)
-				row = 1;
-			else
-				row = 2;
-		}
-
-		const float txp = 1./192;
-		const float txs = txp*32;
-		const float typ = 1./240;
-		const float tys = typ*48;
-		bill->setTCoords(0, v2f(txs*(1+col), tys*(1+row)));
-		bill->setTCoords(1, v2f(txs*(1+col), tys*(0+row)));
-		bill->setTCoords(2, v2f(txs*(0+col), tys*(0+row)));
-		bill->setTCoords(3, v2f(txs*(0+col), tys*(1+row)));
-	} else if(m_sprite_type == "simple"){
-		m_walk_timer += dtime;
-		if(m_walk_timer >= m_simple_anim_frametime){
-			m_walk_frame = (m_walk_frame + 1) % m_simple_anim_frames;
-			m_walk_timer = 0;
-		}
-		int col = 0;
-		int row = m_walk_frame;
-		const float txs = 1.0;
-		const float tys = 1.0 / m_simple_anim_frames;
-		bill->setTCoords(0, v2f(txs*(1+col), tys*(1+row)));
-		bill->setTCoords(1, v2f(txs*(1+col), tys*(0+row)));
-		bill->setTCoords(2, v2f(txs*(0+col), tys*(0+row)));
-		bill->setTCoords(3, v2f(txs*(0+col), tys*(1+row)));
-	} else {
-		infostream<<"MobV2CAO::step(): Unknown sprite type \""
-				<<m_sprite_type<<"\""<<std::endl;
-	}
-
-	updateNodePos();
-
-	/* Damage local player */
-	if(m_player_hit_damage && m_player_hit_timer <= 0.0){
+	if(m_node)
+	{
+		/*v3f rot = m_node->getRotation();
+		rot.Y += dtime * 120;
+		m_node->setRotation(rot);*/
 		LocalPlayer *player = env->getLocalPlayer();
 		assert(player);
-		
-		v3f playerpos = player->getPosition();
-		v2f playerpos_2d(playerpos.X,playerpos.Z);
-		v2f objectpos_2d(m_position.X,m_position.Z);
-
-		if(fabs(m_position.Y - playerpos.Y) < m_player_hit_distance*BS &&
-		objectpos_2d.getDistanceFrom(playerpos_2d) < m_player_hit_distance*BS)
-		{
-			env->damageLocalPlayer(m_player_hit_damage);
-			m_player_hit_timer = m_player_hit_interval;
-		}
-	}
-
-	/* Run timers */
-
-	m_player_hit_timer -= dtime;
-
-	if(m_damage_visual_timer >= 0){
-		m_damage_visual_timer -= dtime;
-		if(m_damage_visual_timer <= 0){
-			infostream<<"id="<<m_id<<" damage visual ended"<<std::endl;
-		}
-	}
-
-	m_walking_unset_timer += dtime;
-	if(m_walking_unset_timer >= 1.0){
-		m_walking = false;
-	}
-
-	m_shooting_unset_timer -= dtime;
-	if(m_shooting_unset_timer <= 0.0){
-		if(m_bright_shooting){
-			u8 li = decode_light(m_last_light);
-			video::SColor color(255,li,li,li);
-			bill->setColor(color);
-			m_bright_shooting = false;
-		}
-		m_shooting = false;
+		v3f rot = m_node->getRotation();
+		rot.Y = 180.0 - (player->getYaw());
+		m_node->setRotation(rot);
 	}
-
 }
 
-void MobV2CAO::processMessage(const std::string &data)
+void ItemCAO::processMessage(const std::string &data)
 {
-	//infostream<<"MobV2CAO: Got message"<<std::endl;
+	//infostream<<"ItemCAO: Got message"<<std::endl;
 	std::istringstream is(data, std::ios::binary);
 	// command
 	u8 cmd = readU8(is);
-
-	// Move
 	if(cmd == 0)
 	{
 		// pos
 		m_position = readV3F1000(is);
-		pos_translator.update(m_position);
-		// yaw
-		m_yaw = readF1000(is);
-
-		m_walking = true;
-		m_walking_unset_timer = 0;
-
 		updateNodePos();
 	}
-	// Damage
-	else if(cmd == 1)
-	{
-		//u16 damage = readU16(is);
-
-		/*u8 li = decode_light(m_last_light);
-		if(li >= 100)
-			li = 30;
-		else
-			li = 255;*/
-
-		/*video::SColor color(255,255,0,0);
-		m_node->setColor(color);
-
-		m_damage_visual_timer = 0.2;*/
-	}
-	// Trigger shooting
-	else if(cmd == 2)
+	if(cmd == 1)
 	{
-		// length
-		m_shooting_unset_timer = readF1000(is);
-		// bright?
-		m_bright_shooting = readU8(is);
-		if(m_bright_shooting){
-			u8 li = 255;
-			video::SColor color(255,li,li,li);
-			m_node->setColor(color);
-		}
-
-		m_shooting = true;
+		// itemstring
+		m_itemstring = deSerializeString(is);
+		updateInfoText();
+		updateTexture();
 	}
 }
 
-void MobV2CAO::initialize(const std::string &data)
+void ItemCAO::initialize(const std::string &data)
 {
-	//infostream<<"MobV2CAO: Got init data"<<std::endl;
+	infostream<<"ItemCAO: Got init data"<<std::endl;
 	
 	{
 		std::istringstream is(data, std::ios::binary);
 		// version
 		u8 version = readU8(is);
 		// check version
-		if(version != 0){
-			infostream<<__FUNCTION_NAME<<": Invalid version"<<std::endl;
+		if(version != 0)
 			return;
-		}
-		
-		std::ostringstream tmp_os(std::ios::binary);
-		decompressZlib(is, tmp_os);
-		std::istringstream tmp_is(tmp_os.str(), std::ios::binary);
-		m_properties->parseConfigLines(tmp_is, "MobArgsEnd");
-
-		infostream<<"MobV2CAO::initialize(): got properties:"<<std::endl;
-		m_properties->writeLines(infostream);
-		
-		m_properties->setDefault("looks", "dummy_default");
-		m_properties->setDefault("yaw", "0");
-		m_properties->setDefault("pos", "(0,0,0)");
-		m_properties->setDefault("player_hit_damage", "0");
-		m_properties->setDefault("player_hit_distance", "1.5");
-		m_properties->setDefault("player_hit_interval", "1.5");
-		
-		setLooks(m_properties->get("looks"));
-		m_yaw = m_properties->getFloat("yaw");
-		m_position = m_properties->getV3F("pos");
-		m_player_hit_damage = m_properties->getS32("player_hit_damage");
-		m_player_hit_distance = m_properties->getFloat("player_hit_distance");
-		m_player_hit_interval = m_properties->getFloat("player_hit_interval");
-
-		pos_translator.init(m_position);
+		// pos
+		m_position = readV3F1000(is);
+		// itemstring
+		m_itemstring = deSerializeString(is);
 	}
 	
 	updateNodePos();
-}
-
-bool MobV2CAO::directReportPunch(const std::string &toolname, v3f dir)
-{
-	video::SColor color(255,255,0,0);
-	m_node->setColor(color);
-
-	m_damage_visual_timer = 0.05;
-
-	m_position += dir * BS;
-	pos_translator.sharpen();
-	pos_translator.update(m_position);
-	updateNodePos();
-	
-	return false;
-}
-
-void MobV2CAO::setLooks(const std::string &looks)
-{
-	v2f selection_size = v2f(0.4, 0.4) * BS;
-	float selection_y = 0 * BS;
-
-	if(looks == "dungeon_master"){
-		m_texture_name = "dungeon_master.png";
-		m_sprite_type = "humanoid_1";
-		m_sprite_size = v2f(2, 3) * BS;
-		m_sprite_y = 0.85 * BS;
-		selection_size = v2f(0.4, 2.6) * BS;
-		selection_y = -0.4 * BS;
-	}
-	else if(looks == "fireball"){
-		m_texture_name = "fireball.png";
-		m_sprite_type = "simple";
-		m_sprite_size = v2f(1, 1) * BS;
-		m_simple_anim_frames = 3;
-		m_simple_anim_frametime = 0.1;
-		m_lock_full_brightness = true;
-	}
-	else{
-		m_texture_name = "stone.png";
-		m_sprite_type = "simple";
-		m_sprite_size = v2f(1, 1) * BS;
-		m_simple_anim_frames = 3;
-		m_simple_anim_frametime = 0.333;
-		selection_size = v2f(0.4, 0.4) * BS;
-		selection_y = 0 * BS;
-	}
-
-	m_selection_box = core::aabbox3d<f32>(
-			-selection_size.X, selection_y, -selection_size.X,
-			selection_size.X, selection_y+selection_size.Y,
-			selection_size.X);
+	updateInfoText();
 }
 
 /*
@@ -1651,13 +541,15 @@ void MobV2CAO::setLooks(const std::string &looks)
 class LuaEntityCAO : public ClientActiveObject
 {
 private:
+	scene::ISceneManager *m_smgr;
 	core::aabbox3d<f32> m_selection_box;
 	scene::IMeshSceneNode *m_meshnode;
-	scene::MyBillboardSceneNode *m_spritenode;
+	scene::IBillboardSceneNode *m_spritenode;
 	v3f m_position;
 	v3f m_velocity;
 	v3f m_acceleration;
 	float m_yaw;
+	s16 m_hp;
 	struct LuaEntityProperties *m_prop;
 	SmoothTranslator pos_translator;
 	// Spritesheet/animation stuff
@@ -1668,10 +560,13 @@ class LuaEntityCAO : public ClientActiveObject
 	int m_anim_num_frames;
 	float m_anim_framelength;
 	float m_anim_timer;
+	ItemGroupList m_armor_groups;
+	float m_reset_textures_timer;
 
 public:
 	LuaEntityCAO(IGameDef *gamedef, ClientEnvironment *env):
 		ClientActiveObject(0, gamedef, env),
+		m_smgr(NULL),
 		m_selection_box(-BS/3.,-BS/3.,-BS/3., BS/3.,BS/3.,BS/3.),
 		m_meshnode(NULL),
 		m_spritenode(NULL),
@@ -1679,6 +574,7 @@ class LuaEntityCAO : public ClientActiveObject
 		m_velocity(v3f(0,0,0)),
 		m_acceleration(v3f(0,0,0)),
 		m_yaw(0),
+		m_hp(1),
 		m_prop(new LuaEntityProperties),
 		m_tx_size(1,1),
 		m_tx_basepos(0,0),
@@ -1686,7 +582,8 @@ class LuaEntityCAO : public ClientActiveObject
 		m_anim_frame(0),
 		m_anim_num_frames(1),
 		m_anim_framelength(0.2),
-		m_anim_timer(0)
+		m_anim_timer(0),
+		m_reset_textures_timer(-1)
 	{
 		if(gamedef == NULL)
 			ClientActiveObject::registerType(getType(), create);
@@ -1700,12 +597,14 @@ class LuaEntityCAO : public ClientActiveObject
 		// version
 		u8 version = readU8(is);
 		// check version
-		if(version != 0)
+		if(version != 1)
 			return;
 		// pos
 		m_position = readV3F1000(is);
 		// yaw
 		m_yaw = readF1000(is);
+		// hp
+		m_hp = readS16(is);
 		// properties
 		std::istringstream prop_is(deSerializeLongString(is), std::ios::binary);
 		m_prop->deSerialize(prop_is);
@@ -1752,6 +651,8 @@ class LuaEntityCAO : public ClientActiveObject
 	void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
 			IrrlichtDevice *irr)
 	{
+		m_smgr = smgr;
+
 		if(m_meshnode != NULL || m_spritenode != NULL)
 			return;
 		
@@ -1759,8 +660,8 @@ class LuaEntityCAO : public ClientActiveObject
 
 		if(m_prop->visual == "sprite"){
 			infostream<<"LuaEntityCAO::addToScene(): single_sprite"<<std::endl;
-			m_spritenode = new scene::MyBillboardSceneNode(
-					smgr->getRootSceneNode(), smgr, -1, v3f(0,0,0), v2f(1,1));
+			m_spritenode = smgr->addBillboardSceneNode(
+					NULL, v2f(1, 1), v3f(0,0,0), -1);
 			m_spritenode->setMaterialTexture(0,
 					tsrc->getTextureRaw("unknown_block.png"));
 			m_spritenode->setMaterialFlag(video::EMF_LIGHTING, false);
@@ -1773,71 +674,15 @@ class LuaEntityCAO : public ClientActiveObject
 			{
 				const float txs = 1.0 / 1;
 				const float tys = 1.0 / 1;
-				m_spritenode->setTCoords(0, v2f(txs*1, tys*1));
-				m_spritenode->setTCoords(1, v2f(txs*1, tys*0));
-				m_spritenode->setTCoords(2, v2f(txs*0, tys*0));
-				m_spritenode->setTCoords(3, v2f(txs*0, tys*1));
+				setBillboardTextureMatrix(m_spritenode,
+						txs, tys, 0, 0);
 			}
 		} else if(m_prop->visual == "cube"){
 			infostream<<"LuaEntityCAO::addToScene(): cube"<<std::endl;
-			video::SColor c(255,255,255,255);
-			video::S3DVertex vertices[24] =
-			{
-				// Up
-				video::S3DVertex(-0.5,+0.5,-0.5, 0,1,0, c, 0,1),
-				video::S3DVertex(-0.5,+0.5,+0.5, 0,1,0, c, 0,0),
-				video::S3DVertex(+0.5,+0.5,+0.5, 0,1,0, c, 1,0),
-				video::S3DVertex(+0.5,+0.5,-0.5, 0,1,0, c, 1,1),
-				// Down
-				video::S3DVertex(-0.5,-0.5,-0.5, 0,-1,0, c, 0,0),
-				video::S3DVertex(+0.5,-0.5,-0.5, 0,-1,0, c, 1,0),
-				video::S3DVertex(+0.5,-0.5,+0.5, 0,-1,0, c, 1,1),
-				video::S3DVertex(-0.5,-0.5,+0.5, 0,-1,0, c, 0,1),
-				// Right
-				video::S3DVertex(+0.5,-0.5,-0.5, 1,0,0, c, 0,1),
-				video::S3DVertex(+0.5,+0.5,-0.5, 1,0,0, c, 0,0),
-				video::S3DVertex(+0.5,+0.5,+0.5, 1,0,0, c, 1,0),
-				video::S3DVertex(+0.5,-0.5,+0.5, 1,0,0, c, 1,1),
-				// Left
-				video::S3DVertex(-0.5,-0.5,-0.5, -1,0,0, c, 1,1),
-				video::S3DVertex(-0.5,-0.5,+0.5, -1,0,0, c, 0,1),
-				video::S3DVertex(-0.5,+0.5,+0.5, -1,0,0, c, 0,0),
-				video::S3DVertex(-0.5,+0.5,-0.5, -1,0,0, c, 1,0),
-				// Back
-				video::S3DVertex(-0.5,-0.5,+0.5, 0,0,1, c, 1,1),
-				video::S3DVertex(+0.5,-0.5,+0.5, 0,0,1, c, 0,1),
-				video::S3DVertex(+0.5,+0.5,+0.5, 0,0,1, c, 0,0),
-				video::S3DVertex(-0.5,+0.5,+0.5, 0,0,1, c, 1,0),
-				// Front
-				video::S3DVertex(-0.5,-0.5,-0.5, 0,0,-1, c, 0,1),
-				video::S3DVertex(-0.5,+0.5,-0.5, 0,0,-1, c, 0,0),
-				video::S3DVertex(+0.5,+0.5,-0.5, 0,0,-1, c, 1,0),
-				video::S3DVertex(+0.5,-0.5,-0.5, 0,0,-1, c, 1,1),
-			};
-			
-			for(u32 i=0; i<24; ++i){
-				vertices[i].Pos *= BS;
-				vertices[i].Pos.Y *= m_prop->visual_size.Y;
-				vertices[i].Pos.X *= m_prop->visual_size.X;
-				vertices[i].Pos.Z *= m_prop->visual_size.X;
-			}
-
-			u16 indices[6] = {0,1,2,2,3,0};
-
-			scene::SMesh* mesh = new scene::SMesh();
-			for (u32 i=0; i<6; ++i)
-			{
-				scene::IMeshBuffer* buf = new scene::SMeshBuffer();
-				buf->append(vertices + 4 * i, 4, indices, 6);
-				buf->recalculateBoundingBox();
-				mesh->addMeshBuffer(buf);
-				buf->drop();
-			}
-			mesh->recalculateBoundingBox();
-		
+			scene::IMesh *mesh = createCubeMesh(v3f(BS,BS,BS));
 			m_meshnode = smgr->addMeshSceneNode(mesh, NULL);
+			mesh->drop();
 			
-			m_meshnode->setMesh(mesh);
 			m_meshnode->setScale(v3f(1));
 			// Will be shown when we know the brightness
 			m_meshnode->setVisible(false);
@@ -1863,15 +708,16 @@ class LuaEntityCAO : public ClientActiveObject
 
 	void updateLight(u8 light_at_pos)
 	{
+		bool is_visible = (m_hp != 0);
 		u8 li = decode_light(light_at_pos);
 		video::SColor color(255,li,li,li);
 		if(m_meshnode){
-			setMeshVerticesColor(m_meshnode->getMesh(), color);
-			m_meshnode->setVisible(true);
+			setMeshColor(m_meshnode->getMesh(), color);
+			m_meshnode->setVisible(is_visible);
 		}
 		if(m_spritenode){
 			m_spritenode->setColor(color);
-			m_spritenode->setVisible(true);
+			m_spritenode->setVisible(is_visible);
 		}
 	}
 
@@ -1930,6 +776,14 @@ class LuaEntityCAO : public ClientActiveObject
 		}
 
 		updateTexturePos();
+
+		if(m_reset_textures_timer >= 0){
+			m_reset_textures_timer -= dtime;
+			if(m_reset_textures_timer <= 0){
+				m_reset_textures_timer = -1;
+				updateTextures("");
+			}
+		}
 	}
 
 	void updateTexturePos()
@@ -1975,10 +829,8 @@ class LuaEntityCAO : public ClientActiveObject
 
 			float txs = m_tx_size.X;
 			float tys = m_tx_size.Y;
-			m_spritenode->setTCoords(0, v2f(txs*(1+col), tys*(1+row)));
-			m_spritenode->setTCoords(1, v2f(txs*(1+col), tys*(0+row)));
-			m_spritenode->setTCoords(2, v2f(txs*(0+col), tys*(0+row)));
-			m_spritenode->setTCoords(3, v2f(txs*(0+col), tys*(1+row)));
+			setBillboardTextureMatrix(m_spritenode,
+					txs, tys, col, row);
 		}
 	}
 
@@ -2025,7 +877,7 @@ class LuaEntityCAO : public ClientActiveObject
 		std::istringstream is(data, std::ios::binary);
 		// command
 		u8 cmd = readU8(is);
-		if(cmd == 0) // update position
+		if(cmd == LUAENTITY_CMD_UPDATE_POSITION) // update position
 		{
 			// do_interpolate
 			bool do_interpolate = readU8(is);
@@ -2050,12 +902,12 @@ class LuaEntityCAO : public ClientActiveObject
 			}
 			updateNodePos();
 		}
-		else if(cmd == 1) // set texture modification
+		else if(cmd == LUAENTITY_CMD_SET_TEXTURE_MOD) // set texture modification
 		{
 			std::string mod = deSerializeString(is);
 			updateTextures(mod);
 		}
-		else if(cmd == 2) // set sprite
+		else if(cmd == LUAENTITY_CMD_SET_SPRITE) // set sprite
 		{
 			v2s16 p = readV2S16(is);
 			int num_frames = readU16(is);
@@ -2069,6 +921,71 @@ class LuaEntityCAO : public ClientActiveObject
 
 			updateTexturePos();
 		}
+		else if(cmd == LUAENTITY_CMD_PUNCHED)
+		{
+			/*s16 damage =*/ readS16(is);
+			s16 result_hp = readS16(is);
+			
+			m_hp = result_hp;
+			// TODO: Execute defined fast response
+		}
+		else if(cmd == LUAENTITY_CMD_UPDATE_ARMOR_GROUPS)
+		{
+			m_armor_groups.clear();
+			int armor_groups_size = readU16(is);
+			for(int i=0; i<armor_groups_size; i++){
+				std::string name = deSerializeString(is);
+				int rating = readS16(is);
+				m_armor_groups[name] = rating;
+			}
+		}
+	}
+	
+	bool directReportPunch(v3f dir, const ItemStack *punchitem=NULL,
+			float time_from_last_punch=1000000)
+	{
+		assert(punchitem);
+		const ToolCapabilities *toolcap =
+				&punchitem->getToolCapabilities(m_gamedef->idef());
+		PunchDamageResult result = getPunchDamage(
+				m_armor_groups,
+				toolcap,
+				punchitem,
+				time_from_last_punch);
+		
+		if(result.did_punch && result.damage != 0)
+		{
+			if(result.damage < m_hp){
+				m_hp -= result.damage;
+			} else {
+				m_hp = 0;
+				// TODO: Execute defined fast response
+				// As there is no definition, make a smoke puff
+				ClientSimpleObject *simple = createSmokePuff(
+						m_smgr, m_env, m_position,
+						m_prop->visual_size * BS);
+				m_env->addSimpleObject(simple);
+			}
+			// TODO: Execute defined fast response
+			// Flashing shall suffice as there is no definition
+			updateTextures("^[brighten");
+			m_reset_textures_timer = 0.1;
+		}
+		
+		return false;
+	}
+	
+	std::string debugInfoText()
+	{
+		std::ostringstream os(std::ios::binary);
+		os<<"LuaEntityCAO hp="<<m_hp<<"\n";
+		os<<"armor={";
+		for(ItemGroupList::const_iterator i = m_armor_groups.begin();
+				i != m_armor_groups.end(); i++){
+			os<<i->first<<"="<<i->second<<", ";
+		}
+		os<<"}";
+		return os.str();
 	}
 };
 
@@ -2092,6 +1009,8 @@ class PlayerCAO : public ClientActiveObject
 	bool m_is_local_player;
 	LocalPlayer *m_local_player;
 	float m_damage_visual_timer;
+	bool m_dead;
+	float m_step_distance_counter;
 
 public:
 	PlayerCAO(IGameDef *gamedef, ClientEnvironment *env):
@@ -2103,7 +1022,9 @@ class PlayerCAO : public ClientActiveObject
 		m_yaw(0),
 		m_is_local_player(false),
 		m_local_player(NULL),
-		m_damage_visual_timer(0)
+		m_damage_visual_timer(0),
+		m_dead(false),
+		m_step_distance_counter(0)
 	{
 		if(gamedef == NULL)
 			ClientActiveObject::registerType(getType(), create);
@@ -2125,6 +1046,8 @@ class PlayerCAO : public ClientActiveObject
 		m_position = readV3F1000(is);
 		// yaw
 		m_yaw = readF1000(is);
+		// dead
+		m_dead = readU8(is);
 
 		pos_translator.init(m_position);
 
@@ -2154,6 +1077,8 @@ class PlayerCAO : public ClientActiveObject
 	{
 		if(m_is_local_player)
 			return NULL;
+		if(m_dead)
+			return NULL;
 		return &m_selection_box;
 	}
 	v3f getPosition()
@@ -2229,6 +1154,7 @@ class PlayerCAO : public ClientActiveObject
 		m_text->setPosition(v3f(0, (f32)BS*2.1, 0));
 		
 		updateTextures("");
+		updateVisibility();
 		updateNodePos();
 	}
 
@@ -2246,11 +1172,11 @@ class PlayerCAO : public ClientActiveObject
 		if(m_node == NULL)
 			return;
 		
-		m_node->setVisible(true);
-
 		u8 li = decode_light(light_at_pos);
 		video::SColor color(255,li,li,li);
-		setMeshVerticesColor(m_node->getMesh(), color);
+		setMeshColor(m_node->getMesh(), color);
+
+		updateVisibility();
 	}
 
 	v3s16 getLightPosition()
@@ -2258,6 +1184,14 @@ class PlayerCAO : public ClientActiveObject
 		return floatToInt(m_position+v3f(0,BS*1.5,0), BS);
 	}
 
+	void updateVisibility()
+	{
+		if(m_node == NULL)
+			return;
+
+		m_node->setVisible(!m_dead);
+	}
+
 	void updateNodePos()
 	{
 		if(m_node == NULL)
@@ -2272,8 +1206,30 @@ class PlayerCAO : public ClientActiveObject
 
 	void step(float dtime, ClientEnvironment *env)
 	{
+		v3f lastpos = pos_translator.vect_show;
 		pos_translator.translate(dtime);
+		float moved = lastpos.getDistanceFrom(pos_translator.vect_show);
+		updateVisibility();
 		updateNodePos();
+
+		if(m_damage_visual_timer > 0){
+			m_damage_visual_timer -= dtime;
+			if(m_damage_visual_timer <= 0){
+				updateTextures("");
+			}
+		}
+		
+		m_step_distance_counter += moved;
+		if(m_step_distance_counter > 1.5*BS){
+			m_step_distance_counter = 0;
+			if(!m_is_local_player){
+				INodeDefManager *ndef = m_gamedef->ndef();
+				v3s16 p = floatToInt(getPosition()+v3f(0,-0.5*BS, 0), BS);
+				MapNode n = m_env->getMap().getNodeNoEx(p);
+				SimpleSoundSpec spec = ndef->get(n).sound_footstep;
+				m_gamedef->sound()->playSoundAt(spec, false, getPosition());
+			}
+		}
 	}
 
 	void processMessage(const std::string &data)
@@ -2293,6 +1249,20 @@ class PlayerCAO : public ClientActiveObject
 
 			updateNodePos();
 		}
+		else if(cmd == 1) // punched
+		{
+			// damage
+			s16 damage = readS16(is);
+			m_damage_visual_timer = 0.05;
+			if(damage >= 2)
+				m_damage_visual_timer += 0.05 * damage;
+			updateTextures("^[brighten");
+		}
+		else if(cmd == 2) // died or respawned
+		{
+			m_dead = readU8(is);
+			updateVisibility();
+		}
 	}
 
 	void updateTextures(const std::string &mod)
@@ -2318,12 +1288,6 @@ class PlayerCAO : public ClientActiveObject
 			}
 		}
 	}
-	
-	bool directReportPunch(const std::string &toolname, v3f dir)
-	{
-		updateTextures("^[brighten");
-		return false;
-	}
 };
 
 // Prototype