Revert "s/EXP/POW"

This reverts commit fd32dde2a91fb757d8a3e1d74be60462a3200118.

diff --git a/qcsrc/client/hud/panel/physics.qc b/qcsrc/client/hud/panel/physics.qc
index f58b442bcf8e7f34dd65e010dc2c7c7841484a8a..a480674c9b2205f3645dee85713224a4283c0ee2 100644 (file)
--- a/qcsrc/client/hud/panel/physics.qc
+++ b/qcsrc/client/hud/panel/physics.qc
@@ -89,7 +89,7 @@ void HUD_Physics()
        if(time > physics_update_time)
        {
                // workaround for ftos_decimals returning a negative 0
-               if(discrete_acceleration > -1 / POW(10, acc_decimals) && discrete_acceleration < 0)
+               if(discrete_acceleration > -1 / EXP(10, acc_decimals) && discrete_acceleration < 0)
                        discrete_acceleration = 0;
                discrete_acceleration = acceleration;
                discrete_speed = speed;

diff --git a/qcsrc/client/hud/panel/score.qc b/qcsrc/client/hud/panel/score.qc
index d4abbe0c55752ea4a7b94cde006a818fda75145f..3371c2a22ef6ac69547f907d7c67c76a8791ee56 100644 (file)
--- a/qcsrc/client/hud/panel/score.qc
+++ b/qcsrc/client/hud/panel/score.qc
@@ -184,7 +184,7 @@ void HUD_Score()
                        // distribution display
                        distribution = me.(scores(ps_primary)) - pl.(scores(ps_primary));
 
-                       distrtimer = ftos_decimals(fabs(distribution/POW(10, TIME_DECIMALS)), TIME_DECIMALS);
+                       distrtimer = ftos_decimals(fabs(distribution/EXP(10, TIME_DECIMALS)), TIME_DECIMALS);
 
                        if (distribution <= 0) {
                                distribution_color = '0 1 0';

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index cf5d4569ee3c944425cbcd45255e8f8e69cf0809..b70109d92efe40d4cae1e408314c418dc5c34f0d 100644 (file)
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -518,7 +518,7 @@ vector GetCurrentFov(float fov)
                current_zoomfraction = (current_viewzoom - 1) / (1/zoomfactor - 1);
 
        if(zoomsensitivity < 1)
-               setsensitivityscale(POW(current_viewzoom, (1 - zoomsensitivity)));
+               setsensitivityscale(EXP(current_viewzoom, (1 - zoomsensitivity)));
        else
                setsensitivityscale(1);
 
@@ -1816,7 +1816,7 @@ void CSQC_UpdateView(entity this, float w, float h)
 
                t = (time - blurtest_time0) / (blurtest_time1 - blurtest_time0);
                r = t * blurtest_radius;
-               f = 1 / POW(t, blurtest_power) - 1;
+               f = 1 / EXP(t, blurtest_power) - 1;
 
                cvar_set("r_glsl_postprocess", "1");
                cvar_set("r_glsl_postprocess_uservec1", strcat(ftos(r), " ", ftos(f), " 0 0"));

diff --git a/qcsrc/common/command/rpn.qc b/qcsrc/common/command/rpn.qc
index c02b7cf5afc372c4492e6e1a639ebba8b94877bd..318416058fd3cf7fbd2336d43b6276f33c2efec8 100644 (file)
--- a/qcsrc/common/command/rpn.qc
+++ b/qcsrc/common/command/rpn.qc
@@ -164,7 +164,7 @@ void GenericCommand_rpn(float request, float argc, string command)
                                                rpn_setf(f2 - f * floor(f2 / f));
                                        } else if(rpncmd == "pow" || rpncmd == "**") {
                                                f = rpn_popf();
-                                               rpn_setf(POW(rpn_getf(), f));
+                                               rpn_setf(EXP(rpn_getf(), f));
                                        } else if(rpncmd == "bitand" || rpncmd == "&") {
                                                f = rpn_popf();
                                                rpn_setf(rpn_getf() & f);

diff --git a/qcsrc/common/mutators/mutator/bugrigs/bugrigs.qc b/qcsrc/common/mutators/mutator/bugrigs/bugrigs.qc
index 83d8be1011e4caa09072f9534e6b8f08f01bc591..e4227c49346a9dbdb2a6174dc9839e983be3c5ce 100644 (file)
--- a/qcsrc/common/mutators/mutator/bugrigs/bugrigs.qc
+++ b/qcsrc/common/mutators/mutator/bugrigs/bugrigs.qc
@@ -115,7 +115,7 @@ void RaceCarPhysics(entity this, float dt)
                float upspeed = this.velocity * v_up;
 
                // responsiveness factor for steering and acceleration
-               float f = 1 / (1 + POW((max(-myspeed, myspeed) / PHYS_BUGRIGS_SPEED_REF(this)), PHYS_BUGRIGS_SPEED_POW(this)));
+               float f = 1 / (1 + EXP((max(-myspeed, myspeed) / PHYS_BUGRIGS_SPEED_REF(this)), PHYS_BUGRIGS_SPEED_POW(this)));
                //MAXIMA: f(v) := 1 / (1 + (v / PHYS_BUGRIGS_SPEED_REF(this)) ^ PHYS_BUGRIGS_SPEED_POW(this));
 
                float steerfactor;
@@ -172,7 +172,7 @@ void RaceCarPhysics(entity this, float dt)
                float myspeed = vlen(this.velocity);
 
                // responsiveness factor for steering and acceleration
-               float f = 1 / (1 + POW(max(0, myspeed / PHYS_BUGRIGS_SPEED_REF(this)), PHYS_BUGRIGS_SPEED_POW(this)));
+               float f = 1 / (1 + EXP(max(0, myspeed / PHYS_BUGRIGS_SPEED_REF(this)), PHYS_BUGRIGS_SPEED_POW(this)));
                float steerfactor = -myspeed * f;
                this.angles_y += steer * dt * steerfactor; // apply steering
 

diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc
index c0f0fc2804f084a45688b440a2b19212b478d28c..cb52656edac936d93407cfcf228f71e313c4070b 100644 (file)
--- a/qcsrc/common/mutators/mutator/nades/nades.qc
+++ b/qcsrc/common/mutators/mutator/nades/nades.qc
@@ -577,7 +577,7 @@ void nade_entrap_touch(entity this, entity toucher)
                if(!pushdeltatime) return;
 
                // div0: ticrate independent, 1 = identity (not 20)
-               toucher.velocity = toucher.velocity * POW(autocvar_g_nades_entrap_strength, pushdeltatime);
+               toucher.velocity = toucher.velocity * EXP(autocvar_g_nades_entrap_strength, pushdeltatime);
 
        #ifdef SVQC
                UpdateCSQCProjectile(toucher);

diff --git a/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc b/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc
index 69b82bf26ec682e6dd807150420a8eaebbfb7317..0703fd3a9dd3b7f8247d2a2008e93ba7307a14f2 100644 (file)
--- a/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc
+++ b/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc
@@ -460,7 +460,7 @@ vector fixrgbexcess(vector rgb)
 void Draw_WaypointSprite(entity this)
 {
     if (this.lifetime > 0)
-        this.alpha = POW(bound(0, (this.fadetime - time) / this.lifetime, 1), waypointsprite_timealphaexponent);
+        this.alpha = EXP(bound(0, (this.fadetime - time) / this.lifetime, 1), waypointsprite_timealphaexponent);
     else
         this.alpha = 1;
 
@@ -522,9 +522,9 @@ void Draw_WaypointSprite(entity this)
     float a = this.alpha * autocvar_hud_panel_fg_alpha;
 
     if (this.maxdistance > waypointsprite_normdistance)
-        a *= POW(bound(0, (this.maxdistance - dist) / (this.maxdistance - waypointsprite_normdistance), 1), waypointsprite_distancealphaexponent);
+        a *= EXP(bound(0, (this.maxdistance - dist) / (this.maxdistance - waypointsprite_normdistance), 1), waypointsprite_distancealphaexponent);
     else if (this.maxdistance > 0)
-        a *= POW(bound(0, (waypointsprite_fadedistance - dist) / (waypointsprite_fadedistance - waypointsprite_normdistance), 1), waypointsprite_distancealphaexponent) * (1 - waypointsprite_minalpha) + waypointsprite_minalpha;
+        a *= EXP(bound(0, (waypointsprite_fadedistance - dist) / (waypointsprite_fadedistance - waypointsprite_normdistance), 1), waypointsprite_distancealphaexponent) * (1 - waypointsprite_minalpha) + waypointsprite_minalpha;
 
     vector rgb = spritelookupcolor(this, spriteimage, this.teamradar_color);
     if (rgb == '0 0 0')
@@ -611,7 +611,7 @@ void Draw_WaypointSprite(entity this)
     (vid_conwidth - (vid_conwidth * waypointsprite_edgeoffset_right)) - o.x,
     (vid_conheight - (vid_conheight * waypointsprite_edgeoffset_bottom)) - o.y);
 
-    float crosshairdistance = sqrt(POW((o.x - vid_conwidth/2), 2) + POW((o.y - vid_conheight/2), 2) );
+    float crosshairdistance = sqrt(EXP((o.x - vid_conwidth/2), 2) + EXP((o.y - vid_conheight/2), 2) );
 
     t = waypointsprite_scale;
     a *= waypointsprite_alpha;

diff --git a/qcsrc/common/physics/player.qc b/qcsrc/common/physics/player.qc
index 9b6157ccad47b6361b943667526878a8c43784a4..2647798eafb5dbe7e037819070dd0ccc89875fd2 100644 (file)
--- a/qcsrc/common/physics/player.qc
+++ b/qcsrc/common/physics/player.qc
@@ -92,7 +92,7 @@ float GeomLerp(float a, float _lerp, float b)
 {
        return a == 0 ? (_lerp < 1 ? 0 : b)
                : b == 0 ? (_lerp > 0 ? 0 : a)
-               : a * POW(fabs(b / a), _lerp);
+               : a * EXP(fabs(b / a), _lerp);
 }
 
 void PM_ClientMovement_UpdateStatus(entity this)
@@ -165,7 +165,7 @@ void CPM_PM_Aircontrol(entity this, float dt, vector wishdir, float wishspeed)
 
        if (dot > 0) // we can't change direction while slowing down
        {
-               k *= POW(dot, PHYS_AIRCONTROL_POWER(this)) * dt;
+               k *= EXP(dot, PHYS_AIRCONTROL_POWER(this)) * dt;
                xyspeed = max(0, xyspeed - PHYS_AIRCONTROL_PENALTY(this) * sqrt(max(0, 1 - dot*dot)) * k/32);
                k *= PHYS_AIRCONTROL(this);
                this.velocity = normalize(this.velocity * xyspeed + wishdir * k);

diff --git a/qcsrc/common/triggers/trigger/impulse.qc b/qcsrc/common/triggers/trigger/impulse.qc
index 62793e4707f79eb900859cd2905597dbf5612460..1424da981117607e1f3309d787944d980dce61fe 100644 (file)
--- a/qcsrc/common/triggers/trigger/impulse.qc
+++ b/qcsrc/common/triggers/trigger/impulse.qc
@@ -74,7 +74,7 @@ void trigger_impulse_touch2(entity this, entity toucher)
        if(!pushdeltatime) return;
 
        // div0: ticrate independent, 1 = identity (not 20)
-       toucher.velocity = toucher.velocity * POW(this.strength, pushdeltatime);
+       toucher.velocity = toucher.velocity * EXP(this.strength, pushdeltatime);
 
 #ifdef SVQC
        UpdateCSQCProjectile(toucher);
@@ -181,7 +181,7 @@ spawnfunc(trigger_impulse)
                else
                {
                        if(!this.strength) this.strength = 0.9;
-                       this.strength = POW(this.strength, autocvar_g_triggerimpulse_accel_power) * autocvar_g_triggerimpulse_accel_multiplier;
+                       this.strength = EXP(this.strength, autocvar_g_triggerimpulse_accel_power) * autocvar_g_triggerimpulse_accel_multiplier;
                        settouch(this, trigger_impulse_touch2);
                }
        }

diff --git a/qcsrc/common/turrets/cl_turrets.qc b/qcsrc/common/turrets/cl_turrets.qc
index 5dd9ed9018e24425a893ac87f81ceeb282a9b7d4..ff664e676304c88c6426ab00c4a86b5fdbddd156 100644 (file)
--- a/qcsrc/common/turrets/cl_turrets.qc
+++ b/qcsrc/common/turrets/cl_turrets.qc
@@ -105,9 +105,9 @@ void turret_draw2d(entity this)
 
 
        if(this.maxdistance > waypointsprite_normdistance)
-               a *= POW(bound(0, (this.maxdistance - dist) / (this.maxdistance - waypointsprite_normdistance), 1), waypointsprite_distancealphaexponent);
+               a *= EXP(bound(0, (this.maxdistance - dist) / (this.maxdistance - waypointsprite_normdistance), 1), waypointsprite_distancealphaexponent);
        else if(this.maxdistance > 0)
-               a *= POW(bound(0, (waypointsprite_fadedistance - dist) / (waypointsprite_fadedistance - waypointsprite_normdistance), 1), waypointsprite_distancealphaexponent) * (1 - waypointsprite_minalpha) + waypointsprite_minalpha;
+               a *= EXP(bound(0, (waypointsprite_fadedistance - dist) / (waypointsprite_fadedistance - waypointsprite_normdistance), 1), waypointsprite_distancealphaexponent) * (1 - waypointsprite_minalpha) + waypointsprite_minalpha;
 
        if(rgb == '0 0 0')
        {
@@ -161,7 +161,7 @@ void turret_draw2d(entity this)
        (vid_conwidth - (vid_conwidth * waypointsprite_edgeoffset_right)) - o_x,
        (vid_conheight - (vid_conheight * waypointsprite_edgeoffset_bottom)) - o_y);
 
-       float crosshairdistance = sqrt( POW((o.x - vid_conwidth/2), 2) + POW((o.y - vid_conheight/2), 2) );
+       float crosshairdistance = sqrt( EXP((o.x - vid_conwidth/2), 2) + EXP((o.y - vid_conheight/2), 2) );
 
        t = waypointsprite_scale;
        a *= waypointsprite_alpha;

diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc
index 33835748fca1386d84df363412a2243478ef8fba..8a2c809d306da55ae6152f67989667e544680167 100644 (file)
--- a/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@ -326,7 +326,7 @@ float compressShortVector(vector vec)
 STATIC_INIT(compressShortVector)
 {
        float l = 1;
-       float f = POW(2, (1/8));
+       float f = EXP(2, (1/8));
        int i;
        for(i = 0; i < 128; ++i)
        {

diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc
index 1b2dce6001ccd3e181b4d8b04314a0b8725184b2..381bf0ba8b018a6ad9494fc282bfbfe2b616d0c0 100644 (file)
--- a/qcsrc/common/weapons/all.qc
+++ b/qcsrc/common/weapons/all.qc
@@ -67,11 +67,11 @@ WepSet _WepSet_FromWeapon(int a)
                                if (a >= 24)
                                {
                                        a -= 24;
-                                       return '0 0 1' * POW(2, a);
+                                       return '0 0 1' * EXP(2, a);
                                }
-                       return '0 1 0' * POW(2, a);
+                       return '0 1 0' * EXP(2, a);
                }
-       return '1 0 0' * POW(2, a);
+       return '1 0 0' * EXP(2, a);
 }
 #ifdef SVQC
        void WriteWepSet(float dst, WepSet w)

diff --git a/qcsrc/common/weapons/weapon/crylink.qc b/qcsrc/common/weapons/weapon/crylink.qc
index cf8c17036cd28ab9b9e2b2aa872cfa8a0d782da5..1ad3a7a43bc9d9bebf464fad03c35aea3416fba3 100644 (file)
--- a/qcsrc/common/weapons/weapon/crylink.qc
+++ b/qcsrc/common/weapons/weapon/crylink.qc
@@ -110,9 +110,9 @@ vector W_Crylink_LinkJoin(entity e, float jspeed)
                return avg_origin; // nothing to do
 
        // yes, mathematically we can do this in ONE step, but beware of 32bit floats...
-       avg_dist = POW(vlen(e.origin - avg_origin), 2);
+       avg_dist = EXP(vlen(e.origin - avg_origin), 2);
        for(p = e; (p = p.queuenext) != e; )
-               avg_dist += POW(vlen(WarpZone_RefSys_TransformOrigin(p, e, p.origin) - avg_origin), 2);
+               avg_dist += EXP(vlen(WarpZone_RefSys_TransformOrigin(p, e, p.origin) - avg_origin), 2);
        avg_dist *= (1.0 / n);
        avg_dist = sqrt(avg_dist);
 

diff --git a/qcsrc/common/weapons/weapon/hook.qc b/qcsrc/common/weapons/weapon/hook.qc
index 04383716addb57fa1a9de811db2557aee8a40722..4a217d6f5acd608fcdeecff9ee8a5c769dceb08c 100644 (file)
--- a/qcsrc/common/weapons/weapon/hook.qc
+++ b/qcsrc/common/weapons/weapon/hook.qc
@@ -9,7 +9,7 @@ void W_Hook_ExplodeThink(entity this)
        float dt, dmg_remaining_next, f;
 
        dt = time - this.teleport_time;
-       dmg_remaining_next = POW(bound(0, 1 - dt / this.dmg_duration, 1), this.dmg_power);
+       dmg_remaining_next = EXP(bound(0, 1 - dt / this.dmg_duration, 1), this.dmg_power);
 
        f = this.dmg_last - dmg_remaining_next;
        this.dmg_last = dmg_remaining_next;

diff --git a/qcsrc/common/weapons/weapon/tuba.qc b/qcsrc/common/weapons/weapon/tuba.qc
index 7d46d6d188c33aa8d08cbf694e25ec7d414a656a..6eb6a8215a55742e35ce851fd2921aac1a4b3203 100644 (file)
--- a/qcsrc/common/weapons/weapon/tuba.qc
+++ b/qcsrc/common/weapons/weapon/tuba.qc
@@ -450,23 +450,23 @@ void tubasound(entity e, bool restart)
                                if (restart) {
                                        snd1 = TUBA_STARTNOTE(e.tuba_instrument, e.note - m + Tuba_PitchStep);
                                }
-                               speed1 = POW(2.0, ((m - Tuba_PitchStep) / 12.0));
+                               speed1 = EXP(2.0, ((m - Tuba_PitchStep) / 12.0));
                        } else if (e.note - m + Tuba_PitchStep > TUBA_MAX) {
                                if (restart) {
                                        snd1 = TUBA_STARTNOTE(e.tuba_instrument, e.note - m);
                                }
-                               speed1 = POW(2.0, (m / 12.0));
+                               speed1 = EXP(2.0, (m / 12.0));
                        } else {
                                if (restart) {
                                        snd1 = TUBA_STARTNOTE(e.tuba_instrument, e.note - m);
                                }
                                vol1 = cos(M_PI_2 * m / Tuba_PitchStep);
-                               speed1 = POW(2.0, (m / 12.0));
+                               speed1 = EXP(2.0, (m / 12.0));
                                if (restart) {
                                        snd2 = TUBA_STARTNOTE(e.tuba_instrument, e.note - m + Tuba_PitchStep);
                                }
                                vol2 = sin(M_PI_2 * m / Tuba_PitchStep);
-                               speed2 = POW(2.0, ((m - Tuba_PitchStep) / 12.0));
+                               speed2 = EXP(2.0, ((m - Tuba_PitchStep) / 12.0));
                        }
                } else if (restart) {
                        snd1 = TUBA_STARTNOTE(e.tuba_instrument, e.note);

diff --git a/qcsrc/lib/math.qh b/qcsrc/lib/math.qh
index 00d08bdcd35304bcb9013610c7826d0cc6dfc3d3..3c7ecabe1cf46eac309328fa00b5256ec1735979 100644 (file)
--- a/qcsrc/lib/math.qh
+++ b/qcsrc/lib/math.qh
@@ -4,15 +4,15 @@
 
 // uncrustify doesn't like the ** operator so let's wrap it in this wonderful macro
 // *INDENT-OFF*
-#define POW(a, e) ((a) ** (e))
+#define EXP(a, e) ((a) ** (e))
 // *INDENT-ON*
 
 ERASEABLE
 void mean_accumulate(entity e, .float a, .float c, float mean, float value, float weight)
 {
        if (weight == 0) return;
-       if (mean == 0) e.(a) *= POW(value, weight);
-       else e.(a) += POW(value, mean) * weight;
+       if (mean == 0) e.(a) *= EXP(value, weight);
+       else e.(a) += EXP(value, mean) * weight;
        e.(c) += weight;
 }
 
@@ -20,8 +20,8 @@ ERASEABLE
 float mean_evaluate(entity e, .float a, .float c, float mean)
 {
        if (e.(c) == 0) return 0;
-       if (mean == 0) return POW(e.(a), (1.0 / e.(c)));
-       else return POW((e.(a) / e.(c)), (1.0 / mean));
+       if (mean == 0) return EXP(e.(a), (1.0 / e.(c)));
+       else return EXP((e.(a) / e.(c)), (1.0 / mean));
 }
 
 #define MEAN_ACCUMULATE(s, prefix, v, w) mean_accumulate(s, prefix##_accumulator, prefix##_count, prefix##_mean, v, w)
@@ -215,12 +215,12 @@ float almost_in_bounds(float a, float b, float c)
 ERASEABLE
 float ExponentialFalloff(float mindist, float maxdist, float halflifedist, float d)
 {
-       if (halflifedist > 0) return POW(0.5, ((bound(mindist, d, maxdist) - mindist) / halflifedist));
-       else if (halflifedist < 0) return POW(0.5, ((bound(mindist, d, maxdist) - maxdist) / halflifedist));
+       if (halflifedist > 0) return EXP(0.5, ((bound(mindist, d, maxdist) - mindist) / halflifedist));
+       else if (halflifedist < 0) return EXP(0.5, ((bound(mindist, d, maxdist) - maxdist) / halflifedist));
        else return 1;
 }
 
-#define power2of(e) POW(2, e)
+#define power2of(e) EXP(2, e)
 
 ERASEABLE
 float log2of(float e)

diff --git a/qcsrc/lib/noise.qh b/qcsrc/lib/noise.qh
index 53026be4d279ca0b7360426a30d3fafb2d2c22af..dd31e9492f7b6f92318abb90bfb390c85fdd2df1 100644 (file)
--- a/qcsrc/lib/noise.qh
+++ b/qcsrc/lib/noise.qh
@@ -20,9 +20,9 @@ float Noise_Pink(entity e, float dt)
        float f;
        f = dt * 60;
        // http://home.earthlink.net/~ltrammell/tech/pinkalg.htm
-       if (random() > POW(0.3190, f)) e.noise_paccum = 0.34848 * (2 * random() - 1);
-       if (random() > POW(0.7756, f)) e.noise_paccum2 = 0.28768 * (2 * random() - 1);
-       if (random() > POW(0.9613, f)) e.noise_paccum3 = 0.43488 * (2 * random() - 1);
+       if (random() > EXP(0.3190, f)) e.noise_paccum = 0.34848 * (2 * random() - 1);
+       if (random() > EXP(0.7756, f)) e.noise_paccum2 = 0.28768 * (2 * random() - 1);
+       if (random() > EXP(0.9613, f)) e.noise_paccum3 = 0.43488 * (2 * random() - 1);
        return e.noise_paccum + e.noise_paccum2 + e.noise_paccum3;
 }
 ERASEABLE
