1 files changed, 86 insertions, 77 deletions

diff --git a/src/client/content_cao.cpp b/src/client/content_cao.cpp
index 36eb55597..be6608ab6 100644
--- a/src/client/content_cao.cpp
+++ b/src/client/content_cao.cpp
@@ -20,11 +20,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "content_cao.h"
 #include <IBillboardSceneNode.h>
 #include <ICameraSceneNode.h>
-#include <ITextSceneNode.h>
 #include <IMeshManipulator.h>
 #include <IAnimatedMeshSceneNode.h>
 #include "client/client.h"
-#include "client/renderingengine.h"
 #include "client/sound.h"
 #include "client/tile.h"
 #include "util/basic_macros.h"
@@ -190,7 +188,7 @@ public:
 
 	static ClientActiveObject* create(Client *client, ClientEnvironment *env);
 
-	void addToScene(ITextureSource *tsrc);
+	void addToScene(ITextureSource *tsrc, scene::ISceneManager *smgr);
 	void removeFromScene(bool permanent);
 	void updateLight(u32 day_night_ratio);
 	void updateNodePos();
@@ -221,7 +219,7 @@ ClientActiveObject* TestCAO::create(Client *client, ClientEnvironment *env)
 	return new TestCAO(client, env);
 }
 
-void TestCAO::addToScene(ITextureSource *tsrc)
+void TestCAO::addToScene(ITextureSource *tsrc, scene::ISceneManager *smgr)
 {
 	if(m_node != NULL)
 		return;
@@ -250,7 +248,7 @@ void TestCAO::addToScene(ITextureSource *tsrc)
 	// Add to mesh
 	mesh->addMeshBuffer(buf);
 	buf->drop();
-	m_node = RenderingEngine::get_scene_manager()->addMeshSceneNode(mesh, NULL);
+	m_node = smgr->addMeshSceneNode(mesh, NULL);
 	mesh->drop();
 	updateNodePos();
 }
@@ -595,9 +593,9 @@ void GenericCAO::removeFromScene(bool permanent)
 		m_client->getMinimap()->removeMarker(&m_marker);
 }
 
