Fix naming conventions of noise userdata

[minetest.git] / src / content_cao.h

diff --git a/src/content_cao.h b/src/content_cao.h
index 0b0e907c57ac7b8bcb060d654c0d95e16aade994..575aad24145f9adac48a4c1432f1bf96087417bf 100644 (file)
--- a/src/content_cao.h
+++ b/src/content_cao.h
@@ -83,8 +83,8 @@ class GenericCAO : public ClientActiveObject
        bool m_initial_tx_basepos_set = false;
        bool m_tx_select_horiz_by_yawpitch = false;
        v2s32 m_animation_range;
-       int m_animation_speed = 15;
-       int m_animation_blend = 0;
+       float m_animation_speed = 15.0f;
+       float m_animation_blend = 0.0f;
        bool m_animation_loop = true;
        // stores position and rotation for each bone name
        std::unordered_map<std::string, core::vector2d<v3f>> m_bone_position;
@@ -106,6 +106,7 @@ class GenericCAO : public ClientActiveObject
        float m_step_distance_counter = 0.0f;
        u8 m_last_light = 255;
        bool m_is_visible = false;
+       s8 m_glow = 0;
 
        std::vector<u16> m_children;
 
@@ -197,6 +198,8 @@ class GenericCAO : public ClientActiveObject
 
        void updateAnimation();
 
+       void updateAnimationSpeed();
+
        void updateBonePosition();
 
        void updateAttachments();