edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 01:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7639 from ChillerDragon/pr_canjoinmsg

Browse source 
Move chat message into CanJoinTeam()
This commit is contained in:
heinrich5991 2023-12-13 15:27:25 +00:00 committed by GitHub
parent 0075d85581 157e8b7302
commit b458890f08
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2389,24 +2389,16 @@ void CGameContext::OnSetTeamNetMessage(const CNetMsg_Cl_SetTeam *pMsg, int Clien
} }
// Switch team on given client and kill/respawn them // Switch team on given client and kill/respawn them
if(m_pController->CanJoinTeam(pMsg->m_Team, ClientID)) char aTeamJoinError[512];
{ if(m_pController->CanJoinTeam(pMsg->m_Team, ClientID, aTeamJoinError, sizeof(aTeamJoinError)))
if(pPlayer->IsPaused())
SendChatTarget(ClientID, "Use /pause first then you can kill");
else
{ {
if(pPlayer->GetTeam() == TEAM_SPECTATORS || pMsg->m_Team == TEAM_SPECTATORS) if(pPlayer->GetTeam() == TEAM_SPECTATORS || pMsg->m_Team == TEAM_SPECTATORS)
m_VoteUpdate = true; m_VoteUpdate = true;
m_pController->DoTeamChange(pPlayer, pMsg->m_Team); m_pController->DoTeamChange(pPlayer, pMsg->m_Team);
pPlayer->m_TeamChangeTick = Server()->Tick(); pPlayer->m_TeamChangeTick = Server()->Tick();
} }
} if(aTeamJoinError[0])
else SendBroadcast(aTeamJoinError, ClientID);
{
char aBuf[128];
str_format(aBuf, sizeof(aBuf), "Only %d active players are allowed", Server()->MaxClients() - g_Config.m_SvSpectatorSlots);
SendBroadcast(aBuf, ClientID);
}
} }
void CGameContext::OnIsDDNetLegacyNetMessage(const CNetMsg_Cl_IsDDNetLegacy *pMsg, int ClientID, CUnpacker *pUnpacker) void CGameContext::OnIsDDNetLegacyNetMessage(const CNetMsg_Cl_IsDDNetLegacy *pMsg, int ClientID, CUnpacker *pUnpacker)

20
src/game/server/gamecontroller.cpp
View file

@ -710,14 +710,21 @@ int IGameController::GetAutoTeam(int NotThisID)
int Team = 0; int Team = 0;
if(CanJoinTeam(Team, NotThisID)) if(CanJoinTeam(Team, NotThisID, nullptr, 0))
return Team; return Team;
return -1; return -1;
} }
bool IGameController::CanJoinTeam(int Team, int NotThisID) bool IGameController::CanJoinTeam(int Team, int NotThisID, char *pErrorReason, int ErrorReasonSize)
{ {
if(Team == TEAM_SPECTATORS || (GameServer()->m_apPlayers[NotThisID] && GameServer()->m_apPlayers[NotThisID]->GetTeam() != TEAM_SPECTATORS)) const CPlayer *pPlayer = GameServer()->m_apPlayers[NotThisID];
if(pPlayer && pPlayer->IsPaused())
{
if(pErrorReason)
str_copy(pErrorReason, "Use /pause first then you can kill", ErrorReasonSize);
return false;
}
if(Team == TEAM_SPECTATORS || (pPlayer && pPlayer->GetTeam() != TEAM_SPECTATORS))
return true; return true;
int aNumplayers[2] = {0, 0}; int aNumplayers[2] = {0, 0};
@ -730,7 +737,12 @@ bool IGameController::CanJoinTeam(int Team, int NotThisID)
} }
} }
return (aNumplayers[0] + aNumplayers[1]) < Server()->MaxClients() - g_Config.m_SvSpectatorSlots; if((aNumplayers[0] + aNumplayers[1]) < Server()->MaxClients() - g_Config.m_SvSpectatorSlots)
return true;
if(pErrorReason)
str_format(pErrorReason, ErrorReasonSize, "Only %d active players are allowed", Server()->MaxClients() - g_Config.m_SvSpectatorSlots);
return false;
} }
int IGameController::ClampTeam(int Team) int IGameController::ClampTeam(int Team)

2
src/game/server/gamecontroller.h
View file

@ -145,7 +145,7 @@ public:
*/ */
virtual const char *GetTeamName(int Team); virtual const char *GetTeamName(int Team);
virtual int GetAutoTeam(int NotThisID); virtual int GetAutoTeam(int NotThisID);
virtual bool CanJoinTeam(int Team, int NotThisID); virtual bool CanJoinTeam(int Team, int NotThisID, char *pErrorReason, int ErrorReasonSize);
int ClampTeam(int Team); int ClampTeam(int Team);
CClientMask GetMaskForPlayerWorldEvent(int Asker, int ExceptID = -1); CClientMask GetMaskForPlayerWorldEvent(int Asker, int ExceptID = -1);

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

@ -832,7 +832,7 @@ int CPlayer::ForcePause(int Time)
return Pause(PAUSE_SPEC, true); return Pause(PAUSE_SPEC, true);
} }
int CPlayer::IsPaused() int CPlayer::IsPaused() const
{ {
return m_ForcePauseTime ? m_ForcePauseTime : -1 * m_Paused; return m_ForcePauseTime ? m_ForcePauseTime : -1 * m_Paused;
} }

2
src/game/server/player.h
View file

@ -176,7 +176,7 @@ public:
void ProcessPause(); void ProcessPause();
int Pause(int State, bool Force); int Pause(int State, bool Force);
int ForcePause(int Time); int ForcePause(int Time);
int IsPaused(); int IsPaused() const;
bool IsPlaying(); bool IsPlaying();
int64_t m_Last_KickVote; int64_t m_Last_KickVote;