diff options
| author | oy <Tom_Adams@web.de> | 2010-10-13 20:31:21 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2010-10-13 20:31:21 +0200 |
| commit | fa768449e28b2ad494eb4d2340886583599805ec (patch) | |
| tree | f474c330d68d6bd52881161cb45c3419bd21d909 | |
| parent | be315edfc052a5aa1c7d9d48394e0997a989c8ae (diff) | |
| download | zcatch-fa768449e28b2ad494eb4d2340886583599805ec.tar.gz zcatch-fa768449e28b2ad494eb4d2340886583599805ec.zip | |
fixed issue with reason on forcevotekick
| -rw-r--r-- | src/engine/client/client.cpp | 4 | ||||
| -rw-r--r-- | src/engine/server/server.cpp | 4 | ||||
| -rw-r--r-- | src/game/client/components/voting.cpp | 2 | ||||
| -rw-r--r-- | src/game/server/gamecontext.cpp | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp index c07a2478..bc4cc7e0 100644 --- a/src/engine/client/client.cpp +++ b/src/engine/client/client.cpp @@ -1950,8 +1950,8 @@ void CClient::RegisterCommands() { m_pConsole = Kernel()->RequestInterface<IConsole>(); // register server dummy commands for tab completion - m_pConsole->Register("kick", "i?s", CFGFLAG_SERVER, 0, 0, "Kick player with specified id for any reason"); - m_pConsole->Register("ban", "s?is", CFGFLAG_SERVER, 0, 0, "Ban player with ip/id for x minutes for any reason"); + m_pConsole->Register("kick", "i?r", CFGFLAG_SERVER, 0, 0, "Kick player with specified id for any reason"); + m_pConsole->Register("ban", "s?ir", CFGFLAG_SERVER, 0, 0, "Ban player with ip/id for x minutes for any reason"); m_pConsole->Register("unban", "s", CFGFLAG_SERVER, 0, 0, "Unban ip"); m_pConsole->Register("bans", "", CFGFLAG_SERVER, 0, 0, "Show banlist"); m_pConsole->Register("status", "", CFGFLAG_SERVER, 0, 0, "List players"); diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp index 3b8771e4..edd0f342 100644 --- a/src/engine/server/server.cpp +++ b/src/engine/server/server.cpp @@ -1437,8 +1437,8 @@ void CServer::RegisterCommands() { m_pConsole = Kernel()->RequestInterface<IConsole>(); - Console()->Register("kick", "i?s", CFGFLAG_SERVER, ConKick, this, ""); - Console()->Register("ban", "s?is", CFGFLAG_SERVER|CFGFLAG_STORE, ConBan, this, ""); + Console()->Register("kick", "i?r", CFGFLAG_SERVER, ConKick, this, ""); + Console()->Register("ban", "s?ir", CFGFLAG_SERVER|CFGFLAG_STORE, ConBan, this, ""); Console()->Register("unban", "s", CFGFLAG_SERVER|CFGFLAG_STORE, ConUnban, this, ""); Console()->Register("bans", "", CFGFLAG_SERVER|CFGFLAG_STORE, ConBans, this, ""); Console()->Register("status", "", CFGFLAG_SERVER, ConStatus, this, ""); diff --git a/src/game/client/components/voting.cpp b/src/game/client/components/voting.cpp index 8a98e1b0..59f6d934 100644 --- a/src/game/client/components/voting.cpp +++ b/src/game/client/components/voting.cpp @@ -59,7 +59,7 @@ void CVoting::ForcevoteKick(int ClientId, const char *pReason) { char aBuf[32]; if(pReason[0]) - str_format(aBuf, sizeof(aBuf), "kick %d \"%s\"", ClientId, pReason); + str_format(aBuf, sizeof(aBuf), "kick %d %s", ClientId, pReason); else str_format(aBuf, sizeof(aBuf), "kick %d", ClientId); Client()->Rcon(aBuf); diff --git a/src/game/server/gamecontext.cpp b/src/game/server/gamecontext.cpp index 0faba6fc..ce3be58f 100644 --- a/src/game/server/gamecontext.cpp +++ b/src/game/server/gamecontext.cpp @@ -682,12 +682,12 @@ void CGameContext::OnMessage(int MsgId, CUnpacker *pUnpacker, int ClientId) str_format(aChatmsg, sizeof(aChatmsg), "'%s' called for vote to kick '%s' (%s)", Server()->ClientName(ClientId), Server()->ClientName(KickId), pReason); str_format(aDesc, sizeof(aDesc), "Kick '%s'", Server()->ClientName(KickId)); if (!g_Config.m_SvVoteKickBantime) - str_format(aCmd, sizeof(aCmd), "kick %d \"Kicked by vote\"", KickId); + str_format(aCmd, sizeof(aCmd), "kick %d Kicked by vote", KickId); else { char aBuf[64] = {0}; Server()->GetClientIP(KickId, aBuf, sizeof(aBuf)); - str_format(aCmd, sizeof(aCmd), "ban %s %d \"Banned by vote\"", aBuf, g_Config.m_SvVoteKickBantime); + str_format(aCmd, sizeof(aCmd), "ban %s %d Banned by vote", aBuf, g_Config.m_SvVoteKickBantime); } } |