Merge branch 'master' into samual/weapons

[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 75cf5b1d4c8fa016a07c4cabc6426a6253a9b9da..755ab59e593e4906319debced03fd205fb16ca8e 100644 (file)
--- a/qcsrc/server/weapons/tracing.qc
+++ b/qcsrc/server/weapons/tracing.qc
@@ -353,9 +353,13 @@ void fireBullet(vector start, vector dir, float spread, float max_solid_penetrat
        if(autocvar_g_antilag == 0 || self.cvar_cl_noantilag)
                lag = 0; // only do hitscan, but no antilag
        if(lag)
        if(autocvar_g_antilag == 0 || self.cvar_cl_noantilag)
                lag = 0; // only do hitscan, but no antilag
        if(lag)

+       {

                FOR_EACH_PLAYER(pl)
                        if(pl != self)
                                antilag_takeback(pl, time - lag);
                FOR_EACH_PLAYER(pl)
                        if(pl != self)
                                antilag_takeback(pl, time - lag);

+               FOR_EACH_MONSTER(pl)
+                       antilag_takeback(pl, time - lag);
+       }

 
        WarpZone_trace_forent = self;
 
 
        WarpZone_trace_forent = self;
 


@@ -456,7 +460,11 @@ void fireBullet(vector start, vector dir, float spread, float max_solid_penetrat
        }
 
        if(lag)
        }
 
        if(lag)

+       {

                FOR_EACH_PLAYER(pl)
                        if(pl != self)
                                antilag_restore(pl);
                FOR_EACH_PLAYER(pl)
                        if(pl != self)
                                antilag_restore(pl);

+               FOR_EACH_MONSTER(pl)
+                       antilag_restore(pl);
+       }

 }
 }