diff options
Diffstat (limited to 'src/engine/server/server.cpp')
| -rw-r--r-- | src/engine/server/server.cpp | 52 |
1 files changed, 49 insertions, 3 deletions
diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp index f385a312..fcc141bb 100644 --- a/src/engine/server/server.cpp +++ b/src/engine/server/server.cpp @@ -192,6 +192,11 @@ int CServer::TrySetClientName(int ClientID, const char *pName) // trim the name str_copy(aTrimmedName, StrLtrim(pName), sizeof(aTrimmedName)); StrRtrim(aTrimmedName); + + // check if new and old name are the same + if(str_comp(m_aClients[ClientID].m_aName, aTrimmedName) == 0) + return 0; + char aBuf[256]; str_format(aBuf, sizeof(aBuf), "'%s' -> '%s'", pName, aTrimmedName); Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "server", aBuf); @@ -239,6 +244,22 @@ void CServer::SetClientName(int ClientID, const char *pName) } } +void CServer::SetClientClan(int ClientID, const char *pClan) +{ + if(ClientID < 0 || ClientID >= MAX_CLIENTS || m_aClients[ClientID].m_State < CClient::STATE_READY || !pClan) + return; + + str_copy(m_aClients[ClientID].m_aClan, pClan, MAX_CLAN_LENGTH); +} + +void CServer::SetClientCountry(int ClientID, int Country) +{ + if(ClientID < 0 || ClientID >= MAX_CLIENTS || m_aClients[ClientID].m_State < CClient::STATE_READY) + return; + + m_aClients[ClientID].m_Country = Country; +} + void CServer::SetClientScore(int ClientID, int Score) { if(ClientID < 0 || ClientID >= MAX_CLIENTS || m_aClients[ClientID].m_State < CClient::STATE_READY) @@ -284,6 +305,7 @@ int CServer::Init() m_aClients[i].m_State = CClient::STATE_EMPTY; m_aClients[i].m_aName[0] = 0; m_aClients[i].m_aClan[0] = 0; + m_aClients[i].m_Country = -1; m_aClients[i].m_Snapshots.Init(); } @@ -332,10 +354,32 @@ const char *CServer::ClientName(int ClientID) { if(ClientID < 0 || ClientID >= MAX_CLIENTS || m_aClients[ClientID].m_State == CServer::CClient::STATE_EMPTY) return "(invalid client)"; - else if(m_aClients[ClientID].m_State < CServer::CClient::STATE_READY) + if(m_aClients[ClientID].m_State == CServer::CClient::STATE_INGAME) + return m_aClients[ClientID].m_aName; + else return "(connecting client)"; - return m_aClients[ClientID].m_aName; -} + +} + +const char *CServer::ClientClan(int ClientID) +{ + if(ClientID < 0 || ClientID >= MAX_CLIENTS || m_aClients[ClientID].m_State == CServer::CClient::STATE_EMPTY) + return ""; + if(m_aClients[ClientID].m_State == CServer::CClient::STATE_INGAME) + return m_aClients[ClientID].m_aClan; + else + return ""; +} + +int CServer::ClientCountry(int ClientID) +{ + if(ClientID < 0 || ClientID >= MAX_CLIENTS || m_aClients[ClientID].m_State == CServer::CClient::STATE_EMPTY) + return -1; + if(m_aClients[ClientID].m_State == CServer::CClient::STATE_INGAME) + return m_aClients[ClientID].m_Country; + else + return -1; +} bool CServer::ClientIngame(int ClientID) { @@ -531,6 +575,7 @@ int CServer::NewClientCallback(int ClientID, void *pUser) pThis->m_aClients[ClientID].m_State = CClient::STATE_AUTH; pThis->m_aClients[ClientID].m_aName[0] = 0; pThis->m_aClients[ClientID].m_aClan[0] = 0; + pThis->m_aClients[ClientID].m_Country = -1; pThis->m_aClients[ClientID].m_Authed = 0; pThis->m_aClients[ClientID].m_AuthTries = 0; pThis->m_aClients[ClientID].Reset(); @@ -557,6 +602,7 @@ int CServer::DelClientCallback(int ClientID, const char *pReason, void *pUser) pThis->m_aClients[ClientID].m_State = CClient::STATE_EMPTY; pThis->m_aClients[ClientID].m_aName[0] = 0; pThis->m_aClients[ClientID].m_aClan[0] = 0; + pThis->m_aClients[ClientID].m_Country = -1; pThis->m_aClients[ClientID].m_Authed = 0; pThis->m_aClients[ClientID].m_AuthTries = 0; pThis->m_aClients[ClientID].m_Snapshots.PurgeAll(); |