From: est31 <MTest31@outlook.com>
Date: Mon, 18 May 2015 19:01:57 +0000 (+0200)
Subject: Make nametags white again
X-Git-Tag: 0.4.13~251
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=23984ef7f0c13f6ae011587ba0488b9ea1bb64f8;p=oweals%2Fminetest.git

Make nametags white again

Commit 11a96e4901ce54c4646e47866f7a66cd9034c16b
commented out version parsing, resulting in the version byte being parsed as part of the color,
making nametags dark grey.
Re-introduces version parsing and ignores the packet if the version is more recent than ours,
fixing the unused variable warning (should have been done anyway).
---

diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index bb2fb06a7..b49c64ae8 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -1716,10 +1716,12 @@ 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
-		m_nametag_color = readARGB8(is);
-		if (m_textnode != NULL) {
-			m_textnode->setTextColor(m_nametag_color);
+		u8 version = readU8(is); // forward compatibility
+		if (version == 1) {
+			m_nametag_color = readARGB8(is);
+			if (m_textnode != NULL) {
+				m_textnode->setTextColor(m_nametag_color);
+			}
 		}
 	}
 }