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

Simplify some server messages

Browse source
This commit is contained in:
def 2019-02-27 19:46:01 +01:00
parent dfa16e37ba
commit 887d1c8401
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/game/server/ddracechat.cpp
View file

@ -491,7 +491,7 @@ void CGameContext::ConMap(IConsole::IResult *pResult, void *pUserData)
if (g_Config.m_SvMapVote == 0)
{
pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "map",
"Admin has disabled /map");
"/map is disabled");
return;
}
@ -806,13 +806,13 @@ void CGameContext::ConInviteTeam(IConsole::IResult *pResult, void *pUserData)
if(g_Config.m_SvTeam == 0 || g_Config.m_SvTeam == 3)
{
pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "join",
"Admin has disabled teams");
"Teams are disabled");
return;
}
if(!g_Config.m_SvInvite)
{
pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "invite", "Admin has disabled invites");
pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "invite", "Invites are disabled");
return;
}
@ -885,7 +885,7 @@ void CGameContext::ConJoinTeam(IConsole::IResult *pResult, void *pUserData)
else if (g_Config.m_SvTeam == 0 || g_Config.m_SvTeam == 3)
{
pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "join",
"Admin has disabled teams");
"Teams are disabled");
return;
}
else if (g_Config.m_SvTeam == 2 && pResult->GetInteger(0) == 0 && pPlayer->GetCharacter() && pPlayer->GetCharacter()->m_LastStartWarning < pSelf->Server()->Tick() - 3 * pSelf->Server()->TickSpeed())
@ -985,7 +985,7 @@ void CGameContext::ConMe(IConsole::IResult *pResult, void *pUserData)
pSelf->Console()->Print(
IConsole::OUTPUT_LEVEL_STANDARD,
"me",
"/me is disabled on this server, admin can enable it by using sv_slash_me");
"/me is disabled on this server");
}
void CGameContext::ConConverse(IConsole::IResult *pResult, void *pUserData)
@ -1037,7 +1037,7 @@ void CGameContext::ConEyeEmote(IConsole::IResult *pResult, void *pUserData)
if (g_Config.m_SvEmotionalTees == -1)
{
pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "emote",
"Server admin disabled emotes.");
"Emotes are disabled.");
return;
}
@ -1127,7 +1127,7 @@ void CGameContext::ConShowOthers(IConsole::IResult *pResult, void *pUserData)
pSelf->Console()->Print(
IConsole::OUTPUT_LEVEL_STANDARD,
"showotherschat",
"Showing players from other teams is disabled by the server admin");
"Showing players from other teams is disabled");
}
void CGameContext::ConShowAll(IConsole::IResult *pResult, void *pUserData)

2
src/game/server/entities/character.cpp
View file

@ -1456,7 +1456,7 @@ void CCharacter::HandleTiles(int Index)
{
if(m_LastStartWarning < Server()->Tick() - 3 * Server()->TickSpeed())
{
GameServer()->SendChatTarget(GetPlayer()->GetCID(),"Server admin requires you to be in a team and with other tees to start");
GameServer()->SendChatTarget(GetPlayer()->GetCID(),"You have to be in a team with other tees to start");
m_LastStartWarning = Server()->Tick();
}
Die(GetPlayer()->GetCID(), WEAPON_WORLD);

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

@ -2583,7 +2583,7 @@ void CGameContext::ConForceVote(IConsole::IResult *pResult, void *pUserData)
return;
}
str_format(aBuf, sizeof(aBuf), "admin moved '%s' to spectator (%s)", pSelf->Server()->ClientName(SpectateID), pReason);
str_format(aBuf, sizeof(aBuf), "'%s' was moved to spectator (%s)", pSelf->Server()->ClientName(SpectateID), pReason);
pSelf->SendChatTarget(-1, aBuf);
str_format(aBuf, sizeof(aBuf), "set_team %d -1 %d", SpectateID, g_Config.m_SvVoteSpectateRejoindelay);
pSelf->Console()->ExecuteLine(aBuf);
@ -3310,7 +3310,7 @@ void CGameContext::OnSetAuthed(int ClientID, int Level)
if(!str_comp_nocase(m_aVoteCommand, aBuf) && Level > Server()->GetAuthedState(m_VoteCreator))
{
m_VoteEnforce = CGameContext::VOTE_ENFORCE_NO_ADMIN;
Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "CGameContext", "Aborted vote by admin login.");
Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "CGameContext", "Vote aborted by authorized login.");
}
}
if(m_TeeHistorianActive)