Merge branch 'master' into Mario/killsound

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

diff --git a/qcsrc/lib/warpzone/mathlib.qc b/qcsrc/lib/warpzone/mathlib.qc
index 868724fa8656bc0e7299e792316ee132ed289712..acbc1c61d4dda0f69cb0d256467f16bc2808cb07 100644 (file)
--- a/qcsrc/lib/warpzone/mathlib.qc
+++ b/qcsrc/lib/warpzone/mathlib.qc
@@ -63,11 +63,11 @@ float tanh(float e)
 
 float exp(float e)
 {
-       return pow(M_E, e);
+       return (M_E ** e);
 }
 float exp2(float e)
 {
-       return pow(2, e);
+       return (2 ** e);
 }
 float expm1(float e)
 {
@@ -79,7 +79,7 @@ vector frexp(float e)
        vector v;
        v.z = 0;
        v.y = ilogb(e) + 1;
-       v.x = e / exp2(v.y);
+       v.x = e / (2 ** v.y);
        return v;
 }
 int ilogb(float e)
@@ -88,7 +88,7 @@ int ilogb(float e)
 }
 float ldexp(float e, int e)
 {
-       return e * pow(2, e);
+       return e * (2 ** e);
 }
 float logn(float e, float base)
 {
@@ -117,12 +117,12 @@ vector modf(float f)
 
 float scalbn(float e, int n)
 {
-       return e * pow(2, n);
+       return e * (2 ** n);
 }
 
 float cbrt(float e)
 {
-       return copysign(pow(fabs(e), 1.0/3.0), e);
+       return copysign((fabs(e) ** (1.0/3.0)), e);
 }
 float hypot(float e, float f)
 {
@@ -169,8 +169,7 @@ vector lgamma(float e)
 }
 float tgamma(float e)
 {
-       vector v;
-       v = lgamma(e);
+       vector v = lgamma(e);
        return exp(v.x) * v.y;
 }