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

Merge branch 'master' of http://github.com/heinrich5991/DDRace

Browse source
This commit is contained in:
GreYFoXGTi 2010-11-16 17:28:42 +02:00
parent 4cbcbae508 daeb395e25
commit b17e19ff57
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -36,12 +36,12 @@ int CConsole::CResult::GetVictim()
void CConsole::CResult::ResetVictim() void CConsole::CResult::ResetVictim()
{ {
m_Victim = -3; m_Victim = VICTIM_NONE;
} }
bool CConsole::CResult::HasVictim() bool CConsole::CResult::HasVictim()
{ {
return m_Victim != -3; return m_Victim != VICTIM_NONE;
} }
void CConsole::CResult::SetVictim(int Victim) void CConsole::CResult::SetVictim(int Victim)
@ -52,11 +52,11 @@ void CConsole::CResult::SetVictim(int Victim)
void CConsole::CResult::SetVictim(const char *pVictim) void CConsole::CResult::SetVictim(const char *pVictim)
{ {
if(!str_comp(pVictim, "me")) if(!str_comp(pVictim, "me"))
m_Victim = -2; m_Victim = VICTIM_ME;
else if(!str_comp(pVictim, "all")) else if(!str_comp(pVictim, "all"))
m_Victim = -1; m_Victim = VICTIM_ALL;
else else
m_Victim = clamp<int>(str_toint(pVictim), 0, MAX_CLIENTS); m_Victim = clamp<int>(str_toint(pVictim), 0, MAX_CLIENTS - 1);
} }
@ -408,7 +408,7 @@ void CConsole::ExecuteLineStroked(int Stroke, const char *pStr, const int Client
} }
else else
{ {
if(pResult->GetVictim() == -2) if(pResult->GetVictim() == CResult::VICTIM_ME)
pResult->SetVictim(ClientId); pResult->SetVictim(ClientId);
if((ClientLevel < pCommand->m_Level && !(pCommand->m_Flags & CMDFLAG_HELPERCMD)) || (ClientLevel < 1 && (pCommand->m_Flags & CMDFLAG_HELPERCMD))) if((ClientLevel < pCommand->m_Level && !(pCommand->m_Flags & CMDFLAG_HELPERCMD)) || (ClientLevel < 1 && (pCommand->m_Flags & CMDFLAG_HELPERCMD)))
@ -454,7 +454,7 @@ void CConsole::ExecuteLineStroked(int Stroke, const char *pStr, const int Client
{ {
if (pResult->HasVictim()) if (pResult->HasVictim())
{ {
if(pResult->GetVictim() == -1) if(pResult->GetVictim() == CResult::VICTIM_ALL)
{ {
for (int i = 0; i < MAX_CLIENTS; i++) for (int i = 0; i < MAX_CLIENTS; i++)
{ {

7
src/engine/shared/console.h
View file

@ -79,6 +79,13 @@ class CConsole : public IConsole
const char *m_pCommand; const char *m_pCommand;
const char *m_apArgs[MAX_PARTS]; const char *m_apArgs[MAX_PARTS];
enum
{
VICTIM_NONE=-3,
VICTIM_ME=-2,
VICTIM_ALL=-1,
};
int m_Victim; int m_Victim;
void AddArgument(const char *pArg) void AddArgument(const char *pArg)