g_waypointsprite_turrets, g_waypointsprite_turrets_maxdisT

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 1f71855687ae404b7081d1d021dce4cb13cf38c9..493f747d0d964b928fcbefdd03de638a72c81e8f 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -862,8 +862,9 @@ alias "g_waypointsprite_toggle"     "toggle cl_hidewaypoints"
 // key for that?
 seta cl_hidewaypoints 0 "disable static waypoints, only show team waypoints"
 
-seta g_waypointsprites_turrets 1 "disable turret waypoints"
-seta g_waypointsprites_turrets_maxdist 4000 "max distace for turret sprites"
+seta g_waypointsprite_turrets 1 "disable turret waypoints"
+seta g_waypointsprite_turrets_maxdist 5000 "max distace for turret sprites"
+seta g_waypointsprite_tactical 1 "tactical overlay on turrets when in a vehicle"
 
 // so it can be stuffcmd-ed still
 set cl_gravity 800     "but ignored anyway"

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index ee402287283d690259ff9bffcc6e89e56d94a555..9ebc80a4b67d356ca567ad58a4cbd4804858df6c 100644 (file)
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -153,8 +153,8 @@ float autocvar_g_waypointsprite_normdistance;
 float autocvar_g_waypointsprite_scale;
 float autocvar_g_waypointsprite_spam;
 float autocvar_g_waypointsprite_timealphaexponent;
-//float autocvar_g_waypointsprites_turrets;
-//float autocvar_g_waypointsprites_turrets_maxdist;
+var float autocvar_g_waypointsprite_turrets = TRUE;
+var float autocvar_g_waypointsprite_turrets_maxdist = 5000;
 
 float autocvar_hud_colorflash_alpha;
 float autocvar_hud_configure_checkcollisions;

diff --git a/qcsrc/client/tturrets.qc b/qcsrc/client/tturrets.qc
index 3aa3c3b2bbe6074ccfffc0588921abf688e8b56b..272a24610204128247559cf76ecd6fca41bef53b 100644 (file)
--- a/qcsrc/client/tturrets.qc
+++ b/qcsrc/client/tturrets.qc
@@ -231,7 +231,10 @@ void turret_draw2d()
        if(self.netname == "")
            return;
        
-    if(autocvar_cl_hidewaypoints) // also check g_waypointsprites_turrets after next release (needs changed to clients default/config .cfg)
+       if(!autocvar_g_waypointsprite_turrets)
+               return;
+               
+    if(autocvar_cl_hidewaypoints)
         return; 
 
        float dist = vlen(self.origin - view_origin);
@@ -259,6 +262,7 @@ void turret_draw2d()
                 case HUD_SPIDERBOT:
                 case HUD_WAKIZASHI:
                 case HUD_RAPTOR:
+                case HUD_BUMBLEBEE:
                     if(self.turret_type == TID_EWHEEL || self.turret_type == TID_WALKER)
                         txt = "gfx/vehicles/vth-mover.tga";
                     else
@@ -453,7 +457,7 @@ void turret_construct()
     self.tur_head.drawmask      = MASK_NORMAL;
     self.anim_start_time        = 0;    
     self.draw2d = turret_draw2d;
-    self.maxdistance = 4000; // use g_waypointsprites_turrets_maxdist after next release (needs changed to cleint's default)
+    self.maxdistance = autocvar_g_waypointsprite_turrets_maxdist;
     self.teamradar_color = '1 0 0';
     self.alpha = 1;