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 bb2fb06a7d02d7189860a436c0a454fcd83c4aa8..b49c64ae85bbc9afd8fa480dfcc6e191e09ef624 100644 (file)
--- 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);
+                       }
                }
        }
 }