Moved sv_force_ent_intersection in REHLDS_FIXES

This commit is contained in:
WPMGPRoSToTeMa 2016-02-04 01:26:04 +03:00
parent 30a97dfaab
commit 5cfe0d3d4b
2 changed files with 5 additions and 1 deletions

View File

@ -7217,8 +7217,8 @@ void SV_Init(void)
Cvar_RegisterVariable(&sv_downloadurl);
Cvar_RegisterVariable(&sv_version);
Cvar_RegisterVariable(&sv_allow_dlfile);
Cvar_RegisterVariable(&sv_force_ent_intersection);
#ifdef REHLDS_FIXES
Cvar_RegisterVariable(&sv_force_ent_intersection);
Cvar_RegisterVariable(&sv_echo_unknown_cmd);
#endif

View File

@ -1220,7 +1220,11 @@ void SV_ClipToLinks(areanode_t *node, moveclip_t *clip)
&& clip->boxmaxs[0] >= touch->v.absmin[0]
&& clip->boxmaxs[1] >= touch->v.absmin[1]
&& clip->boxmaxs[2] >= touch->v.absmin[2]
#ifdef REHLDS_FIXES
&& ((touch->v.solid == SOLID_SLIDEBOX && sv_force_ent_intersection.string[0] == '0')
#else // REHLDS_FIXES
&& (touch->v.solid == SOLID_SLIDEBOX
#endif // REHLDS_FIXES
|| SV_CheckSphereIntersection(touch, clip->start, clip->end))
&& (!clip->passedict || clip->passedict->v.size[0] == 0.0f || touch->v.size[0] != 0.0f))
{