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

flag collision fixes

Browse Source 
* extend pickup collision radius over full height
* make flags collide with plclips

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6883 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
sireus
2012-09-21 23:14:34 +00:00
parent 98d17a20eb
commit 473f58c7de
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/physics.cpp
+1 -1
View File
@@ -117,7 +117,7 @@ bool mmcollide(physent *d, float &hi, float &lo) // collide with a map
{
entity &e = ents[i];
// if(e.type==CLIP || (e.type == PLCLIP && d->type == ENT_PLAYER))
if (e.type==CLIP || (e.type == PLCLIP && (d->type == ENT_BOT || d->type == ENT_PLAYER))) // don't allow bots to hack themselves into plclips - Bukz 2011/04/14
if (e.type==CLIP || (e.type == PLCLIP && (d->type == ENT_BOT || d->type == ENT_PLAYER || (d->type == ENT_BOUNCE && ((bounceent *)d)->plclipped)))) // don't allow bots to hack themselves into plclips - Bukz 2011/04/14
{
if(fabs(e.x-d->o.x) < e.attr2 + d->radius && fabs(e.y-d->o.y) < e.attr3 + d->radius)
{