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

diff --git a/qcsrc/server/weapons/tracing.qc b/qcsrc/server/weapons/tracing.qc
index 506bb43c408b847393bd13216a0e79c066130db6..b42ffb469fb9122bffdc02ea1d00456f4aa6afbc 100644 (file)
--- a/qcsrc/server/weapons/tracing.qc
+++ b/qcsrc/server/weapons/tracing.qc
@@ -349,6 +349,13 @@ void fireBullet(entity this, .entity weaponentity, vector start, vector dir, flo
        float solid_penetration_left = 1;
        float total_damage = 0;
 
+       if(max_solid_penetration >= 50)
+               fireBullet_trace_callback_eff = EFFECT_RIFLE;
+       else if(max_solid_penetration < 50)
+               fireBullet_trace_callback_eff = EFFECT_RIFLE_WEAK;
+       else
+               fireBullet_trace_callback_eff = EFFECT_BULLET;
+
        float lag = ((IS_REAL_CLIENT(this)) ? ANTILAG_LATENCY(this) : 0);
        if(lag < 0.001)
                lag = 0;