Merge branch 'master' into Mario/qc_updates

[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 16937cf688cde4091688c1ebcf91cc2903f539cf..c3532d3d67a4cf29bde6541827acb005189ca8f0 100644 (file)
--- a/qcsrc/server/weapons/tracing.qc
+++ b/qcsrc/server/weapons/tracing.qc
@@ -1,8 +1,8 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-       #include "../../dpdefs/progsdefs.qc"
-    #include "../../dpdefs/dpextensions.qc"
+       #include "../../dpdefs/progsdefs.qh"
+    #include "../../dpdefs/dpextensions.qh"
     #include "../../warpzonelib/common.qh"
     #include "../../common/constants.qh"
     #include "../../common/util.qh"
@@ -76,7 +76,7 @@ void W_SetupShot_Dir_ProjectileSize_Range(entity ent, vector s_forward, vector m
 
        //vector prevdir = w_shotdir;
        //vector prevorg = w_shotorg;
-       //vector prevend = w_shotend; 
+       //vector prevend = w_shotend;
 
        if (antilag)
        if (!ent.cvar_cl_noantilag)
@@ -173,9 +173,9 @@ void W_SetupProjVelocity_Explicit(entity proj, vector dir, vector upDir, float p
        }
        mspercallsum -= gettime(GETTIME_HIRES);
        #endif
-       
+
        dir = W_CalculateSpread(dir, spread, g_weaponspreadfactor, autocvar_g_projectiles_spread_style);
-       
+
        #if 0
        mspercallsum += gettime(GETTIME_HIRES);
        mspercallcount += 1;
@@ -341,7 +341,7 @@ void fireBullet_trace_callback(vector start, vector hit, vector end)
        fireBullet_last_hit = world;
 }
 
-void fireBullet(vector start, vector dir, float spread, float max_solid_penetration, float damage, float force, float dtype, float tracereffects)
+void fireBullet(vector start, vector dir, float spread, float max_solid_penetration, float damage, float force, float dtype, int tracereffects)
 {
        vector  end;
 
@@ -378,7 +378,7 @@ void fireBullet(vector start, vector dir, float spread, float max_solid_penetrat
 
        WarpZone_trace_forent = self;
 
-       for(0;;)
+       for (;;)
        {
                // TODO also show effect while tracing
                WarpZone_TraceBox_ThroughZone(start, '0 0 0', '0 0 0', end, false, WarpZone_trace_forent, world, fireBullet_trace_callback);