summaryrefslogtreecommitdiff
path: root/src/client/content_cao.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/content_cao.h')
-rw-r--r--src/client/content_cao.h12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/client/content_cao.h b/src/client/content_cao.h
index 435fc2931..7c134fb48 100644
--- a/src/client/content_cao.h
+++ b/src/client/content_cao.h
@@ -111,6 +111,7 @@ private:
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;
@@ -126,7 +127,6 @@ private:
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;
@@ -218,15 +218,11 @@ public:
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);