From 74fd15465668b33e89715b2a8545714e07ed1c60 Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Mon, 16 Mar 2009 15:16:52 +0000 Subject: [PATCH] cylinder endcap fixes git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4273 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/weapon.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp index 852e593e..e224c3e1 100644 --- a/source/src/weapon.cpp +++ b/source/src/weapon.cpp @@ -214,13 +214,13 @@ static inline bool intersectcylinder(const vec &from, const vec &to, const vec & { if(nd < 0) return false; dist = -md / nd; - return k + dist*(2*mn + dist*nn) <= 0; + if(k + dist*(2*mn + dist*nn) > 0) return false; } else if(offset > dd) { if(nd >= 0) return false; dist = (dd - md) / nd; - return k + dd - 2*md + dist*(2*(mn-nd) + dist*nn) <= 0; + if(k + dd - 2*md + dist*(2*(mn-nd) + dist*nn) > 0) return false; } return dist >= 0 && dist <= 1; }