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

Flag catch and capture should now be exactly the same

Browse source
This commit is contained in:
Fujnky 2010-06-03 16:42:37 +02:00
parent 00c53adffb
commit feb8894b4d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/game/server/gamemodes/ctf.cpp
View file

@ -105,7 +105,7 @@ void CGameControllerCTF::Tick()
if(m_apFlags[fi^1] && m_apFlags[fi^1]->m_AtStand) if(m_apFlags[fi^1] && m_apFlags[fi^1]->m_AtStand)
{ {
if(distance(F->m_Pos, m_apFlags[fi^1]->m_Pos) < 32) if(distance(F->m_Pos, m_apFlags[fi^1]->m_Pos) < 28)
{ {
// CAPTURE! \o/ // CAPTURE! \o/
m_aTeamscore[fi^1] += 100; m_aTeamscore[fi^1] += 100;
@ -136,7 +136,7 @@ void CGameControllerCTF::Tick()
else else
{ {
CCharacter *apCloseCCharacters[MAX_CLIENTS]; CCharacter *apCloseCCharacters[MAX_CLIENTS];
int Num = GameServer()->m_World.FindEntities(F->m_Pos, 16.0f, (CEntity**)apCloseCCharacters, MAX_CLIENTS, NETOBJTYPE_CHARACTER); int Num = GameServer()->m_World.FindEntities(F->m_Pos, 7.0f, (CEntity**)apCloseCCharacters, MAX_CLIENTS, NETOBJTYPE_CHARACTER);
for(int i = 0; i < Num; i++) for(int i = 0; i < Num; i++)
{ {
if(!apCloseCCharacters[i]->IsAlive() || apCloseCCharacters[i]->GetPlayer()->GetTeam() == -1 || GameServer()->Collision()->IntersectLine(F->m_Pos, apCloseCCharacters[i]->m_Pos, NULL, NULL)) if(!apCloseCCharacters[i]->IsAlive() || apCloseCCharacters[i]->GetPlayer()->GetTeam() == -1 || GameServer()->Collision()->IntersectLine(F->m_Pos, apCloseCCharacters[i]->m_Pos, NULL, NULL))