fixes after cherry picking

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
This commit is contained in:
GreYFoXGTi 2010-08-25 15:24:31 +02:00
parent 41afca6db2
commit e37992ae56
3 changed files with 7 additions and 7 deletions

View file

@ -894,7 +894,7 @@ void CServer::ProcessClientPacket(CNetChunk *pPacket)
char aBuf[256];
str_format(aBuf, sizeof(aBuf), "ClientId=%d Level=%d Rcon='%s'", ClientId, m_aClients[ClientId].m_Authed, pCmd);
Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "server", aBuf);
Console()->ExecuteLine(pCmd);
Console()->ExecuteLine(pCmd, m_aClients[ClientId].m_Authed, ClientId);
//Addr = m_NetServer.ClientAddr(ClientId);
if(m_aClients[ClientId].m_Authed > 0)
{
@ -977,7 +977,7 @@ void CServer::ProcessClientPacket(CNetChunk *pPacket)
}
}
}
else if(str_comp(pPw, g_Config.m_SvRconPassword) == 0)
/*else if(str_comp(pPw, g_Config.m_SvRconPassword) == 0)
{
CMsgPacker Msg(NETMSG_RCON_AUTH_STATUS);
Msg.AddInt(1);
@ -988,7 +988,7 @@ void CServer::ProcessClientPacket(CNetChunk *pPacket)
char aBuf[256];
str_format(aBuf, sizeof(aBuf), "ClientId=%d authed", ClientId);
Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
}
}*/
else
{
SendRconLine(ClientId, "Wrong password.");

View file

@ -234,7 +234,7 @@ void CConsole::ExecuteLineStroked(int Stroke, const char *pStr, const int Client
} else {
str_format(aBuf, sizeof(aBuf), "You have low level to use command: %s. Your level: %d. Need level: %d", pCommand->m_pName, ClientLevel, pCommand->m_Level);
}
Print(aBuf);
Print(OUTPUT_LEVEL_STANDARD, "Console",aBuf);
}
}
}

View file

@ -89,8 +89,8 @@ int CNetServer::Drop(int ClientID, const char *pReason)
m_pfnDelClient(ClientID, pReason, m_UserPtr);
if(m_pfnDelClient)
m_pfnDelClient(ClientID, m_UserPtr);
/* if(m_pfnDelClient)
m_pfnDelClient(ClientID, m_UserPtr);*/
m_aSlots[ClientID].m_Connection.Disconnect(pReason);
BanAddNoDrop(Addr, g_Config.m_SvReconnectTime);
return 0;
@ -524,4 +524,4 @@ void CNetServer::SetMaxClientsPerIP(int Max)
Max = NET_MAX_CLIENTS;
m_MaxClientsPerIP = Max;
}
}