Plantlike visual scale: Send sqrt(visual_scale) to old clients

[minetest.git] / src / content_cao.h

diff --git a/src/content_cao.h b/src/content_cao.h
index 19fecdde53558e7d4fcd0902866ae62a68d022f2..f30e90e21049f2359d13a8c34c27461e18326299 100644 (file)
--- a/src/content_cao.h
+++ b/src/content_cao.h
@@ -102,6 +102,8 @@ class GenericCAO : public ClientActiveObject
        float m_anim_timer;
        ItemGroupList m_armor_groups;
        float m_reset_textures_timer;
+       std::string m_previous_texture_modifier; // stores texture modifier before punch update
+       std::string m_current_texture_modifier;  // last applied texture modifier
        bool m_visuals_expired;
        float m_step_distance_counter;
        u8 m_last_light;
@@ -132,7 +134,7 @@ class GenericCAO : public ClientActiveObject
 
        bool getCollisionBox(aabb3f *toset) const;
 
-       bool collideWithObjects();
+       bool collideWithObjects() const;
 
        aabb3f *getSelectionBox();
 
@@ -198,7 +200,7 @@ class GenericCAO : public ClientActiveObject
 
        void updateTexturePos();
 
-       void updateTextures(const std::string &mod);
+       void updateTextures(const std::string mod);
 
        void updateAnimation();