diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2010-06-03 17:40:01 +0200 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2010-06-03 17:40:01 +0200 |
| commit | a6ab379e67f712524635cac1c8131314933b8f59 (patch) | |
| tree | 53da9c897c9dc08933e9e9dfb6ba4ce447e4a4ac /src/game/server/gamemodes/ctf.cpp | |
| parent | 9bb6fe48c29ace974d55b1b1119fa7e7a385266c (diff) | |
| download | zcatch-a6ab379e67f712524635cac1c8131314933b8f59.tar.gz zcatch-a6ab379e67f712524635cac1c8131314933b8f59.zip | |
fixed so that the same distance is used when leaving off the flag and taking it
Diffstat (limited to 'src/game/server/gamemodes/ctf.cpp')
| -rw-r--r-- | src/game/server/gamemodes/ctf.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game/server/gamemodes/ctf.cpp b/src/game/server/gamemodes/ctf.cpp index 05eb973e..37e603ef 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) < CFlag::ms_PhysSize + CCharacter::ms_PhysSize) { // 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, 32.0f, (CEntity**)apCloseCCharacters, MAX_CLIENTS, NETOBJTYPE_CHARACTER); + int Num = GameServer()->m_World.FindEntities(F->m_Pos, CFlag::ms_PhysSize, (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)) @@ -199,7 +199,7 @@ void CGameControllerCTF::Tick() else { F->m_Vel.y += GameServer()->m_World.m_Core.m_Tuning.m_Gravity; - GameServer()->Collision()->MoveBox(&F->m_Pos, &F->m_Vel, vec2(F->m_PhysSize, F->m_PhysSize), 0.5f); + GameServer()->Collision()->MoveBox(&F->m_Pos, &F->m_Vel, vec2(F->ms_PhysSize, F->ms_PhysSize), 0.5f); } } } @@ -211,7 +211,7 @@ CFlag::CFlag(CGameWorld *pGameWorld, int Team) : CEntity(pGameWorld, NETOBJTYPE_FLAG) { m_Team = Team; - m_ProximityRadius = m_PhysSize; + m_ProximityRadius = ms_PhysSize; m_pCarryingCharacter = 0x0; m_GrabTick = 0; |