shader.cpp: don't test twice if shader programs are present

[minetest.git] / src / content_cao.h

diff --git a/src/content_cao.h b/src/content_cao.h
index 36245bd3b0cfa74e2bed8aea9fac1a610889c171..abb242aa4d5906e3a6654f3b189cd1d47bc1085d 100644 (file)
--- a/src/content_cao.h
+++ b/src/content_cao.h
@@ -60,7 +60,6 @@ class GenericCAO : public ClientActiveObject
        std::string m_name;
        bool m_is_player;
        bool m_is_local_player;
-       int m_id;
        // Property-ish things
        ObjectProperties m_prop;
        //
@@ -71,7 +70,6 @@ class GenericCAO : public ClientActiveObject
        scene::IAnimatedMeshSceneNode *m_animated_meshnode;
        WieldMeshSceneNode *m_wield_meshnode;
        scene::IBillboardSceneNode *m_spritenode;
-       video::SColor m_nametag_color;
        scene::ITextSceneNode* m_textnode;
        v3f m_position;
        v3f m_velocity;
@@ -87,6 +85,7 @@ class GenericCAO : public ClientActiveObject
        v2s32 m_animation_range;
        int m_animation_speed;
        int m_animation_blend;
+       bool m_animation_loop;
        std::map<std::string, core::vector2d<v3f> > m_bone_position; // stores position and rotation for each bone name
        std::string m_attachment_bone;
        v3f m_attachment_position;
@@ -162,6 +161,8 @@ class GenericCAO : public ClientActiveObject
                m_is_visible = toset;
        }
 
+       void setChildrenVisible(bool toset);
+
        void setAttachments();
 
        void removeFromScene(bool permanent);
@@ -176,6 +177,8 @@ class GenericCAO : public ClientActiveObject
 
        void updateLight(u8 light_at_pos);
 
+       void updateLightNoCheck(u8 light_at_pos);
+
        v3s16 getLightPosition();
 
        void updateNodePos();
@@ -198,6 +201,11 @@ class GenericCAO : public ClientActiveObject
                        float time_from_last_punch=1000000);
 
        std::string debugInfoText();
+       
+       std::string infoText()
+       {
+               return m_prop.infotext;
+       }
 };