mirror of
https://github.com/ddnet/ddnet.git
synced 2024-09-19 09:12:19 +00:00
Compare commits
6 commits
b4d722505e
...
35c006fc60
Author | SHA1 | Date | |
---|---|---|---|
35c006fc60 | |||
96ad30eb21 | |||
b03245f7dd | |||
ChillerDragon | 7192bbf397 | ||
ChillerDragon | 984845b2a9 | ||
20d2d1fdd8 |
|
@ -228,7 +228,7 @@ MACRO_CONFIG_INT(SvWarmup, sv_warmup, 0, 0, 0, CFGFLAG_SERVER, "Number of second
|
|||
MACRO_CONFIG_STR(SvMotd, sv_motd, 900, "", CFGFLAG_SERVER, "Message of the day to display for the clients")
|
||||
MACRO_CONFIG_STR(SvGametype, sv_gametype, 32, "ddnet", CFGFLAG_SERVER, "Game type (ddnet, mod)")
|
||||
MACRO_CONFIG_INT(SvTournamentMode, sv_tournament_mode, 0, 0, 1, CFGFLAG_SERVER, "Tournament mode. When enabled, players joins the server as spectator")
|
||||
MACRO_CONFIG_INT(SvSpamprotection, sv_spamprotection, 1, 0, 1, CFGFLAG_SERVER, "Spam protection")
|
||||
MACRO_CONFIG_INT(SvSpamprotection, sv_spamprotection, 1, 0, 1, CFGFLAG_SERVER, "Spam protection for: team change, chat, skin change, emotes and votes")
|
||||
|
||||
MACRO_CONFIG_INT(SvSpectatorSlots, sv_spectator_slots, 0, 0, MAX_CLIENTS, CFGFLAG_SERVER, "Number of slots to reserve for spectators")
|
||||
MACRO_CONFIG_INT(SvInactiveKickTime, sv_inactivekick_time, 0, 0, 1000, CFGFLAG_SERVER, "How many minutes to wait before taking care of inactive players")
|
||||
|
|
|
@ -620,10 +620,12 @@ void *CGameClient::TranslateGameMsg(int *pMsgId, CUnpacker *pUnpacker, int Conn)
|
|||
switch(GameMsgId)
|
||||
{
|
||||
case protocol7::GAMEMSG_CTF_DROP:
|
||||
m_Sounds.Enqueue(CSounds::CHN_GLOBAL, SOUND_CTF_DROP);
|
||||
if(Conn == g_Config.m_ClDummy)
|
||||
m_Sounds.Enqueue(CSounds::CHN_GLOBAL, SOUND_CTF_DROP);
|
||||
break;
|
||||
case protocol7::GAMEMSG_CTF_RETURN:
|
||||
m_Sounds.Enqueue(CSounds::CHN_GLOBAL, SOUND_CTF_RETURN);
|
||||
if(Conn == g_Config.m_ClDummy)
|
||||
m_Sounds.Enqueue(CSounds::CHN_GLOBAL, SOUND_CTF_RETURN);
|
||||
break;
|
||||
case protocol7::GAMEMSG_TEAM_ALL:
|
||||
{
|
||||
|
@ -650,7 +652,8 @@ void *CGameClient::TranslateGameMsg(int *pMsgId, CUnpacker *pUnpacker, int Conn)
|
|||
}
|
||||
break;
|
||||
case protocol7::GAMEMSG_CTF_GRAB:
|
||||
m_Sounds.Enqueue(CSounds::CHN_GLOBAL, SOUND_CTF_GRAB_EN);
|
||||
if(Conn == g_Config.m_ClDummy)
|
||||
m_Sounds.Enqueue(CSounds::CHN_GLOBAL, SOUND_CTF_GRAB_EN);
|
||||
break;
|
||||
case protocol7::GAMEMSG_GAME_PAUSED:
|
||||
{
|
||||
|
@ -660,7 +663,8 @@ void *CGameClient::TranslateGameMsg(int *pMsgId, CUnpacker *pUnpacker, int Conn)
|
|||
}
|
||||
break;
|
||||
case protocol7::GAMEMSG_CTF_CAPTURE:
|
||||
m_Sounds.Enqueue(CSounds::CHN_GLOBAL, SOUND_CTF_CAPTURE);
|
||||
if(Conn == g_Config.m_ClDummy)
|
||||
m_Sounds.Enqueue(CSounds::CHN_GLOBAL, SOUND_CTF_CAPTURE);
|
||||
int ClientId = clamp(aParaI[1], 0, MAX_CLIENTS - 1);
|
||||
m_aStats[ClientId].m_FlagCaptures++;
|
||||
|
||||
|
|
|
@ -1525,24 +1525,6 @@ void CGameContext::OnClientEnter(int ClientId)
|
|||
Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, ClientId);
|
||||
}
|
||||
|
||||
{
|
||||
int Empty = -1;
|
||||
for(int i = 0; i < MAX_CLIENTS; i++)
|
||||
{
|
||||
if(Server()->ClientSlotEmpty(i))
|
||||
{
|
||||
Empty = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
CNetMsg_Sv_Chat Msg;
|
||||
Msg.m_Team = 0;
|
||||
Msg.m_ClientId = Empty;
|
||||
Msg.m_pMessage = "Do you know someone who uses a bot? Please report them to the moderators.";
|
||||
m_apPlayers[ClientId]->m_EligibleForFinishCheck = time_get();
|
||||
Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, ClientId);
|
||||
}
|
||||
|
||||
IServer::CClientInfo Info;
|
||||
if(Server()->GetClientInfo(ClientId, &Info) && Info.m_GotDDNetVersion)
|
||||
{
|
||||
|
@ -2093,18 +2075,6 @@ void CGameContext::OnMessage(int MsgId, CUnpacker *pUnpacker, int ClientId)
|
|||
void CGameContext::OnSayNetMessage(const CNetMsg_Cl_Say *pMsg, int ClientId, const CUnpacker *pUnpacker)
|
||||
{
|
||||
CPlayer *pPlayer = m_apPlayers[ClientId];
|
||||
bool Check = !pPlayer->m_NotEligibleForFinish && pPlayer->m_EligibleForFinishCheck + 10 * time_freq() >= time_get();
|
||||
if(Check && str_comp(pMsg->m_pMessage, "xd sure chillerbot.png is lyfe") == 0 && pMsg->m_Team == 0)
|
||||
{
|
||||
if(m_TeeHistorianActive)
|
||||
{
|
||||
m_TeeHistorian.RecordPlayerMessage(ClientId, pUnpacker->CompleteData(), pUnpacker->CompleteSize());
|
||||
}
|
||||
|
||||
pPlayer->m_NotEligibleForFinish = true;
|
||||
dbg_msg("hack", "bot detected, cid=%d", ClientId);
|
||||
return;
|
||||
}
|
||||
int Team = pMsg->m_Team;
|
||||
|
||||
// trim right and set maximum length to 256 utf8-characters
|
||||
|
|
|
@ -140,7 +140,6 @@ void CPlayer::Reset()
|
|||
m_FirstVoteTick = Now;
|
||||
|
||||
m_NotEligibleForFinish = false;
|
||||
m_EligibleForFinishCheck = 0;
|
||||
m_VotedForPractice = false;
|
||||
m_SwapTargetsClientId = -1;
|
||||
m_BirthdayAnnounced = false;
|
||||
|
|
|
@ -222,7 +222,6 @@ public:
|
|||
std::shared_ptr<CScorePlayerResult> m_ScoreQueryResult;
|
||||
std::shared_ptr<CScorePlayerResult> m_ScoreFinishResult;
|
||||
bool m_NotEligibleForFinish;
|
||||
int64_t m_EligibleForFinishCheck;
|
||||
bool m_VotedForPractice;
|
||||
int m_SwapTargetsClientId; //Client ID of the swap target for the given player
|
||||
bool m_BirthdayAnnounced;
|
||||
|
|
Loading…
Reference in a new issue