edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 14:38:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7997 from heinrich5991/pr_ddnet_client_empty

Browse source 
`ClientEmpty` → `ClientSlotEmpty`
This commit is contained in:
Robert Müller 2024-02-19 20:54:05 +00:00 committed by GitHub
parent e342cd43ab bf0f699b42
commit 259ed751ad
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/engine/server.h
View file

@ -55,7 +55,7 @@ public:
virtual const char *ClientName(int ClientID) const = 0; virtual const char *ClientName(int ClientID) const = 0;
virtual const char *ClientClan(int ClientID) const = 0; virtual const char *ClientClan(int ClientID) const = 0;
virtual int ClientCountry(int ClientID) const = 0; virtual int ClientCountry(int ClientID) const = 0;
virtual bool ClientEmpty(int ClientID) const = 0; virtual bool ClientSlotEmpty(int ClientID) const = 0;
virtual bool ClientIngame(int ClientID) const = 0; virtual bool ClientIngame(int ClientID) const = 0;
virtual bool ClientAuthed(int ClientID) const = 0; virtual bool ClientAuthed(int ClientID) const = 0;
virtual bool GetClientInfo(int ClientID, CClientInfo *pInfo) const = 0; virtual bool GetClientInfo(int ClientID, CClientInfo *pInfo) const = 0;

2
src/engine/server/server.cpp
View file

@ -646,7 +646,7 @@ int CServer::ClientCountry(int ClientID) const
return -1; return -1;
} }
bool CServer::ClientEmpty(int ClientID) const bool CServer::ClientSlotEmpty(int ClientID) const
{ {
return ClientID >= 0 && ClientID < MAX_CLIENTS && m_aClients[ClientID].m_State == CServer::CClient::STATE_EMPTY; return ClientID >= 0 && ClientID < MAX_CLIENTS && m_aClients[ClientID].m_State == CServer::CClient::STATE_EMPTY;
} }

2
src/engine/server/server.h
View file

@ -298,7 +298,7 @@ public:
const char *ClientName(int ClientID) const override; const char *ClientName(int ClientID) const override;
const char *ClientClan(int ClientID) const override; const char *ClientClan(int ClientID) const override;
int ClientCountry(int ClientID) const override; int ClientCountry(int ClientID) const override;
bool ClientEmpty(int ClientID) const override; bool ClientSlotEmpty(int ClientID) const override;
bool ClientIngame(int ClientID) const override; bool ClientIngame(int ClientID) const override;
bool ClientAuthed(int ClientID) const override; bool ClientAuthed(int ClientID) const override;
int Port() const override; int Port() const override;

2
src/game/server/gamecontext.cpp
View file

@ -1521,7 +1521,7 @@ void CGameContext::OnClientEnter(int ClientID)
int Empty = -1; int Empty = -1;
for(int i = 0; i < MAX_CLIENTS; i++) for(int i = 0; i < MAX_CLIENTS; i++)
{ {
if(Server()->ClientEmpty(i)) if(Server()->ClientSlotEmpty(i))
{ {
Empty = i; Empty = i;
break; break;