Make nametags white again

est31 · est31 · commit 23984ef7f0c1 · 2015-05-18T21:11:41.000+02:00
Commit 11a96e4 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
@@ -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);
+			}
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -1716,10 +1716,12 @@ void GenericCAO::processMessage(const std::string &data)`
`1716`	`1716`	`m_armor_groups[name] = rating;`
`1717`	`1717`	`}`
`1718`	`1718`	`} else if (cmd == GENERIC_CMD_UPDATE_NAMETAG_ATTRIBUTES) {`
`1719`		`- //u8 version = readU8(is); // forward compatibility`
`1720`		`- m_nametag_color = readARGB8(is);`
`1721`		`- if (m_textnode != NULL) {`
`1722`		`- m_textnode->setTextColor(m_nametag_color);`
	`1719`	`+ u8 version = readU8(is); // forward compatibility`
	`1720`	`+ if (version == 1) {`Has conversations. Original line has conversations.
	`1721`	`+ m_nametag_color = readARGB8(is);`
	`1722`	`+ if (m_textnode != NULL) {`
	`1723`	`+ m_textnode->setTextColor(m_nametag_color);`
	`1724`	`+ }`
`1723`	`1725`	`}`
`1724`	`1726`	`}`
`1725`	`1727`	`}`