Fix lava damage on player's upper body

[minetest.git] / src / content_cao.cpp

diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 8bec67c8c46dcd10aa99eab01bcf16fc6f5afba9..f79d0d6f62c78d63467b4b75180d6687aae33809 100644 (file)
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -864,7 +864,7 @@ class GenericCAO : public ClientActiveObject
                        m_spritenode = smgr->addBillboardSceneNode(
                                        NULL, v2f(1, 1), v3f(0,0,0), -1);
                        m_spritenode->setMaterialTexture(0,
-                                       tsrc->getTextureRaw("unknown_block.png"));
+                                       tsrc->getTextureRaw("unknown_node.png"));
                        m_spritenode->setMaterialFlag(video::EMF_LIGHTING, false);
                        m_spritenode->setMaterialFlag(video::EMF_BILINEAR_FILTER, false);
                        m_spritenode->setMaterialType(video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF);
@@ -1152,7 +1152,7 @@ class GenericCAO : public ClientActiveObject
                                v3f p_acceleration = m_acceleration;
                                moveresult = collisionMoveSimple(env,env->getGameDef(),
                                                pos_max_d, box, stepheight, dtime,
-                                               p_pos, p_velocity, p_acceleration);
+                                               p_pos, p_velocity, p_acceleration,this);
                                // Apply results
                                m_position = p_pos;
                                m_velocity = p_velocity;
@@ -1268,7 +1268,7 @@ class GenericCAO : public ClientActiveObject
                {
                        if(m_prop.visual == "sprite")
                        {
-                               std::string texturestring = "unknown_block.png";
+                               std::string texturestring = "unknown_node.png";
                                if(m_prop.textures.size() >= 1)
                                        texturestring = m_prop.textures[0];
                                texturestring += mod;
@@ -1334,7 +1334,7 @@ class GenericCAO : public ClientActiveObject
                        {
                                for (u32 i = 0; i < 6; ++i)
                                {
-                                       std::string texturestring = "unknown_block.png";
+                                       std::string texturestring = "unknown_node.png";
                                        if(m_prop.textures.size() > i)
                                                texturestring = m_prop.textures[i];
                                        texturestring += mod;