pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-09-02 20:56:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Remove format lib all together it was a relic of spdlog anyway"

Browse Source 
This reverts commit 487dccfddd.
This commit is contained in:
KimLS
2016-09-11 21:43:42 -07:00
parent 487dccfddd
commit 2fd439dd0b
9 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ucs/CMakeLists.txt
+1 -1
View File
@@ -23,7 +23,7 @@ INSTALL(TARGETS ucs RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
ADD_DEFINITIONS(-DUCS)
TARGET_LINK_LIBRARIES(ucs common debug ${MySQL_LIBRARY_DEBUG} optimized ${MySQL_LIBRARY_RELEASE} ${ZLIB_LIBRARY} libuv)
TARGET_LINK_LIBRARIES(ucs common debug ${MySQL_LIBRARY_DEBUG} optimized ${MySQL_LIBRARY_RELEASE} ${ZLIB_LIBRARY} libuv fmt)
IF(WIN32)
TARGET_LINK_LIBRARIES(ucs "ws2_32" "psapi" "iphlpapi" "userenv")
ucs/clientlist.cpp
+3 -2
View File
@@ -2114,7 +2114,7 @@ Client *Clientlist::IsCharacterOnline(std::string CharacterName) {
void Clientlist::HandleNewConnection(std::shared_ptr<EQ::Net::EQStream> connection)
{
Log.Out(Logs::Detail, Logs::UCS_Server, "New Client UDP connection from %s:%d", connection->RemoteEndpoint().c_str(), connection->RemotePort());
Log.OutF(Logs::Detail, Logs::UCS_Server, "New Client UDP connection from {0}:{1}", connection->RemoteEndpoint(), connection->RemotePort());
Client *c = new Client(connection);
ClientChatConnections.push_back(std::unique_ptr<Client>(c));
}
@@ -2122,7 +2122,7 @@ void Clientlist::HandleNewConnection(std::shared_ptr<EQ::Net::EQStream> connecti
void Clientlist::HandleConnectionChange(std::shared_ptr<EQ::Net::EQStream> connection, EQ::Net::DbProtocolStatus old_status, EQ::Net::DbProtocolStatus new_status)
{
if (new_status == EQ::Net::DbProtocolStatus::StatusDisconnected) {
Log.Out(Logs::Detail, Logs::UCS_Server, "Client connection from %s:%d closed.", connection->RemoteEndpoint().c_str(), connection->RemotePort());
Log.OutF(Logs::Detail, Logs::UCS_Server, "Client connection from {0}:{1} closed.", connection->RemoteEndpoint(), connection->RemotePort());
auto iter = ClientChatConnections.begin();
while (iter != ClientChatConnections.end()) {
if ((*iter)->ClientStream == connection) {
@@ -2139,6 +2139,7 @@ void Clientlist::HandlePacket(std::shared_ptr<EQ::Net::EQStream> connection, Emu
auto iter = ClientChatConnections.begin();
while (iter != ClientChatConnections.end()) {
if ((*iter)->ClientStream == connection) {
Log.OutF(Logs::General, Logs::UCS_Server, "{0}", p.ToString());
EQApplicationPacket app(opcode, (unsigned char*)p.Data(), (uint32)p.Length());
Process((*iter).get(), &app);
return;