Merge branch 'master' into TimePath/modules

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

diff --git a/qcsrc/server/weapons/tracing.qc b/qcsrc/server/weapons/tracing.qc
index a12ea2d9e181cfac81a2841b90781fc91a34b6f7..176b69e6b6c9e5f720f2dfc09fb9af13367c1ff8 100644 (file)
--- a/qcsrc/server/weapons/tracing.qc
+++ b/qcsrc/server/weapons/tracing.qc
@@ -12,7 +12,7 @@
 #include <common/constants.qh>
 #include <common/util.qh>
 
-#include <common/weapons/all.qh>
+#include <common/weapons/_all.qh>
 #include <common/state.qh>
 
 #include <lib/warpzone/common.qh>
@@ -478,6 +478,7 @@ void fireBullet(entity this, vector start, vector dir, float spread, float max_s
                // fraction_used_of_what_is_left = dist_taken / maxdist
                // solid_penetration_left = solid_penetration_left - solid_penetration_left * fraction_used_of_what_is_left
                solid_penetration_left *= 1 - dist_taken / maxdist;
+               solid_penetration_left = max(solid_penetration_left, 0);
 
                // Only show effect when going through a player (invisible otherwise)
                if (hit && (hit.solid != SOLID_BSP))