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 branch 'master' of http://github.com/btd/DDRace

Browse source
This commit is contained in:
GreYFoXGTi 2010-08-20 20:19:24 +02:00
parent 5cfcee99f9 d22052d800
commit 8450116185
2 changed files with 35 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/game/server/gamecontext.cpp
View file

@ -704,10 +704,7 @@ void CGameContext::OnMessage(int MsgId, CUnpacker *pUnpacker, int ClientId)
number = number*10+(*pt-'0'); number = number*10+(*pt-'0');
pt++; pt++;
} }
if(number) s=((CGameControllerDDRace*)m_pController)->m_Score.Top5Draw(ClientId, number ? number : 0);
s=((CGameControllerDDRace*)m_pController)->m_Score.Top5Draw(ClientId, number);
else
s=((CGameControllerDDRace*)m_pController)->m_Score.Top5Draw(ClientId, 0);
for(i=s.begin(); i != s.end(); ++i) for(i=s.begin(); i != s.end(); ++i)
SendChatTarget(ClientId, i->c_str()); SendChatTarget(ClientId, i->c_str());
} }
@ -1236,7 +1233,7 @@ void CGameContext::ConNinjaMe(IConsole::IResult *pResult, void *pUserData, int c
CGameContext *pSelf = (CGameContext *)pUserData; CGameContext *pSelf = (CGameContext *)pUserData;
if(!pSelf->CheatsAvailable(cid)) return; if(!pSelf->CheatsAvailable(cid)) return;
CCharacter* chr = pSelf->m_apPlayers[cid]->GetCharacter(); CCharacter* chr = pSelf->GetPlayerChar(cid);
if(chr) { if(chr) {
chr->GiveNinja(); chr->GiveNinja();
if(!g_Config.m_SvCheatTime) if(!g_Config.m_SvCheatTime)
@ -1248,7 +1245,7 @@ void CGameContext::ConNinja(IConsole::IResult *pResult, void *pUserData, int cid
CGameContext *pSelf = (CGameContext *)pUserData; CGameContext *pSelf = (CGameContext *)pUserData;
if(!pSelf->CheatsAvailable(cid)) return; if(!pSelf->CheatsAvailable(cid)) return;
int cid1 = clamp(pResult->GetInteger(0), 0, (int)MAX_CLIENTS-1); int cid1 = clamp(pResult->GetInteger(0), 0, (int)MAX_CLIENTS-1);
CCharacter* chr = pSelf->m_apPlayers[cid1]->GetCharacter(); CCharacter* chr = pSelf->GetPlayerChar(cid1);
if(chr) { if(chr) {
chr->GiveNinja(); chr->GiveNinja();
if(!g_Config.m_SvCheatTime) if(!g_Config.m_SvCheatTime)
@ -1265,7 +1262,7 @@ void CGameContext::ConHammer(IConsole::IResult *pResult, void *pUserData, int ci
int cid1 = clamp(pResult->GetInteger(0), 0, (int)MAX_CLIENTS-1); int cid1 = clamp(pResult->GetInteger(0), 0, (int)MAX_CLIENTS-1);
int type = pResult->GetInteger(1); int type = pResult->GetInteger(1);
CCharacter* chr = pSelf->m_apPlayers[cid1]->GetCharacter(); CCharacter* chr = pSelf->GetPlayerChar(cid1);
if (!chr) if (!chr)
return; return;
CServer* serv = (CServer*)pSelf->Server(); CServer* serv = (CServer*)pSelf->Server();
@ -1289,7 +1286,7 @@ void CGameContext::ConHammerMe(IConsole::IResult *pResult, void *pUserData, int
if(!pSelf->CheatsAvailable(cid)) return; if(!pSelf->CheatsAvailable(cid)) return;
char buf[128]; char buf[128];
int type = pResult->GetInteger(0); int type = pResult->GetInteger(0);
CCharacter* chr = pSelf->m_apPlayers[cid]->GetCharacter(); CCharacter* chr = pSelf->GetPlayerChar(cid);
if (!chr) if (!chr)
return; return;
CServer* serv = (CServer*)pSelf->Server(); CServer* serv = (CServer*)pSelf->Server();
@ -1315,7 +1312,7 @@ void CGameContext::ConSuper(IConsole::IResult *pResult, void *pUserData, int cid
int cid1 = clamp(pResult->GetInteger(0), 0, (int)MAX_CLIENTS-1); int cid1 = clamp(pResult->GetInteger(0), 0, (int)MAX_CLIENTS-1);
if (pSelf->m_apPlayers[cid1] && compare_players(pSelf->m_apPlayers[cid],pSelf->m_apPlayers[cid1])) if (pSelf->m_apPlayers[cid1] && compare_players(pSelf->m_apPlayers[cid],pSelf->m_apPlayers[cid1]))
{ {
CCharacter* chr = pSelf->m_apPlayers[cid1]->GetCharacter(); CCharacter* chr = pSelf->GetPlayerChar(cid1);
if(chr) if(chr)
{ {
chr->m_Super = true; chr->m_Super = true;
@ -1332,7 +1329,7 @@ void CGameContext::ConUnSuper(IConsole::IResult *pResult, void *pUserData, int c
int cid1 = clamp(pResult->GetInteger(0), 0, (int)MAX_CLIENTS-1); int cid1 = clamp(pResult->GetInteger(0), 0, (int)MAX_CLIENTS-1);
if (pSelf->m_apPlayers[cid1] && compare_players(pSelf->m_apPlayers[cid],pSelf->m_apPlayers[cid1])) if (pSelf->m_apPlayers[cid1] && compare_players(pSelf->m_apPlayers[cid],pSelf->m_apPlayers[cid1]))
{ {
CCharacter* chr = pSelf->m_apPlayers[cid1]->GetCharacter(); CCharacter* chr = pSelf->GetPlayerChar(cid1);
if(chr) if(chr)
{ {
chr->m_Super = false; chr->m_Super = false;
@ -1346,7 +1343,7 @@ void CGameContext::ConSuperMe(IConsole::IResult *pResult, void *pUserData, int c
if(!pSelf->CheatsAvailable(cid)) return; if(!pSelf->CheatsAvailable(cid)) return;
if (pSelf->m_apPlayers[cid]) if (pSelf->m_apPlayers[cid])
{ {
CCharacter* chr = pSelf->m_apPlayers[cid]->GetCharacter(); CCharacter* chr = pSelf->GetPlayerChar(cid);
if(chr) if(chr)
{ {
chr->m_Super = true; chr->m_Super = true;
@ -1362,7 +1359,7 @@ void CGameContext::ConUnSuperMe(IConsole::IResult *pResult, void *pUserData, int
if(!pSelf->CheatsAvailable(cid)) return; if(!pSelf->CheatsAvailable(cid)) return;
if (pSelf->m_apPlayers[cid]) if (pSelf->m_apPlayers[cid])
{ {
CCharacter* chr = pSelf->m_apPlayers[cid]->GetCharacter(); CCharacter* chr = pSelf->GetPlayerChar(cid);
if(chr) if(chr)
{ {
chr->m_Super = false; chr->m_Super = false;
@ -1377,7 +1374,7 @@ void CGameContext::ConWeapons(IConsole::IResult *pResult, void *pUserData, int c
int cid1 = clamp(pResult->GetInteger(0), 0, (int)MAX_CLIENTS-1); int cid1 = clamp(pResult->GetInteger(0), 0, (int)MAX_CLIENTS-1);
if (pSelf->m_apPlayers[cid1] && compare_players(pSelf->m_apPlayers[cid],pSelf->m_apPlayers[cid1])) if (pSelf->m_apPlayers[cid1] && compare_players(pSelf->m_apPlayers[cid],pSelf->m_apPlayers[cid1]))
{ {
CCharacter* chr = pSelf->m_apPlayers[cid1]->GetCharacter(); CCharacter* chr = pSelf->GetPlayerChar(cid1);
if(chr) if(chr)
{ {
chr->GiveAllWeapons(); chr->GiveAllWeapons();
@ -1391,9 +1388,7 @@ void CGameContext::ConWeaponsMe(IConsole::IResult *pResult, void *pUserData, int
{ {
CGameContext *pSelf = (CGameContext *)pUserData; CGameContext *pSelf = (CGameContext *)pUserData;
if(!pSelf->CheatsAvailable(cid)) return; if(!pSelf->CheatsAvailable(cid)) return;
if (pSelf->m_apPlayers[cid]) CCharacter* chr = pSelf->GetPlayerChar(cid);
{
CCharacter* chr = pSelf->m_apPlayers[cid]->GetCharacter();
if(chr) if(chr)
{ {
chr->GiveAllWeapons(); chr->GiveAllWeapons();
@ -1401,7 +1396,6 @@ void CGameContext::ConWeaponsMe(IConsole::IResult *pResult, void *pUserData, int
chr->m_RaceState = RACE_CHEAT; chr->m_RaceState = RACE_CHEAT;
} }
} }
}
void CGameContext::ConTeleport(IConsole::IResult *pResult, void *pUserData, int cid) { void CGameContext::ConTeleport(IConsole::IResult *pResult, void *pUserData, int cid) {
CGameContext *pSelf = (CGameContext *)pUserData; CGameContext *pSelf = (CGameContext *)pUserData;
@ -1414,7 +1408,7 @@ void CGameContext::ConTeleport(IConsole::IResult *pResult, void *pUserData, int
|| (compare_players(pSelf->m_apPlayers[cid],pSelf->m_apPlayers[cid1]) && compare_players(pSelf->m_apPlayers[cid],pSelf->m_apPlayers[cid2])) || (compare_players(pSelf->m_apPlayers[cid],pSelf->m_apPlayers[cid1]) && compare_players(pSelf->m_apPlayers[cid],pSelf->m_apPlayers[cid2]))
|| (compare_players(pSelf->m_apPlayers[cid],pSelf->m_apPlayers[cid1]) && cid2==cid)) || (compare_players(pSelf->m_apPlayers[cid],pSelf->m_apPlayers[cid1]) && cid2==cid))
{ {
CCharacter* chr = pSelf->m_apPlayers[cid1]->GetCharacter(); CCharacter* chr = pSelf->GetPlayerChar(cid1);
if(chr) if(chr)
{ {
chr->m_Core.m_Pos = pSelf->m_apPlayers[cid2]->m_ViewPos; chr->m_Core.m_Pos = pSelf->m_apPlayers[cid2]->m_ViewPos;
@ -1435,9 +1429,7 @@ void CGameContext::ConTimer(IConsole::IResult *pResult, void *pUserData, int cid
int cid1 = clamp(pResult->GetInteger(0), 0, (int)MAX_CLIENTS-1); int cid1 = clamp(pResult->GetInteger(0), 0, (int)MAX_CLIENTS-1);
int type = pResult->GetInteger(1); int type = pResult->GetInteger(1);
CPlayer* pl = pSelf->m_apPlayers[cid1]; CCharacter* chr = pSelf->GetPlayerChar(cid1);
if(pl != 0) {
CCharacter* chr = pl->GetCharacter();
if (!chr) if (!chr)
return; return;
if (type>1 || type<0) if (type>1 || type<0)
@ -1458,7 +1450,6 @@ void CGameContext::ConTimer(IConsole::IResult *pResult, void *pUserData, int cid
} }
serv->SendRconLine(cid1, buf); serv->SendRconLine(cid1, buf);
} }
}
} else { } else {
serv->SendRconLine(cid, "Command timer does't allowed"); serv->SendRconLine(cid, "Command timer does't allowed");
@ -1473,7 +1464,7 @@ void CGameContext::ConTimerReset(IConsole::IResult *pResult, void *pUserData, in
int cid1 = clamp(pResult->GetInteger(0), 0, (int)MAX_CLIENTS-1); int cid1 = clamp(pResult->GetInteger(0), 0, (int)MAX_CLIENTS-1);
CCharacter* chr = pSelf->m_apPlayers[cid1]->GetCharacter(); CCharacter* chr = pSelf->GetPlayerChar(cid1);
if (!chr) if (!chr)
return; return;
chr->m_StartTime = pSelf->Server()->Tick(); chr->m_StartTime = pSelf->Server()->Tick();

2
src/game/server/score.cpp
View file

@ -146,7 +146,7 @@ std::list<std::string> CScore::Top5Draw(int id, int debut) //Thanks nevi
if (i->m_Score-((int)i->m_Score/60)*60 != 0) if (i->m_Score-((int)i->m_Score/60)*60 != 0)
oss << i->m_Score-((int)i->m_Score/60)*60 <<" "; oss << i->m_Score-((int)i->m_Score/60)*60 <<" ";
res.push_back(oss.str().c_str()); res.push_back(oss.str());
} }
pos++; pos++;
} }