kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cylinder endcap fixes

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4273 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2009-03-16 15:16:52 +00:00
parent 7b3eb8700f
commit 74fd154656
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/weapon.cpp
+2 -2
View File
@@ -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;
}