From 18fb3c2f6c84e3242df27a8686da95658584f7a8 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 27 Aug 2015 21:31:57 +0000 Subject: name conflicts resolved git-svn-id: http://svn.miranda-ng.org/main/trunk@15050 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Xfire/src/clientloginpacket.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'protocols/Xfire/src/clientloginpacket.cpp') diff --git a/protocols/Xfire/src/clientloginpacket.cpp b/protocols/Xfire/src/clientloginpacket.cpp index 33e9fd9130..0cc211e13e 100644 --- a/protocols/Xfire/src/clientloginpacket.cpp +++ b/protocols/Xfire/src/clientloginpacket.cpp @@ -39,11 +39,11 @@ namespace xfirelib index = XFireUtils::addAttributName(packet, index, "name");/*add username attribute*/ packet[index] = 0x01; - packet[index + 1] = (char)name.length(); + packet[index + 1] = (char)m_name.length(); packet[index + 2] = 0x00; index += 3; - std::copy(name.begin(), name.end(), packet + index); - index += name.size(); + std::copy(m_name.begin(), m_name.end(), packet + index); + index += m_name.size(); /*Crypted Password*/ unsigned char pass[41]; @@ -75,7 +75,7 @@ namespace xfirelib packet[index++] = 0x0; } - length = index; + m_length = index; return index; } @@ -90,10 +90,10 @@ namespace xfirelib char temp[81]; CSHA1 sha1; - total = name + password + "UltimateArena"; + total = m_name + m_password + "UltimateArena"; hashSha1(total.c_str(), crypt); memcpy(temp, crypt, 40); - memcpy(temp + 40, salt->getValue(), 40); + memcpy(temp + 40, m_salt->getValue(), 40); temp[80] = 0x00; hashSha1(temp, crypt); -- cgit v1.2.3