sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing compiler errors.

Browse Source
This commit is contained in:
lotodore
2009-04-05 11:34:40 +00:00
parent 009249e41a
commit 59a6b35dd1
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/clientstate.cpp
+4 -3
View File
@@ -472,8 +472,8 @@ ClientStateReadingServerList::Process(ClientThread &client)
// IPv6 support for avatar servers depends on this address and on libcurl.
const TiXmlNode *avatarNode = nextServer->FirstChild("AvatarServerAddress");
if (!nameNode || !nameNode->ToElement() || !addrNode || !addr4Node->ToElement()
|| !addr6Node->ToElement() || !portNode || !portNode->ToElement())
if (!nameNode || !nameNode->ToElement() || !addr4Node || !addr4Node->ToElement()
|| !addr6Node || !addr6Node->ToElement() || !portNode || !portNode->ToElement())
throw ClientException(__FILE__, __LINE__, ERR_SOCK_INVALID_SERVERLIST_XML, 0);
serverInfo.name = nameNode->ToElement()->Attribute("value");
@@ -489,7 +489,8 @@ ClientStateReadingServerList::Process(ClientThread &client)
if (sctpNode && sctpNode->ToElement())
{
int tmpSctp;
sctpNode->ToElement()->QueryIntAttribute
sctpNode->ToElement()->QueryIntAttribute("value", &tmpSctp);
serverInfo.supportsSctp = tmpSctp == 1 ? true : false;
}
if (avatarNode && avatarNode->ToElement())
serverInfo.avatarServerAddr = avatarNode->ToElement()->Attribute("value");
src/net/common/clientthread.cpp
+1 -1
View File
@@ -978,7 +978,7 @@ ClientThread::ClearServerInfoMap()
void
ClientThread::UseServer(unsigned serverId)
{
ClientContext &context = client.GetContext();
ClientContext &context = GetContext();
ServerInfo useInfo(GetServerInfo(serverId));
if (context.GetAddrFamily() == AF_INET6)