Merge branch 'marin-t/bot-badcvar' into 'master'

[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 706e10d9e249135e73764dcda180f4f0ac8519f3..4cb8a3806c6883f32cb8550abc9388eda50cef5a 100644 (file)
--- a/qcsrc/server/pathlib/main.qc
+++ b/qcsrc/server/pathlib/main.qc
@@ -1,7 +1,10 @@
 #include "main.qh"
 
+#include <server/defs.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)
@@ -28,9 +31,7 @@ void dumpnode(entity n)
 }
 
 #if DEBUGPATHING
-void pathlib_showpath(entity start);
-void pathlib_showpath2(entity path);
-void pathlib_showsquare(vector where,float goodsquare,float _lifetime);
+#include "debug.qh"
 #endif
 
 
@@ -288,7 +289,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;