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

Console::PrintResponse instead of SendChatTarget

Browse source 
Thanks Julian->Assange for pointing it out
This commit is contained in:
GreYFoXGTi 2011-02-05 06:47:49 +02:00
parent 89889fa1d1
commit acea19e9b5
1 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -65,10 +65,10 @@ void CGameContext::ConMute(IConsole::IResult *pResult, void *pUserData, int Clie
if(Seconds < 10) if(Seconds < 10)
Seconds = 10; Seconds = 10;
if(Victim == ClientId) { if(Victim == ClientId)
pSelf->SendChatTarget(ClientId, "You can\'t mute yourself"); pSelf->Console()->PrintResponse(IConsole::OUTPUT_LEVEL_STANDARD, "info", "You can\'t mute yourself");
} else
else { {
/*pSelf->m_apPlayers[Victim]->m_Muted = Seconds * pSelf->Server()->TickSpeed(); /*pSelf->m_apPlayers[Victim]->m_Muted = Seconds * pSelf->Server()->TickSpeed();
str_format(aBuf, sizeof(aBuf), "You have been muted by for %d seconds", pSelf->Server()->ClientName(Victim), Seconds); str_format(aBuf, sizeof(aBuf), "You have been muted by for %d seconds", pSelf->Server()->ClientName(Victim), Seconds);
pSelf->SendChatTarget(Victim, aBuf);*/ pSelf->SendChatTarget(Victim, aBuf);*/
@ -85,10 +85,10 @@ void CGameContext::ConUnmute(IConsole::IResult *pResult, void *pUserData, int Cl
int Victim = pResult->GetVictim(); int Victim = pResult->GetVictim();
char aBuf[512]; char aBuf[512];
if(Victim == ClientId) { if(Victim == ClientId)
pSelf->SendChatTarget(ClientId, "You can\'t unmute yourself"); pSelf->Console()->PrintResponse(IConsole::OUTPUT_LEVEL_STANDARD, "info", "You can\'t unmute yourself");
} else
else { {
if(pSelf->m_apPlayers[Victim]->m_Muted > 0) if(pSelf->m_apPlayers[Victim]->m_Muted > 0)
{ {
pSelf->m_apPlayers[Victim]->m_Muted = 0; pSelf->m_apPlayers[Victim]->m_Muted = 0;
@ -996,7 +996,7 @@ void CGameContext::ConShowOthers(IConsole::IResult *pResult, void *pUserData, in
if(pSelf->m_apPlayers[ClientId]->m_IsUsingDDRaceClient) if(pSelf->m_apPlayers[ClientId]->m_IsUsingDDRaceClient)
pSelf->m_apPlayers[ClientId]->m_ShowOthers = !pSelf->m_apPlayers[ClientId]->m_ShowOthers; pSelf->m_apPlayers[ClientId]->m_ShowOthers = !pSelf->m_apPlayers[ClientId]->m_ShowOthers;
else else
pSelf->SendChatTarget(ClientId, "Showing players from other teams is only available with DDRace Client, http://DDRace.info"); pSelf->Console()->PrintResponse(IConsole::OUTPUT_LEVEL_STANDARD, "info", "Showing players from other teams is only available with DDRace Client, http://DDRace.info");
} }
void CGameContext::ConAsk(IConsole::IResult *pResult, void *pUserData, int ClientId) void CGameContext::ConAsk(IConsole::IResult *pResult, void *pUserData, int ClientId)
@ -1017,7 +1017,7 @@ void CGameContext::ConAsk(IConsole::IResult *pResult, void *pUserData, int Clien
Victim = i; Victim = i;
pVictim = pSelf->m_apPlayers[i]->GetCharacter(); pVictim = pSelf->m_apPlayers[i]->GetCharacter();
Matches = 1; Matches = 1;
pSelf->SendChatTarget(ClientId, "Exact Match found"); pSelf->Console()->PrintResponse(IConsole::OUTPUT_LEVEL_STANDARD, "info", "Exact Match found");
break; break;
} }
else if(pSelf->m_apPlayers[i] && i != ClientId && str_find_nocase(pServ->ClientName(i), Name)) else if(pSelf->m_apPlayers[i] && i != ClientId && str_find_nocase(pServ->ClientName(i), Name))
@ -1077,7 +1077,7 @@ void CGameContext::ConAsk(IConsole::IResult *pResult, void *pUserData, int Clien
} }
else else
str_format(aBuf, sizeof(aBuf), "hmm, i don't know why but you are not allowed to ask this player"); str_format(aBuf, sizeof(aBuf), "hmm, i don't know why but you are not allowed to ask this player");
pSelf->SendChatTarget(ClientId, aBuf); pSelf->Console()->PrintResponse(IConsole::OUTPUT_LEVEL_STANDARD, "info", aBuf);
return; return;
} }
@ -1088,9 +1088,7 @@ void CGameContext::ConYes(IConsole::IResult *pResult, void *pUserData, int Clien
CGameControllerDDRace* Controller = (CGameControllerDDRace*)pSelf->m_pController; CGameControllerDDRace* Controller = (CGameControllerDDRace*)pSelf->m_pController;
char aBuf[512]; char aBuf[512];
if((pSelf->m_apPlayers[ClientId]->m_Asker == -1 || pSelf->m_apPlayers[ClientId]->m_Asker != -1) && pSelf->m_apPlayers[ClientId]->m_AskedTick + g_Config.m_SvTeamAskTime > pSelf->Server()->Tick() ) if((pSelf->m_apPlayers[ClientId]->m_Asker == -1 || pSelf->m_apPlayers[ClientId]->m_Asker != -1) && pSelf->m_apPlayers[ClientId]->m_AskedTick + g_Config.m_SvTeamAskTime > pSelf->Server()->Tick() )
{ pSelf->Console()->PrintResponse(IConsole::OUTPUT_LEVEL_STANDARD, "info", "No valid questions, maybe they timed out.");
pSelf->SendChatTarget(ClientId, "No valid questions, maybe they timed out.");
}
else else
{ {
str_format(aBuf, sizeof(aBuf), "\'%s\' has accepted your request.", pServ->ClientName(ClientId)); str_format(aBuf, sizeof(aBuf), "\'%s\' has accepted your request.", pServ->ClientName(ClientId));
@ -1134,9 +1132,7 @@ void CGameContext::ConNo(IConsole::IResult *pResult, void *pUserData, int Client
CServer* pServ = (CServer*)pSelf->Server(); CServer* pServ = (CServer*)pSelf->Server();
char aBuf[512]; char aBuf[512];
if((pSelf->m_apPlayers[ClientId]->m_Asker == -1 || pSelf->m_apPlayers[ClientId]->m_Asker != -1) && pSelf->m_apPlayers[ClientId]->m_AskedTick + g_Config.m_SvTeamAskTime > pSelf->Server()->Tick() ) if((pSelf->m_apPlayers[ClientId]->m_Asker == -1 || pSelf->m_apPlayers[ClientId]->m_Asker != -1) && pSelf->m_apPlayers[ClientId]->m_AskedTick + g_Config.m_SvTeamAskTime > pSelf->Server()->Tick() )
{ pSelf->Console()->PrintResponse(IConsole::OUTPUT_LEVEL_STANDARD, "info", "No valid question, maybe it timed out.");
pSelf->SendChatTarget(ClientId, "No valid question, maybe it timed out.");
}
else else
{ {
str_format(aBuf, sizeof(aBuf), "\'%s\' has rejected your request.", pServ->ClientName(ClientId)); str_format(aBuf, sizeof(aBuf), "\'%s\' has rejected your request.", pServ->ClientName(ClientId));
@ -1172,7 +1168,7 @@ void CGameContext::ConInvite(IConsole::IResult *pResult, void *pUserData, int Cl
Victim = i; Victim = i;
pVictim = pSelf->m_apPlayers[i]->GetCharacter(); pVictim = pSelf->m_apPlayers[i]->GetCharacter();
Matches = 1; Matches = 1;
pSelf->SendChatTarget(ClientId, "Exact Match found"); pSelf->Console()->PrintResponse(IConsole::OUTPUT_LEVEL_STANDARD, "info", "Exact Match found");
break; break;
} }
else if(pSelf->m_apPlayers[i] && i != ClientId && str_find_nocase(pServ->ClientName(i), Name)) else if(pSelf->m_apPlayers[i] && i != ClientId && str_find_nocase(pServ->ClientName(i), Name))
@ -1217,6 +1213,6 @@ void CGameContext::ConInvite(IConsole::IResult *pResult, void *pUserData, int Cl
} }
else else
str_format(aBuf, sizeof(aBuf), "hmm, i don't know why but you are not allowed to ask this player"); str_format(aBuf, sizeof(aBuf), "hmm, i don't know why but you are not allowed to ask this player");
pSelf->SendChatTarget(ClientId, aBuf); pSelf->Console()->PrintResponse(IConsole::OUTPUT_LEVEL_STANDARD, "info", aBuf);
return; return;
} }