diff options
| author | Fujnky <larsfunke1996@gmail.com> | 2010-06-03 16:42:37 +0200 |
|---|---|---|
| committer | Fujnky <larsfunke1996@gmail.com> | 2010-06-03 16:42:37 +0200 |
| commit | feb8894b4de2aac05b9118402257082c1bcb78ad (patch) | |
| tree | d9dcb8cf9cddbf7f1451d19b9d6964d1d8892a66 /src/game/server/gamemodes | |
| parent | 00c53adffb047e7f791b0bf3e3c3e4768bee87cc (diff) | |
| download | zcatch-feb8894b4de2aac05b9118402257082c1bcb78ad.tar.gz zcatch-feb8894b4de2aac05b9118402257082c1bcb78ad.zip | |
Flag catch and capture should now be exactly the same
Diffstat (limited to 'src/game/server/gamemodes')
| -rw-r--r-- | src/game/server/gamemodes/ctf.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/server/gamemodes/ctf.cpp b/src/game/server/gamemodes/ctf.cpp index 000beae0..c1585912 100644 --- a/src/game/server/gamemodes/ctf.cpp +++ b/src/game/server/gamemodes/ctf.cpp @@ -105,7 +105,7 @@ void CGameControllerCTF::Tick() 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/ m_aTeamscore[fi^1] += 100; @@ -136,7 +136,7 @@ void CGameControllerCTF::Tick() else { 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++) { if(!apCloseCCharacters[i]->IsAlive() || apCloseCCharacters[i]->GetPlayer()->GetTeam() == -1 || GameServer()->Collision()->IntersectLine(F->m_Pos, apCloseCCharacters[i]->m_Pos, NULL, NULL)) |