Brand new panel to display left time for important items to respawn in the map

[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 a908353a4c93b1c5a3116285cb2764c44e429f38..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
@@ -391,12 +409,7 @@ void tracebox_antilag_force_wz (entity source, vector v1, vector mi, vector ma,
                // take players back into the past
                FOR_EACH_PLAYER(player)
                        if(player != forent)
-                       {
-                           antilag_takeback(player, time - lag);
-                           if(player.vehicle)
-                    antilag_takeback(player.vehicle, time - lag);
-                       }
-                               
+                               antilag_takeback(player, time - lag);
        }
 
        // do the trace
@@ -410,12 +423,7 @@ void tracebox_antilag_force_wz (entity source, vector v1, vector mi, vector ma,
        {
                FOR_EACH_PLAYER(player)
                        if(player != forent)
-                       {
-                           antilag_restore(player);
-                           if(player.vehicle)
-                    antilag_restore(player.vehicle);
-                       }
-                               
+                               antilag_restore(player);
        }
 
        // restore shooter solid type