summaryrefslogtreecommitdiff
path: root/src/content_sao.h
diff options
context:
space:
mode:
authorBlockMen <nmuelll@web.de>2015-11-20 23:46:33 +0100
committerBlockMen <nmuelll@web.de>2015-12-15 23:32:19 +0100
commit9eee3c3f465c071bb9908749cf48be3c131a1bdf (patch)
tree916b11e605c29b789db01d0c775dc0bc7c4c8983 /src/content_sao.h
parent19f73e4efc14622b4d020c9d373176cd7801e37f (diff)
downloadminetest-9eee3c3f465c071bb9908749cf48be3c131a1bdf.tar.gz
minetest-9eee3c3f465c071bb9908749cf48be3c131a1bdf.tar.bz2
minetest-9eee3c3f465c071bb9908749cf48be3c131a1bdf.zip
Add option to give every object a nametag
or change the nametag text of players
Diffstat (limited to 'src/content_sao.h')
-rw-r--r--src/content_sao.h11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/content_sao.h b/src/content_sao.h
index 1f0a68cd8..44d40d332 100644
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -91,13 +91,13 @@ private:
std::string m_init_state;
bool m_registered;
struct ObjectProperties m_prop;
-
+
s16 m_hp;
v3f m_velocity;
v3f m_acceleration;
float m_yaw;
ItemGroupList m_armor_groups;
-
+
bool m_properties_sent;
float m_last_sent_yaw;
v3f m_last_sent_position;
@@ -213,8 +213,6 @@ public:
std::set<int> getAttachmentChildIds();
ObjectProperties* accessObjectProperties();
void notifyObjectPropertiesModified();
- void setNametagColor(video::SColor color);
- video::SColor getNametagColor();
/*
Inventory interface
@@ -292,7 +290,7 @@ public:
private:
std::string getPropertyPacket();
-
+
Player *m_player;
u16 m_peer_id;
Inventory *m_inventory;
@@ -333,8 +331,6 @@ private:
v3f m_attachment_rotation;
bool m_attachment_sent;
- video::SColor m_nametag_color;
- bool m_nametag_sent;
public:
float m_physics_override_speed;
@@ -346,4 +342,3 @@ public:
};
#endif
-