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

separated X and Y radius for clip entities

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3189 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2008-10-22 11:08:15 +00:00
parent cc3f3c5f62
commit c828c70bb1
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/physics.cpp
+2 -3
View File
@@ -116,10 +116,9 @@ bool mmcollide(physent *d, float &hi, float &lo) // collide with a map
entity &e = ents[i];
if(e.type==CLIP)
{
const float r = e.attr2 + d->radius;
if(fabs(e.x-d->o.x)<r && fabs(e.y-d->o.y)<r)
if(fabs(e.x-d->o.x) < e.attr2 + d->radius && fabs(e.y-d->o.y) < e.attr3 + d->radius)
{
const float cz = float(S(e.x, e.y)->floor+e.attr1), ch = max(float(e.attr3), 1.0f);
const float cz = float(S(e.x, e.y)->floor+e.attr1), ch = float(e.attr4);
const float dz = d->o.z-d->eyeheight;
if(dz<cz) { if(cz<hi) hi = cz; }
else if(cz+ch>lo) lo = cz+ch;