From 91198ee376b50407f773bee2f8126b10d414cbb3 Mon Sep 17 00:00:00 2001 From: GreYFoXGTi Date: Sat, 21 Aug 2010 21:14:57 +0200 Subject: [PATCH] i really need to sleep xD Signed-off-by: GreYFoXGTi --- src/game/collision.cpp | 4 ++-- src/game/server/entities/dragger.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/game/collision.cpp b/src/game/collision.cpp index 2a9dd882d..0af005bf2 100644 --- a/src/game/collision.cpp +++ b/src/game/collision.cpp @@ -262,7 +262,7 @@ int CCollision::IntersectLine(vec2 Pos0, vec2 Pos1, vec2 *pOutCollision, vec2 *p 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); vec2 Last = Pos0; @@ -288,7 +288,7 @@ int CCollision::IntersectNoLaserNW(vec2 Pos0, vec2 Pos1, vec2 *pOutCollision, ve 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); vec2 Last = Pos0; diff --git a/src/game/server/entities/dragger.cpp b/src/game/server/entities/dragger.cpp index 4d6d17bca..63ead884c 100644 --- a/src/game/server/entities/dragger.cpp +++ b/src/game/server/entities/dragger.cpp @@ -35,9 +35,9 @@ void CDragger::move() target = ents[i]; int res=0; if (!nw) - res = GameServer()->Collision()->IntersectNoLaserNW(m_Pos, target->m_Pos, 0, 0); - else res = GameServer()->Collision()->IntersectNoLaser(m_Pos, target->m_Pos, 0, 0); + else + res = GameServer()->Collision()->IntersectNoLaserNW(m_Pos, target->m_Pos, 0, 0); if (res==0) { @@ -66,9 +66,9 @@ void CDragger::drag() int res = 0; if (!nw) - res = GameServer()->Collision()->IntersectNoLaserNW(m_Pos, target->m_Pos, 0, 0); - else res = GameServer()->Collision()->IntersectNoLaser(m_Pos, target->m_Pos, 0, 0); + else + res = GameServer()->Collision()->IntersectNoLaserNW(m_Pos, target->m_Pos, 0, 0); if (res || length(m_Pos-target->m_Pos)>700) { target=0;