reHLDS/rehlds
2
0
Fork 0
mirror of https://github.com/rehlds/rehlds.git synced 2024-12-29 08:05:50 +03:00
Code Issues Projects Releases Wiki Activity

Revert: sv_force_ent_intersection

Browse Source
This commit is contained in:
s1lent 2017-12-15 00:54:56 +07:00
parent 2d85358e7e
commit 690296605f
No known key found for this signature in database
GPG Key ID: 0FE401DC73916B5C
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rehlds/engine/sv_phys.cpp
View File

@ -434,13 +434,7 @@ trace_t SV_PushEntity(edict_t *ent, vec_t *push)
if (trace.fraction != 0.0f) if (trace.fraction != 0.0f)
{ {
#ifdef REHLDS_FIXES VectorCopy(trace.endpos, ent->v.origin);
// don't move in the direction, since this is a dead end
if (!trace.startsolid && !trace.allsolid)
#endif
{
VectorCopy(trace.endpos, ent->v.origin);
}
} }
SV_LinkEdict(ent, TRUE); SV_LinkEdict(ent, TRUE);

11
rehlds/engine/world.cpp
View File

@ -1221,8 +1221,15 @@ void SV_ClipToLinks(areanode_t *node, moveclip_t *clip)
|| clip->boxmaxs[2] < touch->v.absmin[2]) || clip->boxmaxs[2] < touch->v.absmin[2])
continue; continue;
if (touch->v.solid != SOLID_SLIDEBOX && !SV_CheckSphereIntersection(touch, clip->start, clip->end)) if (touch->v.solid != SOLID_SLIDEBOX
continue; #ifdef REHLDS_FIXES
|| sv_force_ent_intersection.value
#endif
)
{
if (!SV_CheckSphereIntersection(touch, clip->start, clip->end))
continue;
}
if (clip->passedict && clip->passedict->v.size[0] && !touch->v.size[0]) if (clip->passedict && clip->passedict->v.size[0] && !touch->v.size[0])
continue; // points never interact continue; // points never interact