From 136816f802e66dfdaa8e07496596b8d51c89cd58 Mon Sep 17 00:00:00 2001 From: Martin Taibr Date: Mon, 17 Jul 2017 20:25:51 +0200 Subject: [PATCH] turns out g_waypointsprite_* are client cvars and alises --- defaultClient.cfg | 41 ++++++++++++++++++ defaultServer.cfg | 43 ------------------- .../mutator/waypoints/waypointsprites.qh | 2 +- 3 files changed, 42 insertions(+), 44 deletions(-) diff --git a/defaultClient.cfg b/defaultClient.cfg index 6492dcf89..2b6c9582d 100644 --- a/defaultClient.cfg +++ b/defaultClient.cfg @@ -352,6 +352,47 @@ cl_curl_maxspeed 0 cl_curl_useragent 1 cl_curl_useragent_append "$g_xonoticversion" +seta g_waypointsprite_alpha 1 "This allows the client to control transparency of the waypoint" +seta g_waypointsprite_crosshairfadealpha 0.25 "alpha multiplier near crosshair" +seta g_waypointsprite_crosshairfadescale 1 "scale multiplier near the crosshair" +seta g_waypointsprite_crosshairfadedistance 150 "distance in virtual pixels from crosshair where to start fading" +seta g_waypointsprite_distancefadealpha 1 "alpha multiplier near distance" +seta g_waypointsprite_distancefadescale 0.7 "scale multiplier near the distance" +seta g_waypointsprite_distancefadedistancemultiplier 0.5 "distance in map sizes from distance where to stop fading" +set g_waypointsprite_distancealphaexponent 2 +seta g_waypointsprite_edgefadealpha 0.5 "alpha multiplier near the edge" +seta g_waypointsprite_edgefadedistance 50 "distance in virtual pixels from edge where to start fading" +seta g_waypointsprite_edgefadescale 1 "scale multiplier near the edge" +seta g_waypointsprite_edgeoffset_bottom 0 "offset of how close the waypoint can be to the bottom edge of the screen" +seta g_waypointsprite_edgeoffset_left 0 "offset of how close the waypoint can be to the left edge of the screen" +seta g_waypointsprite_edgeoffset_right 0 "offset of how close the waypoint can be to the right edge of the screen" +seta g_waypointsprite_edgeoffset_top 0 "offset of how close the waypoint can be to the top edge of the screen" +seta g_waypointsprite_fontsize 12 +seta g_waypointsprite_itemstime 2 "show waypoints to indicate that some important items (mega health, large armor) are about to respawn: 1 when spectating, 2 even playing in warmup stage" +set g_waypointsprite_minscale 0.5 +set g_waypointsprite_minalpha 0.4 +set g_waypointsprite_normdistance 512 +seta g_waypointsprite_scale 1 +set g_waypointsprite_spam 0 "Debugging feature. Set to 10 and load courtfun in race mode to test." +set g_waypointsprite_timealphaexponent 1 +seta g_waypointsprite_turrets 1 "disable turret waypoints" +seta g_waypointsprite_turrets_maxdist 5000 "max distance for turret waypoints" +seta g_waypointsprite_uppercase 1 + +alias "g_waypointsprite_personal" "impulse 30" +alias "g_waypointsprite_personal_p" "impulse 31" +alias "g_waypointsprite_personal_d" "impulse 32" +alias "g_waypointsprite_team_helpme" "impulse 33" +alias "g_waypointsprite_team_here" "impulse 34" +alias "g_waypointsprite_team_here_p" "impulse 35" +alias "g_waypointsprite_team_here_d" "impulse 36" +alias "g_waypointsprite_team_danger" "impulse 37" +alias "g_waypointsprite_team_danger_p" "impulse 38" +alias "g_waypointsprite_team_danger_d" "impulse 39" +alias "g_waypointsprite_clear_personal" "impulse 47" +alias "g_waypointsprite_clear" "impulse 48" +alias "g_waypointsprite_toggle" "toggle cl_hidewaypoints" + seta cl_hidewaypoints 0 "disable static waypoints, only show team waypoints" seta cl_damagetext "1" "Draw damage dealt where you hit the enemy" diff --git a/defaultServer.cfg b/defaultServer.cfg index 0c857e96d..ded86c732 100644 --- a/defaultServer.cfg +++ b/defaultServer.cfg @@ -361,49 +361,6 @@ set sv_waypointsprite_deployed_lifetime 10 set sv_waypointsprite_deadlifetime 1 set sv_waypointsprite_limitedrange 5120 -// FIXME probably client -seta g_waypointsprite_uppercase 1 -set g_waypointsprite_normdistance 512 -set g_waypointsprite_minscale 0.5 -set g_waypointsprite_minalpha 0.4 -set g_waypointsprite_distancealphaexponent 2 -set g_waypointsprite_timealphaexponent 1 -set g_waypointsprite_stuffbinds 0 -seta g_waypointsprite_scale 1 -seta g_waypointsprite_fontsize 12 -seta g_waypointsprite_alpha 1 "This allows the client to control transparency of the waypoint" -seta g_waypointsprite_edgefadealpha 0.5 "alpha multiplier near the edge" -seta g_waypointsprite_edgefadescale 1 "scale multiplier near the edge" -seta g_waypointsprite_edgefadedistance 50 "distance in virtual pixels from edge where to start fading" -seta g_waypointsprite_edgeoffset_bottom 0 "offset of how close the waypoint can be to the bottom edge of the screen" -seta g_waypointsprite_edgeoffset_left 0 "offset of how close the waypoint can be to the left edge of the screen" -seta g_waypointsprite_edgeoffset_right 0 "offset of how close the waypoint can be to the right edge of the screen" -seta g_waypointsprite_edgeoffset_top 0 "offset of how close the waypoint can be to the top edge of the screen" -seta g_waypointsprite_crosshairfadealpha 0.25 "alpha multiplier near crosshair" -seta g_waypointsprite_crosshairfadescale 1 "scale multiplier near the crosshair" -seta g_waypointsprite_crosshairfadedistance 150 "distance in virtual pixels from crosshair where to start fading" -seta g_waypointsprite_distancefadealpha 1 "alpha multiplier near distance" -seta g_waypointsprite_distancefadescale 0.7 "scale multiplier near the distance" -seta g_waypointsprite_distancefadedistancemultiplier 0.5 "distance in map sizes from distance where to stop fading" -seta g_waypointsprite_itemstime 2 "show waypoints to indicate that some important items (mega health, large armor) are about to respawn: 1 when spectating, 2 even playing in warmup stage" -set g_waypointsprite_spam 0 "Debugging feature. Set to 10 and load courtfun in race mode to test." -alias "g_waypointsprite_personal" "impulse 30" -alias "g_waypointsprite_personal_p" "impulse 31" -alias "g_waypointsprite_personal_d" "impulse 32" -alias "g_waypointsprite_team_helpme" "impulse 33" -alias "g_waypointsprite_team_here" "impulse 34" -alias "g_waypointsprite_team_here_p" "impulse 35" -alias "g_waypointsprite_team_here_d" "impulse 36" -alias "g_waypointsprite_team_danger" "impulse 37" -alias "g_waypointsprite_team_danger_p" "impulse 38" -alias "g_waypointsprite_team_danger_d" "impulse 39" -alias "g_waypointsprite_clear_personal" "impulse 47" -alias "g_waypointsprite_clear" "impulse 48" -alias "g_waypointsprite_toggle" "toggle cl_hidewaypoints" - -seta g_waypointsprite_turrets 1 "disable turret waypoints" -seta g_waypointsprite_turrets_maxdist 5000 "max distance for turret waypoints" - set sv_itemstime 1 "enable networking of time left until respawn for items such as mega health/armor and powerups" set g_ban_default_bantime 5400 "90 minutes" diff --git a/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qh b/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qh index d77a4aa61..6a8d57157 100644 --- a/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qh +++ b/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qh @@ -27,7 +27,6 @@ class(WaypointSprite) .float build_started; class(WaypointSprite) .float build_starthealth; class(WaypointSprite) .float build_finished; -bool autocvar_g_waypointsprite_uppercase; float autocvar_g_waypointsprite_alpha; float autocvar_g_waypointsprite_crosshairfadealpha; float autocvar_g_waypointsprite_crosshairfadedistance; @@ -53,6 +52,7 @@ int autocvar_g_waypointsprite_spam; float autocvar_g_waypointsprite_timealphaexponent; bool autocvar_g_waypointsprite_turrets = true; float autocvar_g_waypointsprite_turrets_maxdist = 5000; +bool autocvar_g_waypointsprite_uppercase; float waypointsprite_fadedistance; float waypointsprite_normdistance; -- 2.39.2