Tooltips: Unify the tooltip[] and list[] description tooltip display functions (...

[oweals/minetest.git] / src / content_cao.cpp

diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index d18a0233f14b7e9657b695033623cc8884992c90..d15c53e7a36185ed60f53dc00b3c11dbe5a316e9 100644 (file)
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -44,6 +44,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "camera.h" // CameraModes
 #include "wieldmesh.h"
 #include "log.h"
+#include <algorithm>
 
 class Settings;
 struct ToolCapabilities;
@@ -705,26 +706,11 @@ scene::ISceneNode* GenericCAO::getSceneNode()
        return NULL;
 }
 
-scene::IMeshSceneNode* GenericCAO::getMeshSceneNode()
-{
-       return m_meshnode;
-}
-
 scene::IAnimatedMeshSceneNode* GenericCAO::getAnimatedMeshSceneNode()
 {
        return m_animated_meshnode;
 }
 
-WieldMeshSceneNode* GenericCAO::getWieldMeshSceneNode()
-{
-       return m_wield_meshnode;
-}
-
-scene::IBillboardSceneNode* GenericCAO::getSpriteSceneNode()
-{
-       return m_spritenode;
-}
-
 void GenericCAO::setChildrenVisible(bool toset)
 {
        for (std::vector<u16>::size_type i = 0; i < m_children.size(); i++) {
@@ -1585,13 +1571,7 @@ void GenericCAO::processMessage(const std::string &data)
                }
                if (m_is_local_player) {
                        LocalPlayer *player = m_env->getLocalPlayer();
-
                        player->makes_footstep_sound = m_prop.makes_footstep_sound;
-
-                       aabb3f collisionbox = m_selection_box;
-                       collisionbox.MinEdge += v3f(0, BS, 0);
-                       collisionbox.MaxEdge += v3f(0, BS, 0);
-                       player->setCollisionbox(collisionbox);
                }
 
                if ((m_is_player && !m_is_local_player) && m_prop.nametag == "")
@@ -1755,7 +1735,7 @@ void GenericCAO::processMessage(const std::string &data)
                                                m_smgr, m_env, m_position,
                                                m_prop.visual_size * BS);
                                m_env->addSimpleObject(simple);
-                       } else {
+                       } else if (m_reset_textures_timer < 0) {
                                // TODO: Execute defined fast response
                                // Flashing shall suffice as there is no definition
                                m_reset_textures_timer = 0.05;
@@ -1826,10 +1806,12 @@ bool GenericCAO::directReportPunch(v3f dir, const ItemStack *punchitem,
                }
                // TODO: Execute defined fast response
                // Flashing shall suffice as there is no definition
-               m_reset_textures_timer = 0.05;
-               if(result.damage >= 2)
-                       m_reset_textures_timer += 0.05 * result.damage;
-               updateTextures(m_current_texture_modifier + "^[brighten");
+               if (m_reset_textures_timer < 0) {
+                       m_reset_textures_timer = 0.05;
+                       if (result.damage >= 2)
+                               m_reset_textures_timer += 0.05 * result.damage;
+                       updateTextures(m_current_texture_modifier + "^[brighten");
+               }
        }
 
        return false;