From 5cfe0d3d4b256088d52d37dabaade1ad2762b99a Mon Sep 17 00:00:00 2001
From: WPMGPRoSToTeMa <wpmgprostotema@live.ru>
Date: Thu, 4 Feb 2016 01:26:04 +0300
Subject: [PATCH] Moved sv_force_ent_intersection in REHLDS_FIXES

---
 rehlds/engine/sv_main.cpp | 2 +-
 rehlds/engine/world.cpp   | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/rehlds/engine/sv_main.cpp b/rehlds/engine/sv_main.cpp
index 39ceb04..7691918 100644
--- a/rehlds/engine/sv_main.cpp
+++ b/rehlds/engine/sv_main.cpp
@@ -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
 	
diff --git a/rehlds/engine/world.cpp b/rehlds/engine/world.cpp
index 3346736..a0517e9 100644
--- a/rehlds/engine/world.cpp
+++ b/rehlds/engine/world.cpp
@@ -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))
 		{