yquake2/xatrix
0
0
Fork 0
mirror of https://github.com/yquake2/xatrix.git synced 2024-11-10 06:42:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Prevent dead bodies from obstructing elevators and falling through them

Browse source
This commit is contained in:
BjossiAlfreds 2022-09-30 15:15:05 +00:00
parent 8fb33ee9fd
commit 1a197b09a6
1 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/g_phys.c
View file

@ -35,15 +35,18 @@
edict_t *
SV_TestEntityPosition(edict_t *ent)
{
trace_t trace;
int mask;
if (!ent)
{
return NULL;
}
trace_t trace;
int mask;
if (ent->clipmask)
/* dead bodies are supposed to not be solid so lets
ensure they only collide with BSP during pushmoves
*/
if (ent->clipmask && !(ent->svflags & SVF_MONSTER))
{
mask = ent->clipmask;
}
@ -52,12 +55,8 @@ SV_TestEntityPosition(edict_t *ent)
mask = MASK_SOLID;
}
trace = gi.trace(ent->s.origin,
ent->mins,
ent->maxs,
ent->s.origin,
ent,
mask);
trace = gi.trace(ent->s.origin, ent->mins, ent->maxs,
ent->s.origin, ent, mask);
if (trace.startsolid)
{
@ -505,6 +504,17 @@ retry:
trace = gi.trace(start, ent->mins, ent->maxs, end, ent, mask);
/* startsolid treats different-content volumes
as continuous, like the bbox of a monster/player
and the floor of an elevator. So do another trace
that only collides with BSP so that we make a best
effort to keep these entities inside non-solid space
*/
if (trace.startsolid && (mask & ~MASK_SOLID))
{
trace = gi.trace (start, ent->mins, ent->maxs, end, ent, MASK_SOLID);
}
VectorCopy(trace.endpos, ent->s.origin);
gi.linkentity(ent);