Merge master into qc_physics_prehax (blame TimePath if it's completely broken)

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

diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc
index 70ec94db4683167f83ecb7865edb9293db85ce3c..845a5641067df16b639e047090b8b03b98e452f9 100644 (file)
--- a/qcsrc/client/miscfunctions.qc
+++ b/qcsrc/client/miscfunctions.qc
@@ -1,16 +1,18 @@
 #include "miscfunctions.qh"
+#include "_all.qh"
+
+#include "hud.qh"
+#include "sortlist.qh"
+
+#include "../common/command/generic.qh"
 
 #include "../common/teams.qh"
 #include "../common/urllib.qh"
 #include "../common/util.qh"
-#include "../common/command/generic.qh"
+
 #include "../csqcmodellib/cl_model.qh"
+
 #include "../warpzonelib/mathlib.qh"
-#include "autocvars.qh"
-#include "defs.qh"
-#include "hud.qh"
-#include "main.qh"
-#include "sortlist.qh"
 
 void AuditLists()
 {
@@ -357,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);