diff options
| author | oy <Tom_Adams@web.de> | 2011-03-16 12:37:41 +0100 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-03-16 12:37:41 +0100 |
| commit | 7412fabb9c74264010cd4ee43b2efddd326cafea (patch) | |
| tree | cba2ee9d9fa5ba5d7c57981d4bcf116dab7ec953 /src/engine | |
| parent | 156e23b5923af300595704bb4fe6999deb4871a8 (diff) | |
| download | zcatch-7412fabb9c74264010cd4ee43b2efddd326cafea.tar.gz zcatch-7412fabb9c74264010cd4ee43b2efddd326cafea.zip | |
made serverinfo use clan name and country code for players
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/client/client.cpp | 2 | ||||
| -rw-r--r-- | src/engine/client/srvbrowse.h | 1 | ||||
| -rw-r--r-- | src/engine/server/server.cpp | 4 | ||||
| -rw-r--r-- | src/engine/serverbrowser.h | 8 |
4 files changed, 11 insertions, 4 deletions
diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp index 1c0a3a01..6d228811 100644 --- a/src/engine/client/client.cpp +++ b/src/engine/client/client.cpp @@ -1108,6 +1108,8 @@ void CClient::ProcessPacket(CNetChunk *pPacket) for(int i = 0; i < Info.m_NumPlayers; i++) { str_copy(Info.m_aPlayers[i].m_aName, Up.GetString(CUnpacker::SANITIZE_CC|CUnpacker::SKIP_START_WHITESPACES), sizeof(Info.m_aPlayers[i].m_aName)); + str_copy(Info.m_aPlayers[i].m_aClan, Up.GetString(CUnpacker::SANITIZE_CC|CUnpacker::SKIP_START_WHITESPACES), sizeof(Info.m_aPlayers[i].m_aClan)); + Info.m_aPlayers[i].m_Country = str_toint(Up.GetString()); Info.m_aPlayers[i].m_Score = str_toint(Up.GetString()); } diff --git a/src/engine/client/srvbrowse.h b/src/engine/client/srvbrowse.h index 0e06fc22..43bd1807 100644 --- a/src/engine/client/srvbrowse.h +++ b/src/engine/client/srvbrowse.h @@ -92,7 +92,6 @@ private: bool SortCompareMap(int Index1, int Index2) const; bool SortComparePing(int Index1, int Index2) const; bool SortCompareGametype(int Index1, int Index2) const; - bool SortCompareProgression(int Index1, int Index2) const; bool SortCompareNumPlayers(int Index1, int Index2) const; // diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp index fcc141bb..e2408a10 100644 --- a/src/engine/server/server.cpp +++ b/src/engine/server/server.cpp @@ -945,7 +945,9 @@ void CServer::SendServerInfo(NETADDR *pAddr, int Token) { if(m_aClients[i].m_State != CClient::STATE_EMPTY) { - p.AddString(ClientName(i), 48); // player name + p.AddString(ClientName(i), MAX_NAME_LENGTH); // player name + p.AddString(ClientClan(i), MAX_CLAN_LENGTH); // player clan + str_format(aBuf, sizeof(aBuf), "%d", m_aClients[i].m_Country); p.AddString(aBuf, 6); // player country str_format(aBuf, sizeof(aBuf), "%d", m_aClients[i].m_Score); p.AddString(aBuf, 6); // player score } } diff --git a/src/engine/serverbrowser.h b/src/engine/serverbrowser.h index ff83714d..56d808f9 100644 --- a/src/engine/serverbrowser.h +++ b/src/engine/serverbrowser.h @@ -3,6 +3,8 @@ #ifndef ENGINE_SERVERBROWSER_H #define ENGINE_SERVERBROWSER_H +#include <engine/shared/protocol.h> + #include "kernel.h" /* @@ -17,7 +19,9 @@ public: class CPlayer { public: - char m_aName[48]; + char m_aName[MAX_NAME_LENGTH]; + char m_aClan[MAX_CLAN_LENGTH]; + int m_Country; int m_Score; } ; @@ -38,7 +42,7 @@ public: char m_aMap[32]; char m_aVersion[32]; char m_aAddress[24]; - CPlayer m_aPlayers[16]; + CPlayer m_aPlayers[MAX_CLIENTS]; }; class IServerBrowser : public IInterface |