Merge branch 'master' into Mario/vaporizer_damage

[xonotic/xonotic-data.pk3dir.git] / qcsrc / warpzonelib / mathlib.qc

diff --git a/qcsrc/warpzonelib/mathlib.qc b/qcsrc/warpzonelib/mathlib.qc
index c9cde9072c34210fb2f387f137569dfa35f71d9e..f61712d2322dc8436b7bd0675ee1a32103f87ba1 100644 (file)
--- a/qcsrc/warpzonelib/mathlib.qc
+++ b/qcsrc/warpzonelib/mathlib.qc
@@ -1,11 +1,10 @@
+#include "mathlib.qh"
 #if defined(CSQC)
        #include "../dpdefs/csprogsdefs.qh"
-    #include "mathlib.qh"
 #elif defined(MENUQC)
 #elif defined(SVQC)
-       #include "../dpdefs/progsdefs.qh"
     #include "../dpdefs/dpextensions.qh"
-    #include "mathlib.qh"
+       #include "../dpdefs/progsdefs.qh"
 #endif
 
 int fpclassify(float x)
@@ -95,6 +94,10 @@ float ldexp(float x, int e)
 {
        return x * pow(2, e);
 }
+float logn(float x, float base)
+{
+       return log(x) / log(base);
+}
 float log10(float x)
 {
        return log(x) * M_LOG10E;