@@ -34,6 +34,6 @@ float Noise_White(entity e, float dt)
 ERASEABLE
 float Noise_Burst(entity e, float dt, float p)
 {
-       if (random() > POW(p, dt)) e.noise_bstate = !e.noise_bstate;
+       if (random() > EXP(p, dt)) e.noise_bstate = !e.noise_bstate;
        return 2 * e.noise_bstate - 1;
 }

diff --git a/qcsrc/lib/warpzone/mathlib.qc b/qcsrc/lib/warpzone/mathlib.qc
index 71fc258581f20163fcf4f73f2ece934103d3f2c8..aae3b91815cfa1aba93b9292c6f646aff057ceb0 100644 (file)
--- a/qcsrc/lib/warpzone/mathlib.qc
+++ b/qcsrc/lib/warpzone/mathlib.qc
@@ -61,11 +61,11 @@ float tanh(float e)
 
 float exp(float e)
 {
-       return POW(M_E, e);
+       return EXP(M_E, e);
 }
 float exp2(float e)
 {
-       return POW(2, e);
+       return EXP(2, e);
 }
 float expm1(float e)
 {
@@ -77,7 +77,7 @@ vector frexp(float e)
        vector v;
        v.z = 0;
        v.y = ilogb(e) + 1;
-       v.x = e / POW(2, v.y);
+       v.x = e / EXP(2, v.y);
        return v;
 }
 int ilogb(float e)
