Merge remote-tracking branch 'origin/terencehill/g_changeteam_banned_fix'

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

diff --git a/qcsrc/server/g_subs.qc b/qcsrc/server/g_subs.qc
index e9f9b3454e18ef0151812464e7ce7aabecabf6b9..a331da4f0961676e43a7d0ab90f76b6059322861 100644 (file)
--- a/qcsrc/server/g_subs.qc
+++ b/qcsrc/server/g_subs.qc
@@ -71,6 +71,24 @@ vector animfixfps(entity e, vector a)
        return a;
 }
 
+vector animfixfps2(entity e, vector a, vector b)
+{
+       // multi-frame anim: keep as-is
+       float dur;
+       dur = frameduration(e.modelindex, a_x);
+       if(dur <= 0)
+       {
+               a = b;
+               dur = frameduration(e.modelindex, a_x);
+       }
+       if(a_y == 1)
+       {
+               if(dur > 0)
+                       a_z = 1.0 / dur;
+       }
+       return a;
+}
+
 /*
 ==================
 SUB_Remove
@@ -389,12 +407,9 @@ void tracebox_antilag_force_wz (entity source, vector v1, vector mi, vector ma,
        if (lag)
        {
                // take players back into the past
-               player = player_list;
-               while (player)
-               {
-                       antilag_takeback(player, time - lag);
-                       player = player.nextplayer;
-               }
+               FOR_EACH_PLAYER(player)
+                       if(player != forent)
+                               antilag_takeback(player, time - lag);
        }
 
        // do the trace
@@ -406,12 +421,9 @@ void tracebox_antilag_force_wz (entity source, vector v1, vector mi, vector ma,
        // restore players to current positions
        if (lag)
        {
-               player = player_list;
-               while (player)
-               {
-                       antilag_restore(player);
-                       player = player.nextplayer;
-               }
+               FOR_EACH_PLAYER(player)
+                       if(player != forent)
+                               antilag_restore(player);
        }
 
        // restore shooter solid type