Merge branch 'martin-t/okc3' into martin-t/master

diff --git a/qcsrc/server/weapons/tracing.qc b/qcsrc/server/weapons/tracing.qc
index bf272a01a94e02d75041436a36b2c7ce1846ddad..d9643bfff3257d79217ab881a2107f788ddb3baa 100644 (file)
--- a/qcsrc/server/weapons/tracing.qc
+++ b/qcsrc/server/weapons/tracing.qc
@@ -343,9 +343,9 @@ void fireBullet(entity this, .entity weaponentity, vector start, vector dir, flo
        float solid_penetration_left = 1;
        float total_damage = 0;
 
-       if(tracereffects & EF_RED)
+       if(max_solid_penetration >= 50)
                fireBullet_trace_callback_eff = EFFECT_RIFLE;
-       else if(tracereffects & EF_BLUE)
+       else if(max_solid_penetration < 50)
                fireBullet_trace_callback_eff = EFFECT_RIFLE_WEAK;
        else
                fireBullet_trace_callback_eff = EFFECT_BULLET;