edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Draggers seems works

Browse source
This commit is contained in:
btd 2010-09-22 21:36:13 +04:00
parent 71dd366a49
commit a00e8a76b1
1 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/game/server/entities/dragger.cpp
View file

@ -27,23 +27,19 @@ void CDragger::Move()
if (m_Target)
return;
CCharacter *Ents[16];
int Num = -1;
Num = GameServer()->m_World.FindEntities(m_Pos,LENGTH, (CEntity**)Ents, 16, NETOBJTYPE_CHARACTER);
int Num = GameServer()->m_World.FindEntities(m_Pos,LENGTH, (CEntity**)Ents, 16, NETOBJTYPE_CHARACTER);
int Id=-1;
int MinLen=0;
for (int i = 0; i < Num; i++)
{
m_Target = Ents[i];
if(m_Target->Team() != m_CatchedTeam) continue;
int Res=0;
if (!m_NW)
Res = GameServer()->Collision()->IntersectNoLaser(m_Pos, m_Target->m_Pos, 0, 0);
else
Res = GameServer()->Collision()->IntersectNoLaserNW(m_Pos, m_Target->m_Pos, 0, 0);
int Res = m_NW ? GameServer()->Collision()->IntersectNoLaserNW(m_Pos, m_Target->m_Pos, 0, 0) :
GameServer()->Collision()->IntersectNoLaser(m_Pos, m_Target->m_Pos, 0, 0);
if (Res==0)
{
int Len=length(Ents[i]->m_Pos - m_Pos);
int Len=length(m_Target->m_Pos - m_Pos);
if (MinLen==0 || MinLen>Len)
{
MinLen=Len;
@ -51,14 +47,7 @@ void CDragger::Move()
}
}
}
if (Id!=-1)
{
m_Target = Ents[Id];
}
else
{
m_Target=0;
}
m_Target = Id != -1 ? Ents[Id] : 0;
}
void CDragger::Drag()