@@ -86,7 +86,7 @@ int ilogb(float e)
 }
 float ldexp(float e, int e)
 {
-       return e * POW(2, e);
+       return e * EXP(2, e);
 }
 float logn(float e, float base)
 {
@@ -115,12 +115,12 @@ vector modf(float f)
 
 float scalbn(float e, int n)
 {
-       return e * POW(2, n);
+       return e * EXP(2, n);
 }
 
 float cbrt(float e)
 {
-       return copysign(POW(fabs(e), (1.0/3.0)), e);
+       return copysign(EXP(fabs(e), (1.0/3.0)), e);
 }
 float hypot(float e, float f)
 {

diff --git a/qcsrc/menu/xonotic/slider_picmip.qc b/qcsrc/menu/xonotic/slider_picmip.qc
index 5611079335c5930ceaf50e07180d0eb71a6464aa..d8cc7a2f2a7b00272147b3011f84e1b6359c814e 100644 (file)
--- a/qcsrc/menu/xonotic/slider_picmip.qc
+++ b/qcsrc/menu/xonotic/slider_picmip.qc
@@ -18,8 +18,8 @@ float texmemsize(float s3tc)
 {
        return
        (
-                 2500 * POW(0.25, max(0, cvar("gl_picmip") + cvar("gl_picmip_other")))
-               + 1500 * POW(0.25, max(0, cvar("gl_picmip") + cvar("gl_picmip_world")))
+                 2500 * EXP(0.25, max(0, cvar("gl_picmip") + cvar("gl_picmip_other")))
+               + 1500 * EXP(0.25, max(0, cvar("gl_picmip") + cvar("gl_picmip_world")))
        ) * ((s3tc && (cvar("r_texture_dds_load") || cvar("gl_texturecompression"))) ? 0.2 : 1.0); // TC: normalmaps 50%, other 25%, few incompressible, guessing 40% as conservative average
 }
 void XonoticPicmipSlider_autofix(entity me)

diff --git a/qcsrc/server/bot/default/aim.qc b/qcsrc/server/bot/default/aim.qc
index ddd0afa826103e65e94cffb8becb94caa8b38a4a..12066f780c1abf32fed2cbec61131213f0aed5d1 100644 (file)
--- a/qcsrc/server/bot/default/aim.qc
+++ b/qcsrc/server/bot/default/aim.qc
@@ -283,7 +283,7 @@ float bot_aimdir(entity this, vector v, float maxfiredeviation)
        blendrate = autocvar_bot_ai_aimskill_blendrate;
        r = max(fixedrate, blendrate);
        //this.v_angle = this.v_angle + diffang * bound(frametime, r * frametime * (2+skill*skill*0.05-random()*0.05*(10-skill)), 1);
-       this.v_angle = this.v_angle + diffang * bound(delta_t, r * delta_t * (2 + POW((skill + this.bot_mouseskill), 3) * 0.005 - random()), 1);
+       this.v_angle = this.v_angle + diffang * bound(delta_t, r * delta_t * (2 + EXP((skill + this.bot_mouseskill), 3) * 0.005 - random()), 1);
        this.v_angle = this.v_angle * bound(0,autocvar_bot_ai_aimskill_mouse,1) + desiredang * bound(0,(1-autocvar_bot_ai_aimskill_mouse),1);
        //this.v_angle = this.v_angle + diffang * bound(0, r * frametime * (skill * 0.5 + 2), 1);
        //this.v_angle = this.v_angle + diffang * (1/ blendrate);

diff --git a/qcsrc/server/bot/default/bot.qc b/qcsrc/server/bot/default/bot.qc
index bbf35b4f7d8300f3b563f5baed6716507d3a75f5..3d00b3a90d857d7a961293f52682cc82ef146789 100644 (file)
--- a/qcsrc/server/bot/default/bot.qc
+++ b/qcsrc/server/bot/default/bot.qc
@@ -72,7 +72,7 @@ void bot_think(entity this)
        if(autocvar_bot_god)
                this.flags |= FL_GODMODE;
 
-       this.bot_nextthink = max(time, this.bot_nextthink) + max(0.01, autocvar_bot_ai_thinkinterval * POW(0.5, this.bot_aiskill) * min(14 / (skill + 14), 1));
+       this.bot_nextthink = max(time, this.bot_nextthink) + max(0.01, autocvar_bot_ai_thinkinterval * EXP(0.5, this.bot_aiskill) * min(14 / (skill + 14), 1));
 
        //if (this.bot_painintensity > 0)
        //      this.bot_painintensity = this.bot_painintensity - (skill + 1) * 40 * frametime;

diff --git a/qcsrc/server/bot/default/havocbot/havocbot.qc b/qcsrc/server/bot/default/havocbot/havocbot.qc
index 9c17ce01145c0200931db301770fc97108b390d2..77bf8bb91c40e769518adf69f6926b0516f929f2 100644 (file)
--- a/qcsrc/server/bot/default/havocbot/havocbot.qc
+++ b/qcsrc/server/bot/default/havocbot/havocbot.qc
@@ -471,7 +471,7 @@ void havocbot_movetogoal(entity this)
                        dxy = this.origin - ( ( this.goalcurrent.absmin + this.goalcurrent.absmax ) * 0.5 ); dxy.z = 0;
                        d = vlen(dxy);
                        v = vlen(this.velocity -  this.velocity.z * '0 0 1');
-                       db = (POW(v, 2) / (autocvar_g_jetpack_acceleration_side * 2)) + 100;
+                       db = (EXP(v, 2) / (autocvar_g_jetpack_acceleration_side * 2)) + 100;
                //      dprint("distance ", ftos(ceil(d)), " velocity ", ftos(ceil(v)), " brake at ", ftos(ceil(db)), "\n");
                        if(d < db || d < 500)
                        {
@@ -1143,7 +1143,7 @@ void havocbot_chooseweapon(entity this, .entity weaponentity)
                this.lastcombotime = time;
        }
 
-       distance *= POW(2, this.bot_rangepreference);
+       distance *= EXP(2, this.bot_rangepreference);
 
        // Custom weapon list based on distance to the enemy
        if(bot_custom_weapon){

diff --git a/qcsrc/server/bot/default/scripting.qc b/qcsrc/server/bot/default/scripting.qc
index 3d9aa50d356d4fb02bd0a7fc0207b0f1121330cc..eb8335b115ae0f6ff0aff213cde3838ef3af36af 100644 (file)
--- a/qcsrc/server/bot/default/scripting.qc
+++ b/qcsrc/server/bot/default/scripting.qc
@@ -896,7 +896,7 @@ float bot_cmd_keypress_handler(entity this, string key, float enabled)
        {
                case "all":
                        if(enabled)
-                               this.bot_cmd_keys = POW(2, 20) - 1; // >:)
+                               this.bot_cmd_keys = EXP(2, 20) - 1; // >:)
                        else
                                this.bot_cmd_keys = BOT_CMD_KEY_NONE;
                case "forward":

diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc
index bed06f190317378b24d072a46e1fecfc5bfc05f1..b22dbccd69b80194ade045efbba790afe8f87432 100644 (file)
--- a/qcsrc/server/cheats.qc
+++ b/qcsrc/server/cheats.qc
@@ -886,7 +886,7 @@ void Drag_Begin(entity dragger, entity draggee, vector touchpoint)
        dragger.dragdistance = vlen(touchpoint - dragger.origin - dragger.view_ofs);
        dragger.draglocalangle = draggee.angles.y - dragger.v_angle.y;
        touchpoint = touchpoint - gettaginfo(draggee, 0);
-       tagscale = POW(vlen(v_forward), -2);
+       tagscale = EXP(vlen(v_forward), -2);
        dragger.draglocalvector_x = touchpoint * v_forward * tagscale;
        dragger.draglocalvector_y = touchpoint * v_right * tagscale;
        dragger.draglocalvector_z = touchpoint * v_up * tagscale;
@@ -968,7 +968,7 @@ void Drag_MoveForward(entity dragger)
 
 void Drag_SetSpeed(entity dragger, float s)
 {
-       dragger.dragspeed = POW(2, s);
+       dragger.dragspeed = EXP(2, s);
 }
 
 void Drag_MoveBackward(entity dragger)

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 2fd4679846a5d45eb163428dc772bc7f5c1ee156..fc105afd9bc8e70d3b9ce23c1293e05c3ef92a0d 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -1026,7 +1026,7 @@ float RadiusDamageForSource (entity inflictor, vector inflictororigin, vector in
                                                        LOG_INFOF("THROUGHFLOOR: D=%f F=%f max(dD)=1/%f max(dF)=1/%f", finaldmg, vlen(force), mininv_d, mininv_f);
 
 
-                                               total = 0.25 * POW(max(mininv_f, mininv_d), 2);
+                                               total = 0.25 * EXP(max(mininv_f, mininv_d), 2);
 
                                                if(autocvar_g_throughfloor_debug)
                                                        LOG_INFOF(" steps=%f", total);

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index a669bf61471286864921cda3834ba87e75cc49d8..c784e11ce97ee41fb6f80da06b6cafc565f8733d 100644 (file)
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -1157,7 +1157,7 @@ float(float exponent) MaplistMethod_Shuffle = // more clever shuffling
                string newlist;
 
                // now reinsert this at another position
-               insertpos = POW(random(), (1 / exponent));       // ]0, 1]
+               insertpos = EXP(random(), (1 / exponent));       // ]0, 1]
                insertpos = insertpos * (Map_Count - 1);       // ]0, Map_Count - 1]
                insertpos = ceil(insertpos) + 1;               // {2, 3, 4, ..., Map_Count}
                LOG_TRACE("SHUFFLE: insert pos = ", ftos(insertpos));

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index c3580d83e56494e8f5dc5343e02d69961294039b..6799aa4d35a8dea4912052af631b5fd2cd5c0b54 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -1315,7 +1315,7 @@ void attach_sameorigin(entity e, entity to, string tag)
     float tagscale;
 
     org = e.origin - gettaginfo(to, gettagindex(to, tag));
-    tagscale = POW(vlen(v_forward), -2); // undo a scale on the tag
+    tagscale = EXP(vlen(v_forward), -2); // undo a scale on the tag
     t_forward = v_forward * tagscale;
     t_left = v_right * -tagscale;
     t_up = v_up * tagscale;

diff --git a/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc b/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc
index 443c8feec2a2b49bc945037e5134d314fc20a926..db34133640bad69639ff01d5b0fcdcaee1cf11a4 100644 (file)
--- a/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc
@@ -130,7 +130,7 @@ void kh_update_state()
                        f = key.team;
                else
                        f = 30;
-               s |= POW(32, key.count) * f;
+               s |= EXP(32, key.count) * f;
        }
 
        FOREACH_CLIENT(true, { it.kh_state = s; });
@@ -138,7 +138,7 @@ void kh_update_state()
        FOR_EACH_KH_KEY(key)
        {
                if(key.owner)
-                       key.owner.kh_state |= POW(32, key.count) * 31;
+                       key.owner.kh_state |= EXP(32, key.count) * 31;
        }
        //print(ftos((nextent(NULL)).kh_state), "\n");
 }
@@ -863,7 +863,7 @@ int kh_GetMissingTeams()
                                ++players;
                });
                if (!players)
-                       missing_teams |= POW(2, i);
+                       missing_teams |= EXP(2, i);
        }
        return missing_teams;
 }

