From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sat, 29 Oct 2011 07:27:10 +0000 (+0000)
Subject: let traces hit sky by default, don't know why this wasn't in
X-Git-Tag: xonotic-v0.6.0~205
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3d8b9ffcb4055d2e9f77dfc7dc5f29fe1d82f854;p=xonotic%2Fdarkplaces.git

let traces hit sky by default, don't know why this wasn't in

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11487 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=50f9c996dedd089ca65ae38bc2439ee67a189412
---

diff --git a/cl_collision.c b/cl_collision.c
index 68298630..b0e59961 100644
--- a/cl_collision.c
+++ b/cl_collision.c
@@ -205,19 +205,19 @@ int CL_GenericHitSuperContentsMask(const prvm_edict_t *passedict)
 		else if (PRVM_clientedictfloat(passedict, solid) == SOLID_SLIDEBOX)
 		{
 			if ((int)PRVM_clientedictfloat(passedict, flags) & FL_MONSTER)
-				return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_MONSTERCLIP;
+				return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_MONSTERCLIP | SUPERCONTENTS_SKY;
 			else
-				return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_PLAYERCLIP;
+				return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_PLAYERCLIP | SUPERCONTENTS_SKY;
 		}
 		else if (PRVM_clientedictfloat(passedict, solid) == SOLID_CORPSE)
-			return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY;
+			return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_SKY;
 		else if (PRVM_clientedictfloat(passedict, solid) == SOLID_TRIGGER)
-			return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY;
+			return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_SKY;
 		else
-			return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_CORPSE;
+			return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_CORPSE | SUPERCONTENTS_SKY;
 	}
 	else
-		return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_CORPSE;
+		return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_CORPSE | SUPERCONTENTS_SKY;
 }
 
 /*
diff --git a/sv_phys.c b/sv_phys.c
index db9b4fa0..3a50de9b 100644
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -79,19 +79,19 @@ int SV_GenericHitSuperContentsMask(const prvm_edict_t *passedict)
 		else if (PRVM_serveredictfloat(passedict, solid) == SOLID_SLIDEBOX)
 		{
 			if ((int)PRVM_serveredictfloat(passedict, flags) & FL_MONSTER)
-				return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_MONSTERCLIP;
+				return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_MONSTERCLIP | SUPERCONTENTS_SKY;
 			else
-				return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_PLAYERCLIP;
+				return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_PLAYERCLIP | SUPERCONTENTS_SKY;
 		}
 		else if (PRVM_serveredictfloat(passedict, solid) == SOLID_CORPSE)
-			return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY;
+			return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_SKY;
 		else if (PRVM_serveredictfloat(passedict, solid) == SOLID_TRIGGER)
-			return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY;
+			return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_SKY;
 		else
-			return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_CORPSE;
+			return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_CORPSE | SUPERCONTENTS_SKY;
 	}
 	else
-		return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_CORPSE;
+		return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_CORPSE | SUPERCONTENTS_SKY;
 }
 
 /*