swg-source/src
1
0
Fork 0
mirror of https://github.com/SWG-Source/src.git synced 2026-07-31 00:15:55 -04:00
Code Issues Projects Releases Wiki Activity

nevermind, still broken, dammit

Browse Source
This commit is contained in:
DarthArgus
2016-09-30 00:38:26 -05:00
parent e044e4dc83
commit 49f772b37b
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/application/CentralServer/src/shared/CentralServer.cpp
+18 -17
View File
@@ -1371,37 +1371,38 @@ void CentralServer::receiveMessage(const MessageDispatch::Emitter & source, cons
m_timeClusterWentIntoLoadingState = time(0);
}
// handle planet transfers and logins for planet server that aren't up yet
std::vector<Archive::ByteStream>::iterator t;
for(t = m_messagesWaitingForPlanetServer.begin(); t != m_messagesWaitingForPlanetServer.end();)
{
Archive::ReadIterator tri = t->begin();
const GameNetworkMessage gnm(tri);
tri = t->begin();
if(gnm.isType("RequestGameServerForLoginMessage"))
{
// handle planet transfers and logins for planet server that aren't up yet
std::vector<Archive::ByteStream>::iterator t;
for (t = m_messagesWaitingForPlanetServer.begin(); t != m_messagesWaitingForPlanetServer.end();) {
Archive::ReadIterator tri = t->begin();
const GameNetworkMessage gnm(tri);
const uint32 mt = gnm.getType();
tri = t->begin();
switch (mt) {
case constcrc("RequestGameServerForLoginMessage") : {
const RequestGameServerForLoginMessage loginMessage(tri);
if (loginMessage.getScene() == msg.getSceneId())
{
if (loginMessage.getScene() == msg.getSceneId()) {
t = m_messagesWaitingForPlanetServer.erase(t);
handleRequestGameServerForLoginMessage(loginMessage);
}
break;
}
else if(gnm.isType("RequestSceneTransfer"))
{
case constcrc("RequestSceneTransfer") : {
const RequestSceneTransfer sceneMessage(tri);
if (sceneMessage.getSceneName() == msg.getSceneId())
{
if (sceneMessage.getSceneName() == msg.getSceneId()) {
t = m_messagesWaitingForPlanetServer.erase(t);
handleRequestSceneTransfer(sceneMessage);
}
break;
}
else
{
default : {
t = m_messagesWaitingForPlanetServer.erase(t);
WARNING_STRICT_FATAL(true, ("Unknown message type waiting for planet server"));
break;
}
}
}
break;
}
case constcrc("RequestSceneTransfer") : {