diff --git a/qcsrc/server/scores.qc b/qcsrc/server/scores.qc
index 7951a12e8d2c125d3687b76ae4d728bae51652d2..227d168d7691e915bf7a3032c30441de060bce92 100644 (file)
--- a/qcsrc/server/scores.qc
+++ b/qcsrc/server/scores.qc
@@ -119,7 +119,7 @@ float TeamScore_AddToTeam(float t, float scorefield, float score)
        }
        if(score)
                if(teamscores_label(scorefield) != "")
-                       s.SendFlags |= POW(2, scorefield);
+                       s.SendFlags |= EXP(2, scorefield);
        return (s.(teamscores(scorefield)) += score);
 }
 
@@ -266,7 +266,7 @@ float PlayerScore_Clear(entity player)
        FOREACH(Scores, true, {
                if(sk.(scores(it)) != 0)
                        if(scores_label(it) != "")
-                               sk.SendFlags |= POW(2, (i % 16));
+                               sk.SendFlags |= EXP(2, (i % 16));
                if(i != SP_ELO.m_id)
                        sk.(scores(it)) = 0;
        });
@@ -284,7 +284,7 @@ void Score_ClearAll()
                FOREACH(Scores, true, {
                        if(sk.(scores(it)) != 0)
                                if(scores_label(it) != "")
-                                       sk.SendFlags |= POW(2, (i % 16));
+                                       sk.SendFlags |= EXP(2, (i % 16));
                        if(i != SP_ELO.m_id)
                                sk.(scores(it)) = 0;
                });
