Merge branch 'master' into sev/luma_hud_vehicles

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / miscfunctions.qc

diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc
index d2c5d83ed69f2f5cc985fb3539d579d361f4c031..845a5641067df16b639e047090b8b03b98e452f9 100644 (file)
--- a/qcsrc/client/miscfunctions.qc
+++ b/qcsrc/client/miscfunctions.qc
@@ -1,45 +1,18 @@
 #include "miscfunctions.qh"
+#include "_all.qh"
 
-#include "../common/urllib.qh"
+#include "hud.qh"
+#include "sortlist.qh"
 
 #include "../common/command/generic.qh"
 
-void defer_think()
-{
-    entity oself;
-
-    oself           = self;
-    self            = self.owner;
-    oself.think     = SUB_Remove;
-    oself.nextthink = time;
-
-    oself.use();
-}
-
-/*
-    Execute func() after time + fdelay.
-    self when func is executed = self when defer is called
-*/
-void defer(float fdelay, void() func)
-{
-    entity e;
-
-    e           = spawn();
-    e.classname = "defer";
-    e.owner     = self;
-    e.use       = func;
-    e.think     = defer_think;
-    e.nextthink = time + fdelay;
-}
+#include "../common/teams.qh"
+#include "../common/urllib.qh"
+#include "../common/util.qh"
 
-void defer_clear(entity ent)
-{
-       entity e;
-       for(e = world; (e = find(e, classname, "defer")); )
-               if(e.owner == ent)
-                       remove(e);
-}
+#include "../csqcmodellib/cl_model.qh"
 
+#include "../warpzonelib/mathlib.qh"
 
 void AuditLists()
 {
@@ -386,11 +359,11 @@ void PolyDrawModel(entity e)
                        break;
 }
 
-void DrawCircleClippedPic(vector centre, float radius, string pic, float f, vector rgb, float a, float drawflag)
+void DrawCircleClippedPic(vector centre, float radi, string pic, float f, vector rgb, float a, float drawflag)
 {
        float x, y, q, d;
        vector ringsize, v, t;
-       ringsize = radius * '1 1 0';
+       ringsize = radi * '1 1 0';
 
        x = cos(f * 2 * M_PI);
        y = sin(f * 2 * M_PI);