diff options
| author | BlockMen <nmuelll@web.de> | 2015-11-20 23:46:33 +0100 |
|---|---|---|
| committer | BlockMen <nmuelll@web.de> | 2015-12-15 23:32:19 +0100 |
| commit | 9eee3c3f465c071bb9908749cf48be3c131a1bdf (patch) | |
| tree | 916b11e605c29b789db01d0c775dc0bc7c4c8983 /src/object_properties.cpp | |
| parent | 19f73e4efc14622b4d020c9d373176cd7801e37f (diff) | |
| download | minetest-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/object_properties.cpp')
| -rw-r--r-- | src/object_properties.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/object_properties.cpp b/src/object_properties.cpp index dc1eddf4e..3cec51672 100644 --- a/src/object_properties.cpp +++ b/src/object_properties.cpp @@ -43,7 +43,9 @@ ObjectProperties::ObjectProperties(): stepheight(0), automatic_face_movement_dir(false), automatic_face_movement_dir_offset(0.0), - backface_culling(true) + backface_culling(true), + nametag(""), + nametag_color(255, 255, 255, 255) { textures.push_back("unknown_object.png"); colors.push_back(video::SColor(255,255,255,255)); @@ -76,6 +78,9 @@ std::string ObjectProperties::dump() os<<", makes_footstep_sound="<<makes_footstep_sound; os<<", automatic_rotate="<<automatic_rotate; os<<", backface_culling="<<backface_culling; + os << ", nametag=" << nametag; + os << ", nametag_color=" << "\"" << nametag_color.getAlpha() << "," << nametag_color.getRed() + << "," << nametag_color.getGreen() << "," << nametag_color.getBlue() << "\" "; return os.str(); } @@ -109,6 +114,8 @@ void ObjectProperties::serialize(std::ostream &os) const writeU8(os, automatic_face_movement_dir); writeF1000(os, automatic_face_movement_dir_offset); writeU8(os, backface_culling); + os << serializeString(nametag); + writeARGB8(os, nametag_color); // Add stuff only at the bottom. // Never remove anything, because we don't want new versions of this } @@ -146,6 +153,8 @@ void ObjectProperties::deSerialize(std::istream &is) automatic_face_movement_dir = readU8(is); automatic_face_movement_dir_offset = readF1000(is); backface_culling = readU8(is); + nametag = deSerializeString(is); + nametag_color = readARGB8(is); }catch(SerializationError &e){} } else |