X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;ds=inline;f=src%2Fclient%2Fcontent_cao.h;h=8e5d04bfac2e572857ee0710e0d08a9d43aef44b;hb=21df26984da91143c15587f5a03c98d68c3adc4e;hp=783aa41999b2c86d608ed42c32000a277eff5d7f;hpb=eabf05758e3ba5f6f4bb1b8d1d1f02179b84e410;p=dragonfireclient.git

diff --git a/src/client/content_cao.h b/src/client/content_cao.h
index 783aa4199..8e5d04bfa 100644
--- a/src/client/content_cao.h
+++ b/src/client/content_cao.h
@@ -172,6 +172,21 @@ class GenericCAO : public ClientActiveObject
 
 	inline const v3f &getRotation() const { return m_rotation; }
 
+	inline const v3f getAcceleration() const
+	{
+		return m_acceleration;
+	}
+
+	inline const v3f getVelocity() const
+	{
+		return m_velocity;
+	}
+
+	inline u16 getHp() const
+	{
+		return m_hp;
+	}
+
 	bool isImmortal() const;
 
 	inline const ObjectProperties &getProperties() const { return m_prop; }
@@ -210,6 +225,16 @@ class GenericCAO : public ClientActiveObject
 		return m_is_local_player;
 	}
 
+	inline std::string getName() const
+	{
+		return m_name;
+	}
+
+	inline bool isPlayer() const
+	{
+		return m_is_player;
+	}
+
 	inline bool isVisible() const
 	{
 		return m_is_visible;
@@ -230,6 +255,7 @@ class GenericCAO : public ClientActiveObject
 	void addAttachmentChild(int child_id);
 	void removeAttachmentChild(int child_id);
 	ClientActiveObject *getParent() const;
+	int getParentId() const { return m_attachment_parent_id; }
 	const std::unordered_set<int> &getAttachmentChildIds() const
 	{ return m_attachment_child_ids; }
 	void updateAttachments();
@@ -284,5 +310,16 @@ class GenericCAO : public ClientActiveObject
 		return m_prop.infotext;
 	}
 
+	float m_waiting_for_reattach;
+
+	ObjectProperties *getProperties()
+	{
+		return &m_prop;
+	}
+
+	void setProperties(ObjectProperties newprops);
+
 	void updateMeshCulling();
+
+	std::vector<std::string> nametag_images = {};
 };