swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-07-31 01:15:48 -04:00
Code Issues Projects Releases Wiki Activity

make_pair was changed so that it receives by value instead of by ref since

Browse Source 
this code was written
This commit is contained in:
DarthArgus
2015-07-28 11:51:48 -05:00
parent ca7c8d7691
commit 8e79c68e29
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverDatabase/src/shared/Loader.cpp
+15
View File
@@ -320,6 +320,11 @@ void Loader::startLoadForServer(uint32 serverId)
locators->pop_front();
--m_numQueuedLocators;
delete regularLocator;
delete goldLocator;
regularLocator = NULL;
goldLocator = NULL;
}
snapshot->setLoadSerialNumber(++m_loadSerialNumber);
@@ -651,6 +656,11 @@ void Loader::requestChunk(uint32 processId,int nodeX, int nodeZ, const std::stri
if (ConfigServerDatabase::getEnableGoldDatabase())
goldLocator = new ChunkLocator(nodeX, nodeZ, sceneId, processId, false);
addLocatorsForServer(processId, regularLocator, goldLocator);
delete regularLocator;
delete goldLocator;
regularLocator = NULL;
goldLocator = NULL;
}
// ----------------------------------------------------------------------
@@ -931,6 +941,11 @@ void Loader::addLocatorsForServer(uint32 serverId, ObjectLocator * regularLocato
NON_NULL(i->second)->push_back(std::make_pair(regularLocator, goldLocator));
++m_numQueuedLocators;
delete regularLocator;
delete goldLocator;
regularLocator = NULL;
goldLocator = NULL;
}
// ----------------------------------------------------------------------