Merge remote branch 'origin/master' into fruitiex/balance

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / w_common.qc

diff --git a/qcsrc/server/w_common.qc b/qcsrc/server/w_common.qc
index b453918ce3e2bcb426052620edc9e134451f9cd9..320ffb7507e6173714af897ba43ab4ed917316bb 100644 (file)
--- a/qcsrc/server/w_common.qc
+++ b/qcsrc/server/w_common.qc
@@ -322,9 +322,9 @@ void W_BallisticBullet_Touch (void)
        // matching shaders:
        //   common/weapclip (intended)
        //   common/noimpact (is supposed to eat projectiles, but is erased farther above)
-       if(trace_dphitq3surfaceflags
-               &  (Q3SURFACEFLAG_NONSOLID | Q3SURFACEFLAG_NODRAW | Q3SURFACEFLAG_TRANS)
-               == (                         Q3SURFACEFLAG_NODRAW | Q3SURFACEFLAG_TRANS))
+       if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NODRAW)
+       if not(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NONSOLID)
+       if not(trace_dphitcontents & DPCONTENTS_OPAQUE)
        {
                remove(self);
                return;