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

*** empty log message ***

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1262 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2007-08-19 07:43:15 +00:00
parent 26ac1a3d72
commit 1907d6ecff
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/weapon.cpp
+3 -3
View File
@@ -199,7 +199,7 @@ playerent *intersectclosest(vec &from, vec &to, playerent *at)
loopv(players)
{
playerent *o = players[i];
if(!o || o==at || o->state!=CS_ALIVE) continue;
if(!o || o==at || o->state!=CS_ALIVE || (o->type==ENT_PLAYER && !o->lastupdate)) continue;
if(!intersect(o, from, to)) continue;
float dist = at->o.dist(o->o);
if(dist<bestdist)
@@ -296,7 +296,7 @@ float expdist(playerent *o, vec &dir, const vec &v)
void radialeffect(playerent *o, vec &v, int qdam, playerent *at, int gun)
{
if(o->state!=CS_ALIVE) return;
if(o->state!=CS_ALIVE || (o!=player1 && o->type==ENT_PLAYER && !o->lastupdate)) return;
vec dir;
float dist = expdist(o, dir, v);
if(dist<EXPDAMRAD)
@@ -333,7 +333,7 @@ void splash(projectile &p, vec &v, vec &vold, playerent *notthis, int qdam)
bool projdamage(playerent *o, projectile &p, vec &v, int qdam)
{
if(o->state!=CS_ALIVE || !intersect(o, p.o, v)) return false;
if(o->state!=CS_ALIVE || (o!=player1 && o->type==ENT_PLAYER && !o->lastupdate) || !intersect(o, p.o, v)) return false;
splash(p, v, p.o, o, qdam);
vec dir;
expdist(o, dir, v);