ubergames/ioef
0
0
Fork 0
mirror of https://github.com/UberGames/ioef.git synced 2024-11-24 13:11:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Adds Z checking to CanDamage function.

Browse source
This commit is contained in:
Tobias Kuehnhammer 2013-02-11 16:02:01 -06:00 committed by Zack Middleton
parent ac621642ac
commit 2147f2b7c2
1 changed files with 65 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
code/game/g_combat.c
View file

@ -1060,6 +1060,8 @@ qboolean CanDamage (gentity_t *targ, vec3_t origin) {
vec3_t dest; vec3_t dest;
trace_t tr; trace_t tr;
vec3_t midpoint; vec3_t midpoint;
vec3_t offsetmins = {-15, -15, -15};
vec3_t offsetmaxs = {15, 15, 15};
// use the midpoint of the bounds instead of the origin, because // use the midpoint of the bounds instead of the origin, because
// bmodels may have their origin is 0,0,0 // bmodels may have their origin is 0,0,0
@ -1068,39 +1070,83 @@ qboolean CanDamage (gentity_t *targ, vec3_t origin) {
VectorCopy(midpoint, dest); VectorCopy(midpoint, dest);
trap_Trace(&tr, origin, vec3_origin, vec3_origin, dest, ENTITYNUM_NONE, MASK_SOLID); trap_Trace(&tr, origin, vec3_origin, vec3_origin, dest, ENTITYNUM_NONE, MASK_SOLID);
if (tr.fraction == 1.0 || tr.entityNum == targ->s.number) if (tr.fraction == 1.0 || tr.entityNum == targ->s.number)
return qtrue; return qtrue;
// this should probably check in the plane of projection, // this should probably check in the plane of projection,
// rather than in world coordinate, and also include Z // rather than in world coordinate
VectorCopy(midpoint, dest); VectorCopy(midpoint, dest);
dest[0] += 15.0; dest[0] += offsetmaxs[0];
dest[1] += 15.0; dest[1] += offsetmaxs[1];
dest[2] += offsetmaxs[2];
trap_Trace(&tr, origin, vec3_origin, vec3_origin, dest, ENTITYNUM_NONE, MASK_SOLID); trap_Trace(&tr, origin, vec3_origin, vec3_origin, dest, ENTITYNUM_NONE, MASK_SOLID);
if (tr.fraction == 1.0) if (tr.fraction == 1.0)
return qtrue; return qtrue;
VectorCopy(midpoint, dest); VectorCopy(midpoint, dest);
dest[0] += 15.0; dest[0] += offsetmaxs[0];
dest[1] -= 15.0; dest[1] += offsetmins[1];
dest[2] += offsetmaxs[2];
trap_Trace(&tr, origin, vec3_origin, vec3_origin, dest, ENTITYNUM_NONE, MASK_SOLID); trap_Trace(&tr, origin, vec3_origin, vec3_origin, dest, ENTITYNUM_NONE, MASK_SOLID);
if (tr.fraction == 1.0) if (tr.fraction == 1.0)
return qtrue; return qtrue;
VectorCopy(midpoint, dest); VectorCopy(midpoint, dest);
dest[0] -= 15.0; dest[0] += offsetmins[0];
dest[1] += 15.0; dest[1] += offsetmaxs[1];
dest[2] += offsetmaxs[2];
trap_Trace(&tr, origin, vec3_origin, vec3_origin, dest, ENTITYNUM_NONE, MASK_SOLID); trap_Trace(&tr, origin, vec3_origin, vec3_origin, dest, ENTITYNUM_NONE, MASK_SOLID);
if (tr.fraction == 1.0) if (tr.fraction == 1.0)
return qtrue; return qtrue;
VectorCopy(midpoint, dest); VectorCopy(midpoint, dest);
dest[0] -= 15.0; dest[0] += offsetmins[0];
dest[1] -= 15.0; dest[1] += offsetmins[1];
dest[2] += offsetmaxs[2];
trap_Trace(&tr, origin, vec3_origin, vec3_origin, dest, ENTITYNUM_NONE, MASK_SOLID); trap_Trace(&tr, origin, vec3_origin, vec3_origin, dest, ENTITYNUM_NONE, MASK_SOLID);
if (tr.fraction == 1.0) if (tr.fraction == 1.0)
return qtrue; return qtrue;
VectorCopy(midpoint, dest);
dest[0] += offsetmaxs[0];
dest[1] += offsetmaxs[1];
dest[2] += offsetmins[2];
trap_Trace(&tr, origin, vec3_origin, vec3_origin, dest, ENTITYNUM_NONE, MASK_SOLID);
if (tr.fraction == 1.0)
return qtrue;
VectorCopy(midpoint, dest);
dest[0] += offsetmaxs[0];
dest[1] += offsetmins[1];
dest[2] += offsetmins[2];
trap_Trace(&tr, origin, vec3_origin, vec3_origin, dest, ENTITYNUM_NONE, MASK_SOLID);
if (tr.fraction == 1.0)
return qtrue;
VectorCopy(midpoint, dest);
dest[0] += offsetmins[0];
dest[1] += offsetmaxs[1];
dest[2] += offsetmins[2];
trap_Trace(&tr, origin, vec3_origin, vec3_origin, dest, ENTITYNUM_NONE, MASK_SOLID);
if (tr.fraction == 1.0)
return qtrue;
VectorCopy(midpoint, dest);
dest[0] += offsetmins[0];
dest[1] += offsetmins[2];
dest[2] += offsetmins[2];
trap_Trace(&tr, origin, vec3_origin, vec3_origin, dest, ENTITYNUM_NONE, MASK_SOLID);
if (tr.fraction == 1.0)
return qtrue;
return qfalse; return qfalse;
} }