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

why do i always forget to press crtl+s

Browse source 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
This commit is contained in:
GreYFoXGTi 2010-08-21 20:26:39 +02:00
parent 0c93fe13fe
commit 341746441e
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/game/collision.cpp
View file

@ -267,7 +267,7 @@ int CCollision::IntersectLine(vec2 Pos0, vec2 Pos1, vec2 *pOutCollision, vec2 *p
return 0; return 0;
} }
int CCollision::IntersectNoLaser(vec2 Pos0, vec2 Pos1, vec2 *pOutCollision, vec2 *pOutBeforeCollision) int CCollision::IntersectNoLaserNW(vec2 Pos0, vec2 Pos1, vec2 *pOutCollision, vec2 *pOutBeforeCollision)
{ {
float d = distance(Pos0, Pos1); float d = distance(Pos0, Pos1);
vec2 Last = Pos0; vec2 Last = Pos0;
@ -293,7 +293,7 @@ int CCollision::IntersectNoLaser(vec2 Pos0, vec2 Pos1, vec2 *pOutCollision, vec2
return 0; return 0;
} }
int CCollision::IntersectNoLaserNW(vec2 Pos0, vec2 Pos1, vec2 *pOutCollision, vec2 *pOutBeforeCollision) int CCollision::IntersectNoLaser(vec2 Pos0, vec2 Pos1, vec2 *pOutCollision, vec2 *pOutBeforeCollision)
{ {
float d = distance(Pos0, Pos1); float d = distance(Pos0, Pos1);
vec2 Last = Pos0; vec2 Last = Pos0;

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

@ -35,9 +35,9 @@ void CDragger::move()
target = ents[i]; target = ents[i];
int res=0; int res=0;
if (!nw) if (!nw)
res = GameServer()->Collision()->IntersectNoLaser(m_Pos, target->m_Pos, 0, 0);
else
res = GameServer()->Collision()->IntersectNoLaserNW(m_Pos, target->m_Pos, 0, 0); res = GameServer()->Collision()->IntersectNoLaserNW(m_Pos, target->m_Pos, 0, 0);
else
res = GameServer()->Collision()->IntersectNoLaser(m_Pos, target->m_Pos, 0, 0);
if (res==0) if (res==0)
{ {
@ -66,9 +66,9 @@ void CDragger::drag()
int res = 0; int res = 0;
if (!nw) if (!nw)
res = GameServer()->Collision()->IntersectNoLaser(m_Pos, target->m_Pos, 0, 0);
else
res = GameServer()->Collision()->IntersectNoLaserNW(m_Pos, target->m_Pos, 0, 0); res = GameServer()->Collision()->IntersectNoLaserNW(m_Pos, target->m_Pos, 0, 0);
else
res = GameServer()->Collision()->IntersectNoLaser(m_Pos, target->m_Pos, 0, 0);
if (res || length(m_Pos-target->m_Pos)>700) if (res || length(m_Pos-target->m_Pos)>700)
{ {
target=0; target=0;