Enclose IsInWorld changes with FIXES macro

rehlds · Oct 30, 2023 · ec82ccb · ec82ccb
1 parent b0acc61
commit ec82ccb
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/regamedll/dlls/cbase.cpp b/regamedll/dlls/cbase.cpp
@@ -865,13 +865,9 @@ BOOL CBaseEntity::IsInWorld()
 		return FALSE;
 	}
 
+	// speed
 #ifdef REGAMEDLL_FIXES
 	double maxvel = g_psv_maxvelocity->value;
-#else
-	double maxvel = 2000.0;
-#endif
-
-	// speed
 	if (pev->velocity.x > maxvel || pev->velocity.y > maxvel || pev->velocity.z > maxvel)
 	{
 		return FALSE;
@@ -880,6 +876,16 @@ BOOL CBaseEntity::IsInWorld()
 	{
 		return FALSE;
 	}
+#else
+	if (pev->velocity.x >= 2000.0 || pev->velocity.y >= 2000.0 || pev->velocity.z >= 2000.0)
+	{
+		return FALSE;
+	}
+	if (pev->velocity.x <= -2000.0 || pev->velocity.y <= -2000.0 || pev->velocity.z <= -2000.0)
+	{
+		return FALSE;
+	}
+#endif
 
 	return TRUE;
 }