undo the SUPERCONTENTS_SKY change, it should not be treated as solid,
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Mon, 31 Oct 2011 07:56:24 +0000 (07:56 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Mon, 31 Oct 2011 07:56:24 +0000 (07:56 +0000)
instead the q1bsp loader should set SUPERCONTENTS_SOLID

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11497 d7cf8633-e32d-0410-b094-e92efae38249

cl_collision.c
sv_phys.c

index 3283bc6..1fc448d 100644 (file)
@@ -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;
 }
 
 /*
index b30ec49..94624f3 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;
 }
 
 /*