From 577ade081b3ee1eeaa943469edbe300812804254 Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Sun, 18 Jul 2010 22:20:48 +0000 Subject: [PATCH] intersectcylinder fixes git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5429 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/weapon.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp index 969702d0..b0123ceb 100644 --- a/source/src/weapon.cpp +++ b/source/src/weapon.cpp @@ -238,16 +238,14 @@ static inline bool intersectcylinder(const vec &from, const vec &to, const vec & if(offset < 0) { if(nd <= 0) return false; - float cdist = -md / nd; - if(k + cdist*(2*mn + cdist*nn) <= 0) dist = cdist; - else if(c <= 0) return false; + dist = -md / nd; + if(k + dist*(2*mn + dist*nn) > 0) return false; } else if(offset > dd) { if(nd >= 0) return false; - float cdist = (dd - md) / nd; - if(k + dd - 2*md + cdist*(2*(mn-nd) + cdist*nn) <= 0) dist = cdist; - else if(c <= 0) return false; + dist = (dd - md) / nd; + if(k + dd - 2*md + dist*(2*(mn-nd) + dist*nn) > 0) return false; } return dist >= 0 && dist <= 1; }