@@ -298,7 +298,7 @@ void Score_ClearAll()
                {
                        if(sk.(teamscores(j)) != 0)
                                if(teamscores_label(j) != "")
-                                       sk.SendFlags |= POW(2, j);
+                                       sk.SendFlags |= EXP(2, j);
                        sk.(teamscores(j)) = 0;
                }
        }
@@ -345,7 +345,7 @@ float PlayerScore_Add(entity player, PlayerScoreField scorefield, float score)
                return s.(scores(scorefield));
        }
        if(scores_label(scorefield) != "")
-               s.SendFlags |= POW(2, (scorefield.m_id % 16));
+               s.SendFlags |= EXP(2, (scorefield.m_id % 16));
        if(!warmup_stage)
                PS_GR_P_ADDVAL(s.owner, strcat(PLAYERSTATS_TOTAL, scores_label(scorefield)), score);
        s.(scores(scorefield)) += score;

diff --git a/qcsrc/server/spawnpoints.qc b/qcsrc/server/spawnpoints.qc
index 220cb551f965f2d21545cb61bbb03ed26bd35af8..6cbde550558351a5f970b7ace047387c6212cf01 100644 (file)
--- a/qcsrc/server/spawnpoints.qc
+++ b/qcsrc/server/spawnpoints.qc
@@ -320,7 +320,7 @@ entity Spawn_WeightedPoint(entity firstspot, float lower, float upper, float exp
 
        RandomSelection_Init();
        for(spot = firstspot; spot; spot = spot.chain)
-               RandomSelection_AddEnt(spot, POW(bound(lower, spot.spawnpoint_score.y, upper), exponent) * spot.cnt, (spot.spawnpoint_score.y >= lower) * 0.5 + spot.spawnpoint_score.x);
+               RandomSelection_AddEnt(spot, EXP(bound(lower, spot.spawnpoint_score.y, upper), exponent) * spot.cnt, (spot.spawnpoint_score.y >= lower) * 0.5 + spot.spawnpoint_score.x);
 
        return RandomSelection_chosen_ent;
 }