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

abide by the rules for reference objects

Browse Source
This commit is contained in:
Frank LENORMAND
2015-07-18 00:51:00 +02:00
committed by ac-stef
parent 577d6a00d2
commit 3ec0b1218d
9 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/weapon.cpp
+4 -4
View File
@@ -330,11 +330,11 @@ int intersect(playerent *d, const vec &from, const vec &to, vec *end)
bool intersect(entity *e, const vec &from, const vec &to, vec *end)
{
mapmodelinfo &mmi = getmminfo(e->attr2);
if(!&mmi || !mmi.h) return false;
mapmodelinfo *mmi = getmminfo(e->attr2);
if(!mmi || !mmi->h) return false;
float lo = float(S(e->x, e->y)->floor+mmi.zoff+e->attr3);
return intersectbox(vec(e->x, e->y, lo+mmi.h/2.0f), vec(mmi.rad, mmi.rad, mmi.h/2.0f), from, to, end);
float lo = float(S(e->x, e->y)->floor + mmi->zoff + e->attr3);
return intersectbox(vec(e->x, e->y, lo + mmi->h / 2.0f), vec(mmi->rad, mmi->rad, mmi->h / 2.0f), from, to, end);
}
playerent *intersectclosest(const vec &from, const vec &to, const playerent *at, float &bestdist, int &hitzone, bool aiming = true)