diff options
| author | rubenwardy <rw@rubenwardy.com> | 2021-02-17 19:51:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-17 19:51:28 +0000 |
| commit | f85e9ab9254e2ae4ac13170f9edea00fb8d931a2 (patch) | |
| tree | 43fa19520c7f744f798de0ed8bcbb8e01c82e327 /src/client/content_cao.cpp | |
| parent | a8f6befd398cb8f962f3bb1fab092d6355bfe015 (diff) | |
| download | dragonfireclient-f85e9ab9254e2ae4ac13170f9edea00fb8d931a2.tar.xz | |
Add nametag background setting and object property (#10937)
Diffstat (limited to 'src/client/content_cao.cpp')
| -rw-r--r-- | src/client/content_cao.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/client/content_cao.cpp b/src/client/content_cao.cpp index c65977b44..97ae9afc4 100644 --- a/src/client/content_cao.cpp +++ b/src/client/content_cao.cpp @@ -934,7 +934,7 @@ void GenericCAO::updateNametag() if (m_is_local_player) // No nametag for local player return; - if (m_prop.nametag.empty()) { + if (m_prop.nametag.empty() || m_prop.nametag_color.getAlpha() == 0) { // Delete nametag if (m_nametag) { m_client->getCamera()->removeNametag(m_nametag); @@ -952,12 +952,14 @@ void GenericCAO::updateNametag() if (!m_nametag) { // Add nametag m_nametag = m_client->getCamera()->addNametag(node, - m_prop.nametag, m_prop.nametag_color, pos); + m_prop.nametag, m_prop.nametag_color, + m_prop.nametag_bgcolor, pos); } else { // Update nametag - m_nametag->nametag_text = m_prop.nametag; - m_nametag->nametag_color = m_prop.nametag_color; - m_nametag->nametag_pos = pos; + m_nametag->text = m_prop.nametag; + m_nametag->textcolor = m_prop.nametag_color; + m_nametag->bgcolor = m_prop.nametag_bgcolor; + m_nametag->pos = pos; } } |