From 5f12d827aec80b869ab1f213b14bfaff7dc7d6b5 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 7 Mar 2017 05:12:09 +1000 Subject: [PATCH] pow(a, b) -> a ** b --- qcsrc/client/hud/panel/physics.qc | 2 +- qcsrc/client/hud/panel/score.qc | 2 +- qcsrc/client/view.qc | 4 ++-- qcsrc/common/command/rpn.qc | 2 +- qcsrc/common/mutators/mutator/bugrigs/bugrigs.qc | 4 ++-- qcsrc/common/mutators/mutator/nades/nades.qc | 2 +- .../mutators/mutator/waypoints/waypointsprites.qc | 8 ++++---- qcsrc/common/physics/player.qc | 4 ++-- qcsrc/common/triggers/trigger/impulse.qc | 4 ++-- qcsrc/common/turrets/cl_turrets.qc | 6 +++--- qcsrc/common/util.qc | 2 +- qcsrc/common/weapons/all.qc | 6 +++--- qcsrc/common/weapons/weapon/crylink.qc | 4 ++-- qcsrc/common/weapons/weapon/hook.qc | 2 +- qcsrc/common/weapons/weapon/tuba.qc | 8 ++++---- qcsrc/lib/math.qh | 14 +++++++------- qcsrc/lib/noise.qh | 8 ++++---- qcsrc/lib/warpzone/mathlib.qc | 12 ++++++------ qcsrc/menu/xonotic/slider_picmip.qc | 4 ++-- qcsrc/server/bot/default/aim.qc | 4 ++-- qcsrc/server/bot/default/bot.qc | 2 +- qcsrc/server/bot/default/havocbot/havocbot.qc | 4 ++-- qcsrc/server/bot/default/scripting.qc | 2 +- qcsrc/server/cheats.qc | 4 ++-- qcsrc/server/g_damage.qc | 2 +- qcsrc/server/g_world.qc | 2 +- qcsrc/server/miscfunctions.qc | 2 +- qcsrc/server/mutators/mutator/gamemode_keyhunt.qc | 6 +++--- qcsrc/server/scores.qc | 10 +++++----- qcsrc/server/spawnpoints.qc | 2 +- 30 files changed, 69 insertions(+), 69 deletions(-) diff --git a/qcsrc/client/hud/panel/physics.qc b/qcsrc/client/hud/panel/physics.qc index 6befd1a30a..42f6512c0f 100644 --- a/qcsrc/client/hud/panel/physics.qc +++ b/qcsrc/client/hud/panel/physics.qc @@ -86,7 +86,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 / (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 f3d55a433e..972e4effbe 100644 --- a/qcsrc/client/hud/panel/score.qc +++ b/qcsrc/client/hud/panel/score.qc @@ -180,7 +180,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/(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 acdb69fdcd..104405b397 100644 --- a/qcsrc/client/view.qc +++ b/qcsrc/client/view.qc @@ -522,7 +522,7 @@ vector GetCurrentFov(float fov) current_zoomfraction = (current_viewzoom - 1) / (1/zoomfactor - 1); if(zoomsensitivity < 1) - setsensitivityscale(pow(current_viewzoom, 1 - zoomsensitivity)); + setsensitivityscale(current_viewzoom ** (1 - zoomsensitivity)); else setsensitivityscale(1); @@ -1735,7 +1735,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 / (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 f88bf635ee..828fbdf7dd 100644 --- 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(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 a67e9455d9..729fbbad06 100644 --- a/qcsrc/common/mutators/mutator/bugrigs/bugrigs.qc +++ b/qcsrc/common/mutators/mutator/bugrigs/bugrigs.qc @@ -97,7 +97,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 + (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; @@ -154,7 +154,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 + (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 413dd99f59..45e6d997e8 100644 --- 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 * (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 bdedf295d8..81f54b1c90 100644 --- 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 = (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 *= (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 *= (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( ((o.x - vid_conwidth/2) ** 2) + ((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 6c1ec31cec..a8a32998e4 100644 --- a/qcsrc/common/physics/player.qc +++ b/qcsrc/common/physics/player.qc @@ -85,7 +85,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 * (fabs(b / a) ** _lerp); } void PM_ClientMovement_UpdateStatus(entity this) @@ -153,7 +153,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 *= (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 cb9c2d2935..4be6e86bca 100644 --- 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 * (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 = (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 c21e327d44..c2cc03e738 100644 --- 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 *= (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 *= (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( (o.x - vid_conwidth/2 ** 2) + (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 38514e9270..22737078c1 100644 --- 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 = (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 a694112ce6..8af381f091 100644 --- 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' * power2of(a); + return '0 0 1' * (2 ** a); } - return '0 1 0' * power2of(a); + return '0 1 0' * (2 ** a); } - return '1 0 0' * power2of(a); + return '1 0 0' * (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 8268acdd30..2915045216 100644 --- a/qcsrc/common/weapons/weapon/crylink.qc +++ b/qcsrc/common/weapons/weapon/crylink.qc @@ -181,9 +181,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 = (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 += (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 15dfe0169d..1eea1dfd58 100644 --- a/qcsrc/common/weapons/weapon/hook.qc +++ b/qcsrc/common/weapons/weapon/hook.qc @@ -85,7 +85,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 = (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 988ee73556..1536eb337b 100644 --- a/qcsrc/common/weapons/weapon/tuba.qc +++ b/qcsrc/common/weapons/weapon/tuba.qc @@ -493,23 +493,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 = (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 = (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 = (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 = (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 94cdcc6710..de6cb95c37 100644 --- a/qcsrc/lib/math.qh +++ b/qcsrc/lib/math.qh @@ -5,16 +5,16 @@ 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) *= (value ** weight); + else e.(a) += (value ** mean) * weight; e.(c) += weight; } 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 (e.(a) ** (1.0 / e.(c))); + else return ((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) @@ -193,14 +193,14 @@ float almost_in_bounds(float a, float b, float c) 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 (0.5 ** (bound(mindist, d, maxdist) - mindist) / halflifedist); + else if (halflifedist < 0) return (0.5 ** (bound(mindist, d, maxdist) - maxdist) / halflifedist); else return 1; } float power2of(float e) { - return pow(2, e); + return (2 ** e); } float log2of(float e) diff --git a/qcsrc/lib/noise.qh b/qcsrc/lib/noise.qh index 9b1b472242..40647b30eb 100644 --- a/qcsrc/lib/noise.qh +++ b/qcsrc/lib/noise.qh @@ -18,9 +18,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() > (0.3190 ** f)) e.noise_paccum = 0.34848 * (2 * random() - 1); + if (random() > (0.7756 ** f)) e.noise_paccum2 = 0.28768 * (2 * random() - 1); + if (random() > (0.9613 ** f)) e.noise_paccum3 = 0.43488 * (2 * random() - 1); return e.noise_paccum + e.noise_paccum2 + e.noise_paccum3; } float Noise_White(entity e, float dt) @@ -30,6 +30,6 @@ float Noise_White(entity e, float dt) /** +1 or -1 */ float Noise_Burst(entity e, float dt, float p) { - if (random() > pow(p, dt)) e.noise_bstate = !e.noise_bstate; + if (random() > (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 e190518275..816a7ec6e7 100644 --- 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) { diff --git a/qcsrc/menu/xonotic/slider_picmip.qc b/qcsrc/menu/xonotic/slider_picmip.qc index 226f4559c3..c6b7c1e8cc 100644 --- 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 * (0.25 ** max(0, cvar("gl_picmip") + cvar("gl_picmip_other"))) + + 1500 * (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 c278be915a..b16de9afab 100644 --- a/qcsrc/server/bot/default/aim.qc +++ b/qcsrc/server/bot/default/aim.qc @@ -229,7 +229,7 @@ float bot_aimdir(entity this, vector v, float maxfiredeviation) this.bot_5th_order_aimfilter= this.bot_5th_order_aimfilter + (this.bot_4th_order_aimfilter - this.bot_5th_order_aimfilter) * bound(0, autocvar_bot_ai_aimskill_order_filter_5th,1); - //blend = (bound(0,skill,10)*0.1)*pow(1-bound(0,skill,10)*0.05,2.5)*5.656854249; //Plot formule before changing ! + //blend = (bound(0,skill,10)*0.1)*((1-bound(0,skill,10)*0.05) ** 2.5)*5.656854249; //Plot formule before changing ! blend = bound(0,skill+this.bot_aimskill,10)*0.1; desiredang = desiredang + blend * ( @@ -281,7 +281,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+(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 c598473903..bcdc32e8d5 100644 --- a/qcsrc/server/bot/default/bot.qc +++ b/qcsrc/server/bot/default/bot.qc @@ -64,7 +64,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 * (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 acb7e86bd8..7a1d6a501d 100644 --- a/qcsrc/server/bot/default/havocbot/havocbot.qc +++ b/qcsrc/server/bot/default/havocbot/havocbot.qc @@ -475,7 +475,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 = ((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) { @@ -1147,7 +1147,7 @@ void havocbot_chooseweapon(entity this, .entity weaponentity) this.lastcombotime = time; } - distance *= pow(2, this.bot_rangepreference); + distance *= (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 1531cde98d..7f6e17f5e4 100644 --- a/qcsrc/server/bot/default/scripting.qc +++ b/qcsrc/server/bot/default/scripting.qc @@ -889,7 +889,7 @@ float bot_cmd_keypress_handler(entity this, string key, float enabled) { case "all": if(enabled) - this.bot_cmd_keys = power2of(20) - 1; // >:) + this.bot_cmd_keys = (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 e6dc964fe8..ded5e84098 100644 --- a/qcsrc/server/cheats.qc +++ b/qcsrc/server/cheats.qc @@ -882,7 +882,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 = (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; @@ -964,7 +964,7 @@ void Drag_MoveForward(entity dragger) void Drag_SetSpeed(entity dragger, float s) { - dragger.dragspeed = pow(2, s); + dragger.dragspeed = (2 ** s); } void Drag_MoveBackward(entity dragger) diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 259857ccd4..11c339b4d6 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -1029,7 +1029,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 * (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 6e40fcba77..6a6cdc214e 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -1141,7 +1141,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 = (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 14457679f1..e91a7c219d 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -1313,7 +1313,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 = (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 5f3bd4b395..0c3d27be4e 100644 --- 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 |= (32 ** key.count) * f; } FOREACH_CLIENT(true, LAMBDA(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 |= (32 ** key.count) * 31; } //print(ftos((nextent(NULL)).kh_state), "\n"); } @@ -858,7 +858,7 @@ int kh_GetMissingTeams() ++players; )); if (!players) - missing_teams |= pow(2, i); + missing_teams |= (2 ** i); } return missing_teams; } diff --git a/qcsrc/server/scores.qc b/qcsrc/server/scores.qc index eace0ee599..c0ebfc54a6 100644 --- a/qcsrc/server/scores.qc +++ b/qcsrc/server/scores.qc @@ -118,7 +118,7 @@ float TeamScore_AddToTeam(float t, float scorefield, float score) } if(score) if(teamscores_label(scorefield) != "") - s.SendFlags |= pow(2, scorefield); + s.SendFlags |= (2 ** scorefield); return (s.(teamscores(scorefield)) += score); } @@ -265,7 +265,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 |= (2 ** (i % 16)); sk.(scores(it)) = 0; }); @@ -282,7 +282,7 @@ void Score_ClearAll() FOREACH(Scores, true, { if(sk.(scores(it)) != 0) if(scores_label(it) != "") - sk.SendFlags |= pow(2, i % 16); + sk.SendFlags |= (2 ** (i % 16)); sk.(scores(it)) = 0; }); }); @@ -295,7 +295,7 @@ void Score_ClearAll() { if(sk.(teamscores(j)) != 0) if(teamscores_label(j) != "") - sk.SendFlags |= pow(2, j); + sk.SendFlags |= (2 ** j); sk.(teamscores(j)) = 0; } } @@ -339,7 +339,7 @@ float PlayerScore_Add(entity player, PlayerScoreField scorefield, float score) } if(score) if(scores_label(scorefield) != "") - s.SendFlags |= pow(2, scorefield.m_id % 16); + s.SendFlags |= (2 ** (scorefield.m_id % 16)); if(!warmup_stage) PS_GR_P_ADDVAL(s.owner, strcat(PLAYERSTATS_TOTAL, scores_label(scorefield)), score); return (s.(scores(scorefield)) += score); diff --git a/qcsrc/server/spawnpoints.qc b/qcsrc/server/spawnpoints.qc index 517bc1892c..84819efbe1 100644 --- a/qcsrc/server/spawnpoints.qc +++ b/qcsrc/server/spawnpoints.qc @@ -318,7 +318,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, (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; } -- 2.39.2