From 50f9c996dedd089ca65ae38bc2439ee67a189412 Mon Sep 17 00:00:00 2001 From: havoc Date: Sat, 29 Oct 2011 07:27:10 +0000 Subject: [PATCH] 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 --- cl_collision.c | 12 ++++++------ sv_phys.c | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cl_collision.c b/cl_collision.c index 1fc448da..3283bc61 100644 --- a/cl_collision.c +++ b/cl_collision.c @@ -208,19 +208,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 d1de5a39..26cb627a 100644 --- a/sv_phys.c +++ b/sv_phys.c @@ -81,19 +81,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; } /* -- 2.39.2