From 4f7c5f7f9057bb4e6b45b8abf38c1dfb2d5bfb12 Mon Sep 17 00:00:00 2001 From: havoc Date: Mon, 31 Oct 2011 07:56:24 +0000 Subject: [PATCH] undo the SUPERCONTENTS_SKY change, it should not be treated as solid, instead the q1bsp loader should set SUPERCONTENTS_SOLID git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11497 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=810b6b66b320540975f28d0bbe3e12445014ca30 --- 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 b0e59961..68298630 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 | SUPERCONTENTS_SKY; + return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_MONSTERCLIP; else - return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_PLAYERCLIP | SUPERCONTENTS_SKY; + return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_PLAYERCLIP; } else if (PRVM_clientedictfloat(passedict, solid) == SOLID_CORPSE) - return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_SKY; + return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY; else if (PRVM_clientedictfloat(passedict, solid) == SOLID_TRIGGER) - return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_SKY; + return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY; else - return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_CORPSE | SUPERCONTENTS_SKY; + return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_CORPSE; } else - return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_CORPSE | SUPERCONTENTS_SKY; + return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_CORPSE; } /* diff --git a/sv_phys.c b/sv_phys.c index 3a50de9b..db9b4fa0 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 | SUPERCONTENTS_SKY; + return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_MONSTERCLIP; else - return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_PLAYERCLIP | SUPERCONTENTS_SKY; + return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_PLAYERCLIP; } else if (PRVM_serveredictfloat(passedict, solid) == SOLID_CORPSE) - return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_SKY; + return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY; else if (PRVM_serveredictfloat(passedict, solid) == SOLID_TRIGGER) - return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_SKY; + return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY; else - return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_CORPSE | SUPERCONTENTS_SKY; + return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_CORPSE; } else - return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_CORPSE | SUPERCONTENTS_SKY; + return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_CORPSE; } /* -- 2.39.2