-void GenericCAO::addToScene(ITextureSource *tsrc)
+void GenericCAO::addToScene(ITextureSource *tsrc, scene::ISceneManager *smgr)
 {
-	m_smgr = RenderingEngine::get_scene_manager();
+	m_smgr = smgr;
 
 	if (getSceneNode() != NULL) {
 		return;
@@ -629,8 +627,7 @@ void GenericCAO::addToScene(ITextureSource *tsrc)
 	}
 
 	auto grabMatrixNode = [this] {
-		m_matrixnode = RenderingEngine::get_scene_manager()->
-				addDummyTransformationSceneNode();
+		m_matrixnode = m_smgr->addDummyTransformationSceneNode();
 		m_matrixnode->grab();
 	};
 
@@ -648,7 +645,7 @@ void GenericCAO::addToScene(ITextureSource *tsrc)
 
 	if (m_prop.visual == "sprite") {
 		grabMatrixNode();
-		m_spritenode = RenderingEngine::get_scene_manager()->addBillboardSceneNode(
+		m_spritenode = m_smgr->addBillboardSceneNode(
 				m_matrixnode, v2f(1, 1), v3f(0,0,0), -1);
 		m_spritenode->grab();
 		m_spritenode->setMaterialTexture(0,
@@ -733,8 +730,7 @@ void GenericCAO::addToScene(ITextureSource *tsrc)
 			mesh->addMeshBuffer(buf);
 			buf->drop();
 		}
-		m_meshnode = RenderingEngine::get_scene_manager()->
-			addMeshSceneNode(mesh, m_matrixnode);
+		m_meshnode = m_smgr->addMeshSceneNode(mesh, m_matrixnode);
 		m_meshnode->grab();
 		mesh->drop();
 		// Set it to use the materials of the meshbuffers directly.
@@ -743,8 +739,7 @@ void GenericCAO::addToScene(ITextureSource *tsrc)
 	} else if (m_prop.visual == "cube") {
 		grabMatrixNode();
 		scene::IMesh *mesh = createCubeMesh(v3f(BS,BS,BS));
-		m_meshnode = RenderingEngine::get_scene_manager()->
-			addMeshSceneNode(mesh, m_matrixnode);
+		m_meshnode = m_smgr->addMeshSceneNode(mesh, m_matrixnode);
 		m_meshnode->grab();
 		mesh->drop();
 
@@ -757,8 +752,7 @@ void GenericCAO::addToScene(ITextureSource *tsrc)
 		grabMatrixNode();
 		scene::IAnimatedMesh *mesh = m_client->getMesh(m_prop.mesh, true);
 		if (mesh) {
-			m_animated_meshnode = RenderingEngine::get_scene_manager()->
-				addAnimatedMeshSceneNode(mesh, m_matrixnode);
+			m_animated_meshnode = m_smgr->addAnimatedMeshSceneNode(mesh, m_matrixnode);
 			m_animated_meshnode->grab();
 			mesh->drop(); // The scene node took hold of it
 
@@ -799,8 +793,7 @@ void GenericCAO::addToScene(ITextureSource *tsrc)
 			infostream << "serialized form: " << m_prop.wield_item << std::endl;
 			item.deSerialize(m_prop.wield_item, m_client->idef());
 		}
-		m_wield_meshnode = new WieldMeshSceneNode(
-			RenderingEngine::get_scene_manager(), -1);
+		m_wield_meshnode = new WieldMeshSceneNode(m_smgr, -1);
 		m_wield_meshnode->setItem(item, m_client,
 			(m_prop.visual == "wielditem"));
 
@@ -828,16 +821,22 @@ void GenericCAO::addToScene(ITextureSource *tsrc)
 	updateAttachments();
 	setNodeLight(m_last_light);
 	updateMeshCulling();
+
+	if (m_client->modsLoaded())
+		m_client->getScript()->on_object_add(m_id);
+
+	if (m_client->modsLoaded())
+		m_client->getScript()->on_object_properties_change(m_id);
 }
 
 void GenericCAO::updateLight(u32 day_night_ratio)
-{		
+{
 	if (m_glow < 0)
 		return;
 
 	u8 light_at_pos = 0;
 	bool pos_ok = false;
-		
+
 	v3s16 pos[3];
 	u16 npos = getLightPosition(pos);
 	for (u16 i = 0; i < npos; i++) {
@@ -959,13 +958,14 @@ void GenericCAO::updateNametag()
 		// Add nametag
 		m_nametag = m_client->getCamera()->addNametag(node,
 			m_prop.nametag, m_prop.nametag_color,
-			m_prop.nametag_bgcolor, pos);
+			m_prop.nametag_bgcolor, pos, nametag_images);
 	} else {
 		// Update nametag
 		m_nametag->text = m_prop.nametag;
 		m_nametag->textcolor = m_prop.nametag_color;
 		m_nametag->bgcolor = m_prop.nametag_bgcolor;
 		m_nametag->pos = pos;
+		m_nametag->setImages(nametag_images);
 	}
 }
 
@@ -1082,7 +1082,7 @@ void GenericCAO::step(float dtime, ClientEnvironment *env)
 		}
 
 		removeFromScene(false);
-		addToScene(m_client->tsrc());
+		addToScene(m_client->tsrc(), m_smgr);
 
 		// Attachments, part 2: Now that the parent has been refreshed, put its attachments back
 		for (u16 cao_id : m_attachment_child_ids) {
@@ -1481,11 +1481,8 @@ void GenericCAO::updateAnimation()
 	if (m_animated_meshnode->getAnimationSpeed() != m_animation_speed)
 		m_animated_meshnode->setAnimationSpeed(m_animation_speed);
 	m_animated_meshnode->setTransitionTime(m_animation_blend);
-// Requires Irrlicht 1.8 or greater
-#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR >= 8) || IRRLICHT_VERSION_MAJOR > 1
 	if (m_animated_meshnode->getLoopMode() != m_animation_loop)
 		m_animated_meshnode->setLoopMode(m_animation_loop);
-#endif
 }
 
 void GenericCAO::updateAnimationSpeed()
@@ -1501,10 +1498,10 @@ void GenericCAO::updateBonePosition()
 	if (m_bone_position.empty() || !m_animated_meshnode)
 		return;
 
-	m_animated_meshnode->setJointMode(irr::scene::EJUOR_CONTROL); // To write positions to the mesh on render
+	m_animated_meshnode->setJointMode(scene::EJUOR_CONTROL); // To write positions to the mesh on render
 	for (auto &it : m_bone_position) {
 		std::string bone_name = it.first;
-		irr::scene::IBoneSceneNode* bone = m_animated_meshnode->getJointNode(bone_name.c_str());
+		scene::IBoneSceneNode* bone = m_animated_meshnode->getJointNode(bone_name.c_str());
 		if (bone) {
 			bone->setPosition(it.second.X);
 			bone->setRotation(it.second.Y);
@@ -1513,7 +1510,7 @@ void GenericCAO::updateBonePosition()
 
 	// search through bones to find mistakenly rotated bones due to bug in Irrlicht
 	for (u32 i = 0; i < m_animated_meshnode->getJointCount(); ++i) {
-		irr::scene::IBoneSceneNode *bone = m_animated_meshnode->getJointNode(i);
+		scene::IBoneSceneNode *bone = m_animated_meshnode->getJointNode(i);
 		if (!bone)
 			continue;
 
@@ -1629,6 +1626,57 @@ bool GenericCAO::visualExpiryRequired(const ObjectProperties &new_) const
 		(uses_legacy_texture && old.textures != new_.textures);
 }
 
+void GenericCAO::setProperties(ObjectProperties newprops)
+{
+	// Check what exactly changed
+	bool expire_visuals = visualExpiryRequired(newprops);
+	bool textures_changed = m_prop.textures != newprops.textures;
+
+	// Apply changes
+	m_prop = std::move(newprops);
+
+	m_selection_box = m_prop.selectionbox;
+	m_selection_box.MinEdge *= BS;
+	m_selection_box.MaxEdge *= BS;
+
+	m_tx_size.X = 1.0f / m_prop.spritediv.X;
+	m_tx_size.Y = 1.0f / m_prop.spritediv.Y;
+
+	if(!m_initial_tx_basepos_set){
+		m_initial_tx_basepos_set = true;
+		m_tx_basepos = m_prop.initial_sprite_basepos;
+	}
+	if (m_is_local_player) {
+		LocalPlayer *player = m_env->getLocalPlayer();
+		player->makes_footstep_sound = m_prop.makes_footstep_sound;
+		aabb3f collision_box = m_prop.collisionbox;
+		collision_box.MinEdge *= BS;
+		collision_box.MaxEdge *= BS;
+		player->setCollisionbox(collision_box);
+		player->setEyeHeight(m_prop.eye_height);
+		player->setZoomFOV(m_prop.zoom_fov);
+	}
+
+	if ((m_is_player && !m_is_local_player) && m_prop.nametag.empty())
+		m_prop.nametag = m_name;
+	if (m_is_local_player)
+		m_prop.show_on_minimap = false;
+
+	if (expire_visuals) {
+		expireVisuals();
+	} else {
+		infostream << "GenericCAO: properties updated but expiring visuals"
+			<< " not necessary" << std::endl;
+		if (textures_changed) {
+			// don't update while punch texture modifier is active
+			if (m_reset_textures_timer < 0)
+				updateTextures(m_current_texture_modifier);
+		}
+		updateNametag();
+		updateMarker();
+	}
+}
+
 void GenericCAO::processMessage(const std::string &data)
 {
 	//infostream<<"GenericCAO: Got message"<<std::endl;
@@ -1640,54 +1688,12 @@ void GenericCAO::processMessage(const std::string &data)
 		newprops.show_on_minimap = m_is_player; // default
 
 		newprops.deSerialize(is);
+		setProperties(newprops);
 
-		// Check what exactly changed
-		bool expire_visuals = visualExpiryRequired(newprops);
-		bool textures_changed = m_prop.textures != newprops.textures;
-
-		// Apply changes
-		m_prop = std::move(newprops);
-
-		m_selection_box = m_prop.selectionbox;
-		m_selection_box.MinEdge *= BS;
-		m_selection_box.MaxEdge *= BS;
-
-		m_tx_size.X = 1.0f / m_prop.spritediv.X;
-		m_tx_size.Y = 1.0f / m_prop.spritediv.Y;
+		// notify CSM
+		if (m_client->modsLoaded())
+			m_client->getScript()->on_object_properties_change(m_id);
 
-		if(!m_initial_tx_basepos_set){
-			m_initial_tx_basepos_set = true;
-			m_tx_basepos = m_prop.initial_sprite_basepos;
-		}
-		if (m_is_local_player) {
-			LocalPlayer *player = m_env->getLocalPlayer();
-			player->makes_footstep_sound = m_prop.makes_footstep_sound;
-			aabb3f collision_box = m_prop.collisionbox;
-			collision_box.MinEdge *= BS;
-			collision_box.MaxEdge *= BS;
-			player->setCollisionbox(collision_box);
-			player->setEyeHeight(m_prop.eye_height);
-			player->setZoomFOV(m_prop.zoom_fov);
-		}
-
-		if ((m_is_player && !m_is_local_player) && m_prop.nametag.empty())
-			m_prop.nametag = m_name;
-		if (m_is_local_player)
-			m_prop.show_on_minimap = false;
-
-		if (expire_visuals) {
-			expireVisuals();
-		} else {
-			infostream << "GenericCAO: properties updated but expiring visuals"
-				<< " not necessary" << std::endl;
-			if (textures_changed) {
-				// don't update while punch texture modifier is active
-				if (m_reset_textures_timer < 0)
-					updateTextures(m_current_texture_modifier);
-			}
-			updateNametag();
-			updateMarker();
-		}
 	} else if (cmd == AO_CMD_UPDATE_POSITION) {
 		// Not sent by the server if this object is an attachment.
 		// We might however get here if the server notices the object being detached before the client.
@@ -1752,10 +1758,10 @@ void GenericCAO::processMessage(const std::string &data)
 		if(m_is_local_player)
 		{
 			Client *client = m_env->getGameDef();
-			
+
 			if (client->modsLoaded() && client->getScript()->on_recieve_physics_override(override_speed, override_jump, override_gravity, sneak, sneak_glitch, new_move))
 				return;
-			
+
 			LocalPlayer *player = m_env->getLocalPlayer();
 			player->physics_override_speed = override_speed;
 			player->physics_override_jump = override_jump;
@@ -1851,6 +1857,9 @@ void GenericCAO::processMessage(const std::string &data)
 			// Same as 'ObjectRef::l_remove'
 			if (!m_is_player)
 				clearChildAttachments();
+		} else {
+			if (m_client->modsLoaded())
+				m_client->getScript()->on_object_hp_change(m_id);
 		}
 	} else if (cmd == AO_CMD_UPDATE_ARMOR_GROUPS) {
 		m_armor_groups.clear();
@@ -1946,7 +1955,7 @@ void GenericCAO::updateMeshCulling()
 		return;
 	}
 
-	irr::scene::ISceneNode *node = getSceneNode();
+	scene::ISceneNode *node = getSceneNode();
 	if (!node)
 		return;