From: terencehill Date: Fri, 19 Nov 2010 23:12:11 +0000 (+0100) Subject: Make use of mi_center and mi_scale, they were initialized but not used X-Git-Tag: xonotic-v0.1.0preview~64^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=396920a8f23ea7922240f147596f809f60c1bed0;p=xonotic%2Fxonotic-data.pk3dir.git Make use of mi_center and mi_scale, they were initialized but not used --- diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index f77f1c1c1..309048519 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -3505,7 +3505,7 @@ void HUD_Radar(void) if(hud_panel_radar_rotation == 0) { // max-min distance must fit the radar in any rotation - bigsize = vlen_minnorm2d(teamradar_size2d) * scale2d / (1.05 * vlen2d(mi_max - mi_min)); + bigsize = vlen_minnorm2d(teamradar_size2d) * scale2d / (1.05 * vlen2d(mi_scale)); } else { @@ -3533,7 +3533,7 @@ void HUD_Radar(void) f * bigsize + (1 - f) * normalsize; teamradar_origin3d_in_texcoord = teamradar_3dcoord_to_texcoord( - f * (mi_min + mi_max) * 0.5 + f * mi_center + (1 - f) * view_origin); color1 = GetPlayerColor(player_localentnum-1); diff --git a/qcsrc/client/waypointsprites.qc b/qcsrc/client/waypointsprites.qc index 816a2e485..ee11d11ed 100644 --- a/qcsrc/client/waypointsprites.qc +++ b/qcsrc/client/waypointsprites.qc @@ -409,7 +409,7 @@ void Ent_WaypointSprite() void WaypointSprite_Load() { - waypointsprite_fadedistance = vlen(mi_max - mi_min); + waypointsprite_fadedistance = vlen(mi_scale); waypointsprite_normdistance = cvar("g_waypointsprite_normdistance"); waypointsprite_minscale = cvar("g_waypointsprite_minscale"); waypointsprite_minalpha = cvar("g_waypointsprite_minalpha"); @@ -424,7 +424,7 @@ void WaypointSprite_Load() waypointsprite_crosshairfadedistance = cvar("g_waypointsprite_crosshairfadedistance"); waypointsprite_distancefadealpha = cvar_or("g_waypointsprite_distancefadealpha", 1); waypointsprite_distancefadescale = cvar_or("g_waypointsprite_distancefadescale", 1); - waypointsprite_distancefadedistance = vlen(mi_max - mi_min) * cvar_or("g_waypointsprite_distancefadedistancemultiplier", 1); + waypointsprite_distancefadedistance = waypointsprite_fadedistance * cvar_or("g_waypointsprite_distancefadedistancemultiplier", 1); waypointsprite_alpha = cvar_or("g_waypointsprite_alpha", 1) * (1 - autocvar__menu_alpha); if(!waypointsprite_initialized)