luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-18 10:45:27 +02:00
Code Activity

Fix overloaded virtual warnings with get/setAttachment()

Browse Source
This commit is contained in:
sfan5
2020-11-10 21:22:02 +01:00
parent 8eb2cbac61
commit c441baa91b
2 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/client/content_cao.h
View File

@@ -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);