From: Mario Date: Sun, 31 May 2020 14:40:54 +0000 (+1000) Subject: Restrict g_waypointsprite_normdistance to the maximum viewable distance of the waypoint X-Git-Tag: xonotic-v0.8.5~981 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=3505c3baed3da03198033da49336ef26cde1dccd Restrict g_waypointsprite_normdistance to the maximum viewable distance of the waypoint --- diff --git a/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc b/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc index 786971645..bb6a68863 100644 --- a/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc +++ b/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc @@ -536,10 +536,12 @@ void Draw_WaypointSprite(entity this) float dist = vlen(this.origin - view_origin); float a = this.alpha * autocvar_hud_panel_fg_alpha; - if (this.maxdistance > waypointsprite_normdistance) - a *= (bound(0, (this.maxdistance - dist) / (this.maxdistance - waypointsprite_normdistance), 1) ** waypointsprite_distancealphaexponent); - else if (this.maxdistance > 0) - a *= (bound(0, (waypointsprite_fadedistance - dist) / (waypointsprite_fadedistance - waypointsprite_normdistance), 1) ** waypointsprite_distancealphaexponent) * (1 - waypointsprite_minalpha) + waypointsprite_minalpha; + if(this.maxdistance > 0) + { + // restrict maximum normal distance to the waypoint's maximum distance to prevent exploiting cvars + float maxnormdistance = bound(0, waypointsprite_normdistance, this.maxdistance - 1); + a *= (bound(0, (this.maxdistance - dist) / (this.maxdistance - maxnormdistance), 1) ** waypointsprite_distancealphaexponent); + } vector rgb = spritelookupcolor(this, spriteimage, this.teamradar_color); if (rgb == '0 0 0')