swg-source/src
1
0
Fork 0
mirror of https://github.com/SWG-Source/src.git synced 2026-09-21 08:12:50 -04:00
Code Issues Projects Releases Wiki Activity

Removed STLport requirement

Browse Source
This commit is contained in:
Anonymous
2014-01-23 00:16:13 -07:00
parent a9ac73d4e5
commit fac1f2c5ae
173 changed files with 454 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/application/CentralServer/src/CMakeLists.txt
-1
View File
@@ -190,6 +190,5 @@ target_link_libraries(CentralServer
localizationArchive
unicode
unicodeArchive
${STLPORT_LIBRARIES}
${CMAKE_DL_LIBS}
)
engine/server/application/CentralServer/src/shared/CentralServer.cpp
+2 -2
View File
@@ -3220,7 +3220,7 @@ void CentralServer::handleRequestGameServerForLoginMessage(const RequestGameServ
LOG(loginTrace, ("deferring RequestGameServerForLoginMessage(%s)", msg.getCharacterId().getValueString().c_str()));
DEBUG_REPORT_LOG(true, ("Starting planet server for login"));
startPlanetServer(getHostForScene(msg.getScene()), msg.getScene(), 0);
m_messagesWaitingForPlanetServer.push_back();
m_messagesWaitingForPlanetServer.push_back(Archive::ByteStream());
msg.pack(m_messagesWaitingForPlanetServer.back());
}
else
@@ -3243,7 +3243,7 @@ void CentralServer::handleRequestSceneTransfer(const RequestSceneTransfer &msg)
{
DEBUG_REPORT_LOG(true, ("Starting planet server for login"));
startPlanetServer(getHostForScene(msg.getSceneName()), msg.getSceneName(), 0);
m_messagesWaitingForPlanetServer.push_back();
m_messagesWaitingForPlanetServer.push_back(Archive::ByteStream());
msg.pack(m_messagesWaitingForPlanetServer.back());
}
}
engine/server/application/CentralServer/src/shared/CentralServer.h
+3 -3
View File
@@ -7,7 +7,7 @@
//-----------------------------------------------------------------------
#pragma warning(disable : 4100)
#include <hash_map>
#include <tr1/unordered_map>
#include <map>
#include <string>
#include <vector>
@@ -61,10 +61,10 @@ public:
private:
typedef std::vector<ConnectionServerConnection *> ConnectionServerConnectionList;
typedef std::map<NetworkId, CentralObject> CentralObjectMap;
typedef std::hash_multimap<SceneId, GameServerConnection *> SceneGameMap;
typedef std::tr1::unordered_multimap<SceneId, GameServerConnection *> SceneGameMap;
typedef std::pair<SceneGameMap::const_iterator, SceneGameMap::const_iterator> ServersList;
typedef std::hash_map<uint32, ConnectionServerConnection *> ConnectionServerSUIDMap;
typedef std::tr1::unordered_map<uint32, ConnectionServerConnection *> ConnectionServerSUIDMap;
typedef std::map<NetworkId, std::pair<SceneId, time_t> > PlayerSceneMapType;