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

Merge #902

Browse source 
902: Fix victim handling r=Learath2 a=heinrich5991
This commit is contained in:
bors[bot] 2017-10-16 23:41:15 +00:00
parent 648452ca60 dfc53b48cf
commit 5aca38e50e
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/engine/shared/console.cpp
View file

@ -166,7 +166,7 @@ int CConsole::ParseArgs(CResult *pResult, const char *pFormat)
char *pVictim = 0;
pResult->AddArgument(pStr);
if(Command != 'v')
if(Command == 'v')
{
pVictim = pStr;
}

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

@ -336,7 +336,7 @@ void CGameContext::ConForcePause(IConsole::IResult *pResult, void *pUserData)
CGameContext *pSelf = (CGameContext *)pUserData;
int Victim = pResult->GetVictim();
int Seconds = 0;
if (pResult->NumArguments() > 0)
if (pResult->NumArguments() > 1)
Seconds = clamp(pResult->GetInteger(1), 0, 360);
CPlayer *pPlayer = pSelf->m_apPlayers[Victim];
@ -401,7 +401,7 @@ void CGameContext::ConMuteID(IConsole::IResult *pResult, void *pUserData)
NETADDR Addr;
pSelf->Server()->GetClientAddr(Victim, &Addr);
pSelf->Mute(pResult, &Addr, clamp(pResult->GetInteger(0), 1, 86400),
pSelf->Mute(pResult, &Addr, clamp(pResult->GetInteger(1), 1, 86400),
pSelf->Server()->ClientName(Victim));
}