Remove unused ITextSceneNode header (#11476)

[dragonfireclient.git] / src / client / content_cao.h

diff --git a/src/client/content_cao.h b/src/client/content_cao.h
index daf69776797c932ecb391a2b383df5eb1ce84357..4bbba91342a5d7506fece1e878d56629f704ee72 100644 (file)
--- a/src/client/content_cao.h
+++ b/src/client/content_cao.h
@@ -30,6 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 class Camera;
 class Client;
 struct Nametag;
+struct MinimapMarker;
 
 /*
        SmoothTranslator
@@ -84,6 +85,7 @@ class GenericCAO : public ClientActiveObject
        scene::IBillboardSceneNode *m_spritenode = nullptr;
        scene::IDummyTransformationSceneNode *m_matrixnode = nullptr;
        Nametag *m_nametag = nullptr;
+       MinimapMarker *m_marker = nullptr;
        v3f m_position = v3f(0.0f, 10.0f * BS, 0);
        v3f m_velocity;
        v3f m_acceleration;
@@ -109,6 +111,7 @@ class GenericCAO : public ClientActiveObject
        v3f m_attachment_position;
        v3f m_attachment_rotation;
        bool m_attached_to_local = false;
+       bool m_force_visible = false;
 
        int m_anim_frame = 0;
        int m_anim_num_frames = 1;
@@ -124,7 +127,6 @@ class GenericCAO : public ClientActiveObject
        float m_step_distance_counter = 0.0f;
        u8 m_last_light = 255;
        bool m_is_visible = false;
-       bool m_force_visible = false;
        s8 m_glow = 0;
        // Material
        video::E_MATERIAL_TYPE m_material_type;
@@ -172,6 +174,8 @@ class GenericCAO : public ClientActiveObject
 
        const bool isImmortal();
 
+       inline const ObjectProperties &getProperties() const { return m_prop; }
+
        scene::ISceneNode *getSceneNode() const;
 
        scene::IAnimatedMeshSceneNode *getAnimatedMeshSceneNode() const;
@@ -216,15 +220,11 @@ class GenericCAO : public ClientActiveObject
                m_is_visible = toset;
        }
 
-       inline bool isForcedVisible() const
-       {
-               return m_force_visible;
-       }
-
        void setChildrenVisible(bool toset);
-       void setAttachment(int parent_id, const std::string &bone, v3f position, v3f rotation);
+       void setAttachment(int parent_id, const std::string &bone, v3f position,
+                       v3f rotation, bool force_visible);
        void getAttachment(int *parent_id, std::string *bone, v3f *position,
-                       v3f *rotation) const;
+                       v3f *rotation, bool *force_visible) const;
        void clearChildAttachments();
        void clearParentAttachment();
        void addAttachmentChild(int child_id);
@@ -236,7 +236,7 @@ class GenericCAO : public ClientActiveObject
 
        void removeFromScene(bool permanent);
 
-       void addToScene(ITextureSource *tsrc);
+       void addToScene(ITextureSource *tsrc, scene::ISceneManager *smgr);
 
        inline void expireVisuals()
        {
@@ -254,6 +254,8 @@ class GenericCAO : public ClientActiveObject
 
        void updateNametag();
 
+       void updateMarker();
+
        void updateNodePos();
 
        void step(float dtime, ClientEnvironment *env);