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 bug still exists idk why, stopping ddrace going to work -.-"

Browse source 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
This commit is contained in:
GreYFoXGTi 2010-08-31 10:26:47 +02:00
parent e363e7170c
commit 3c0cfb73a4
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -39,8 +39,9 @@ bool CDoor::HitCharacter()
Hit = 0;
for(int i=0;i<38;i++)
{
Points[i].x = m_Pos.x * (1 - (i/38.0)) + m_To.x * (i / 38.0);
Points[i].y = m_Pos.y * (1 - (i/38.0)) + m_To.y * (i / 38.0);
Points[i].x = m_Pos.x * (1 - (i/37.0)) + m_To.x * (i / 37.0);
Points[i].y = m_Pos.y * (1 - (i/37.0)) + m_To.y * (i / 37.0);
//if(i == 0 || i == 37 || i == 19) dbg_msg("CLight","(%d)\nPos(%f,%f)\nTo(%f,%f)\nPoint(%f,%f)",i,m_Pos.x,m_Pos.y,m_To.x,m_To.y,Points[i].x,Points[i].y);
}
for(int i = 0; i < 38; i++)
{
@ -48,10 +49,10 @@ bool CDoor::HitCharacter()
if(Hit)
Hit->m_Doored = true;
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, At, 0);
if(Hit)
Hit->m_Doored = true;
Hit = 0;
Hit = 0;*/
}
}
return true;

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

@ -36,8 +36,9 @@ bool CLight::HitCharacter()
Hit = 0;
for(int i=0;i<38;i++)
{
Points[i].x = m_Pos.x * (1 - (i/38.0)) + m_To.x * (i / 38.0);
Points[i].y = m_Pos.y * (1 - (i/38.0)) + m_To.y * (i / 38.0);
Points[i].x = m_Pos.x * (1 - (i/37.0)) + m_To.x * (i / 37.0);
Points[i].y = m_Pos.y * (1 - (i/37.0)) + m_To.y * (i / 37.0);
//if(i == 0 || i == 37 || i == 19) dbg_msg("CLight","(%d)\nPos(%f,%f)\nTo(%f,%f)\nPoint(%f,%f)",i,m_Pos.x,m_Pos.y,m_To.x,m_To.y,Points[i].x,Points[i].y);
}
for(int i = 0; i < 38; i++)
{
@ -45,10 +46,10 @@ bool CLight::HitCharacter()
if(Hit)
Hit->Freeze(Server()->TickSpeed()*3);
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, At, 0);
if(Hit)
Hit->Freeze(Server()->TickSpeed()*3);
Hit = 0;
Hit = 0;*/
}
}
return true;