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

The calculation is accurate i still don't know why this happens

Browse source 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
This commit is contained in:
GreYFoXGTi 2010-08-31 09:47:41 +02:00
parent 3f9839188d
commit 558b03c9e3
2 changed files with 12 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/game/server/entities/door.cpp
View file

@ -34,42 +34,25 @@ bool CDoor::HitCharacter()
CCharacter *Hit = GameServer()->m_World.IntersectCharacter(m_Pos, m_To, 1.f, At, 0); CCharacter *Hit = GameServer()->m_World.IntersectCharacter(m_Pos, m_To, 1.f, At, 0);
if(Hit) if(Hit)
{ {
vec2 Points[36];
Hit->m_Doored = true; Hit->m_Doored = true;
vec2 Points[38];
Hit = 0; Hit = 0;
for(int i=1;i<=36;i++) for(int i=0;i<38;i++)
{ {
Points[i-1].x = m_Pos.x * (1 - i/38.0) + m_To.x * i / 38.0; Points[i].x = m_Pos.x * (1 - (i/38.0)) + m_To.x * (i / 38.0);
Points[i-1].y = m_Pos.y * (1 - i/38.0) + m_To.y * i / 38.0; Points[i].y = m_Pos.y * (1 - (i/38.0)) + m_To.y * (i / 38.0);
} }
CCharacter *Hit = GameServer()->m_World.IntersectCharacter(m_Pos, Points[0], 1.f, At, 0); for(int i = 0; i < 38; i++)
if(Hit)
Hit->m_Doored = true;
Hit = 0;
Hit = GameServer()->m_World.IntersectCharacter(Points[0], m_Pos, 1.f, At, 0);
if(Hit)
Hit->m_Doored = true;
Hit = 0;
for(int i = 0; i < 36; i++)
{ {
Hit = GameServer()->m_World.IntersectCharacter(Points[i], Points[i+1], 1.f, At, 0); Hit = GameServer()->m_World.IntersectCharacter(Points[i], Points[i+1], 1.f, At, 0);
if(Hit) if(Hit)
Hit->m_Doored = true; Hit->m_Doored = true;
Hit = 0; Hit = 0;
Hit = GameServer()->m_World.IntersectCharacter(Points[i+1], Points[i], 1.f, At, 0); Hit = GameServer()->m_World.IntersectCharacter(Points[i+1], Points[i], 1.f, At2, 0);
if(Hit) if(Hit)
Hit->m_Doored = true; Hit->m_Doored = true;
Hit = 0; Hit = 0;
} }
Hit = GameServer()->m_World.IntersectCharacter(Points[35], m_To, 1.f, At, 0);
if(Hit)
Hit->m_Doored = true;
Hit = 0;
Hit = GameServer()->m_World.IntersectCharacter(m_To, Points[35], 1.f, At, 0);
if(Hit)
Hit->m_Doored = true;
Hit = 0;
//hit->reset_pos();
} }
return true; return true;
} }

29
src/game/server/entities/light.cpp
View file

@ -31,44 +31,27 @@ bool CLight::HitCharacter()
CCharacter *Hit = GameServer()->m_World.IntersectCharacter(m_Pos, m_To, 1.f, At, 0); CCharacter *Hit = GameServer()->m_World.IntersectCharacter(m_Pos, m_To, 1.f, At, 0);
if(Hit) if(Hit)
{ {
vec2 Points[36];
Hit->Freeze(Server()->TickSpeed()*3); Hit->Freeze(Server()->TickSpeed()*3);
vec2 Points[38];
Hit = 0; Hit = 0;
for(int i=1;i<37;i++) for(int i=0;i<38;i++)
{ {
Points[i-1].x = m_Pos.x * (1 - i/38.0) + m_To.x * i / 38.0; Points[i].x = m_Pos.x * (1 - (i/38.0)) + m_To.x * (i / 38.0);
Points[i-1].y = m_Pos.y * (1 - i/38.0) + m_To.y * i / 38.0; Points[i].y = m_Pos.y * (1 - (i/38.0)) + m_To.y * (i / 38.0);
} }
Hit = GameServer()->m_World.IntersectCharacter(m_Pos, Points[0], 1.f, At, 0); for(int i = 0; i < 38; i++)
if(Hit)
Hit->Freeze(Server()->TickSpeed()*3);
Hit = 0;
Hit = GameServer()->m_World.IntersectCharacter(Points[0], m_Pos, 1.f, At, 0);
if(Hit)
Hit->Freeze(Server()->TickSpeed()*3);
Hit = 0;
for(int i = 0; i < 36; i++)
{ {
Hit = GameServer()->m_World.IntersectCharacter(Points[i], Points[i+1], 1.f, At, 0); Hit = GameServer()->m_World.IntersectCharacter(Points[i], Points[i+1], 1.f, At, 0);
if(Hit) if(Hit)
Hit->Freeze(Server()->TickSpeed()*3); Hit->Freeze(Server()->TickSpeed()*3);
Hit = 0; Hit = 0;
Hit = GameServer()->m_World.IntersectCharacter(Points[i+1], Points[i], 1.f, At, 0); Hit = GameServer()->m_World.IntersectCharacter(Points[i+1], Points[i], 1.f, At2, 0);
if(Hit) if(Hit)
Hit->Freeze(Server()->TickSpeed()*3); Hit->Freeze(Server()->TickSpeed()*3);
Hit = 0; Hit = 0;
} }
Hit = GameServer()->m_World.IntersectCharacter(Points[35], m_To, 1.f, At, 0);
if(Hit)
Hit->Freeze(Server()->TickSpeed()*3);
Hit = 0;
Hit = GameServer()->m_World.IntersectCharacter(m_To, Points[35], 1.f, At, 0);
if(Hit)
Hit->Freeze(Server()->TickSpeed()*3);
Hit = 0;
} }
return true; return true;
} }
void CLight::Move() void CLight::Move()