Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 06:58:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

don't attempt to go to user without domain AND position

Browse source
This commit is contained in:
Stephen Birarda 2013-10-10 16:48:26 -07:00
parent 081f2da785
commit 2c181011b3
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
interface/src/DataServerClient.cpp
View file

@ -148,16 +148,18 @@ void DataServerClient::processSendFromDataServer(unsigned char* packetData, int
} }
} }
} }
} else if (keyList[i] == DataServerKey::Domain) { } else if (keyList[i] == DataServerKey::Domain && keyList[i + 1] == DataServerKey::Position
qDebug() << "Changing domain hostname to" << valueList[i].toLocal8Bit().constData() << && valueList[i] != " " && valueList[i + 1] != " ") {
"to go to" << userString << "\n";
NodeList::getInstance()->setDomainHostname(valueList[i]); QStringList coordinateItems = valueList[i + 1].split(',');
} else if (keyList[i] == DataServerKey::Position) {
QStringList coordinateItems = valueList[i].split(',');
if (coordinateItems.size() == 3) { if (coordinateItems.size() == 3) {
qDebug() << "Changing position to" << valueList[i].toLocal8Bit().constData() <<
"to go to" << userString << "\n"; qDebug() << "Changing domain to" << valueList[i].toLocal8Bit().constData() <<
"and position to" << valueList[i + 1].toLocal8Bit().constData() <<
"to go to" << userString << "\n";
NodeList::getInstance()->setDomainHostname(valueList[i]);
glm::vec3 newPosition(coordinateItems[0].toFloat(), glm::vec3 newPosition(coordinateItems[0].toFloat(),
coordinateItems[1].toFloat(), coordinateItems[1].toFloat(),
@ -165,7 +167,6 @@ void DataServerClient::processSendFromDataServer(unsigned char* packetData, int
Application::getInstance()->getAvatar()->setPosition(newPosition); Application::getInstance()->getAvatar()->setPosition(newPosition);
} }
} else if (keyList[i] == DataServerKey::UUID) { } else if (keyList[i] == DataServerKey::UUID) {
// this is the user's UUID - set it on the profile // this is the user's UUID - set it on the profile
Application::getInstance()->getProfile()->setUUID(valueList[0]); Application::getInstance()->getProfile()->setUUID(valueList[0]);