Merge branch 'master' into Lyberta/WaypointIcons

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

diff --git a/qcsrc/server/pathlib/main.qc b/qcsrc/server/pathlib/main.qc
index 1aeae109c34610f31e05c6a6e174f684d2223e9f..b42e5ef688ec39f2e1879adc8966b0819e61102d 100644 (file)
--- a/qcsrc/server/pathlib/main.qc
+++ b/qcsrc/server/pathlib/main.qc
@@ -1,9 +1,11 @@
 #include "main.qh"
 
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/miscfunctions.qh>
 #include "pathlib.qh"
 #include "utility.qh"
+#include <common/turrets/util.qh>
 #include "../command/common.qh"
 
 void pathlib_deletepath(entity start)
@@ -288,7 +290,7 @@ void pathlib_cleanup()
 
 float Cosine_Interpolate(float a, float b, float c)
 {
-       float ft = c * 3.1415927;
+       float ft = c * M_PI;
        float f = (1 - cos(ft)) * 0.5;
 
        return a*(1-f) + b*f;