From: Rudolf Polzer Date: Fri, 19 Nov 2010 21:28:53 +0000 (+0100) Subject: fix latest fix X-Git-Tag: xonotic-v0.1.0preview~116^2~3 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9d89eb5827559439b32735cf64ce99cc3bcb8ab0;p=xonotic%2Fxonotic-data.pk3dir.git fix latest fix --- diff --git a/qcsrc/server/extensions.qh b/qcsrc/server/extensions.qh index da45d6d43..feb60217a 100644 --- a/qcsrc/server/extensions.qh +++ b/qcsrc/server/extensions.qh @@ -1806,7 +1806,7 @@ float Q3SURFACEFLAG_LADDER = 8; // climbable surface float Q3SURFACEFLAG_NOIMPACT = 16; // projectiles should remove themselves on impact (this is set on sky) float Q3SURFACEFLAG_NOMARKS = 32; // projectiles should not leave marks, such as decals (this is set on sky) float Q3SURFACEFLAG_FLESH = 64; // projectiles should do a fleshy effect (blood?) on impact -//float Q3SURFACEFLAG_NODRAW = 128; // compiler hint (not important to qc) +float Q3SURFACEFLAG_NODRAW = 128; // compiler hint (not important to qc) //float Q3SURFACEFLAG_HINT = 256; // compiler hint (not important to qc) //float Q3SURFACEFLAG_SKIP = 512; // compiler hint (not important to qc) //float Q3SURFACEFLAG_NOLIGHTMAP = 1024; // compiler hint (not important to qc) diff --git a/qcsrc/server/w_common.qc b/qcsrc/server/w_common.qc index b453918ce..320ffb750 100644 --- 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;