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

diff --git a/cl_collision.c b/cl_collision.c
index 3283bc61f49f951a82e5056f303781512072be27..1fc448da57d7300560b7c512c8ecce4c5c000554 100644 (file)
--- 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 | 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 b30ec499cdff11375624394f475efa96b8dfb65d..94624f3f3017f4cb58ee0409691df733c7be55c3 100644 (file)
--- 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 | 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;
 }
 
 /*