From: est31 <MTest31@outlook.com>
Date: Thu, 21 May 2015 16:58:39 +0000 (+0200)
Subject: Don't ignore nametag attribute change message for newer versions
X-Git-Tag: 0.4.13~242
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9facb40738e7c51c838ad2ccffd96028862160cb;p=oweals%2Fminetest.git

Don't ignore nametag attribute change message for newer versions

This allows newer versions to add additional information that isn't
read by us, but still in a backwards compatible manner.
---

diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index d80804d4a..9ee81e63f 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -1716,17 +1716,15 @@ void GenericCAO::processMessage(const std::string &data)
 			m_armor_groups[name] = rating;
 		}
 	} else if (cmd == GENERIC_CMD_UPDATE_NAMETAG_ATTRIBUTES) {
-		u8 version = readU8(is); // forward compatibility
-		if (version == 1) {
-			m_nametag_color = readARGB8(is);
-			if (m_textnode != NULL) {
-				m_textnode->setTextColor(m_nametag_color);
-
-				// Enforce hiding nametag,
-				// because if freetype is enabled, a grey
-				// shadow can remain.
-				m_textnode->setVisible(m_nametag_color.getAlpha() > 0);
-			}
+		readU8(is); // version
+		m_nametag_color = readARGB8(is);
+		if (m_textnode != NULL) {
+			m_textnode->setTextColor(m_nametag_color);
+
+			// Enforce hiding nametag,
+			// because if freetype is enabled, a grey
+			// shadow can remain.
+			m_textnode->setVisible(m_nametag_color.getAlpha() > 0);
 		}
 	}
 }