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

fix for ticket #549 by using col_intersect_line

Browse source
This commit is contained in:
scosu 2008-11-04 07:20:24 +00:00
parent 12127c0acd
commit e1807ea08a
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -115,7 +115,8 @@ void GAMECONTROLLER_CTF::tick()
int num = game.world.find_entities(f->pos, 32.0f, (ENTITY**)close_characters, MAX_CLIENTS, NETOBJTYPE_CHARACTER);
for(int i = 0; i < num; i++)
{
if(close_characters[i]->team == f->team)
int collision = col_intersect_line(f->pos, close_characters[i]->pos, NULL);
if(!collision && close_characters[i]->team == f->team)
{
// return the flag
if(!f->at_stand)
@ -131,7 +132,7 @@ void GAMECONTROLLER_CTF::tick()
f->reset();
}
}
else
else if(!collision)
{
// take the flag
if(f->at_stand)