X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Ftturrets.qc;h=6f3b030502196171db72a24520b89fb7a9713979;hb=0f6085c8ea46125d87ca81ec7f5e82f73c08f958;hp=d7abeb0919de42e95d278942f363cb9009336b96;hpb=f1640e9882a14d88d3b2ad0c673dacfed8fecfa0;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/tturrets.qc b/qcsrc/client/tturrets.qc
index d7abeb091..6f3b03050 100644
--- 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
@@ -388,7 +392,7 @@ void turret_walker_draw()
         return;
     
     fixedmakevectors(self.angles);
-    movelib_groundalign4point(300, 100, 0.25);
+    movelib_groundalign4point(300, 100, 0.25, 45);
     setorigin(self, self.origin + self.velocity * dt);
     self.tur_head.angles += dt * self.tur_head.move_avelocity;
     self.angles_y = self.move_angles_y;
@@ -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;
     
@@ -538,7 +542,8 @@ entity turret_gibtoss(string _model, vector _from, vector _to, vector _cmod, flo
     
     gib.gravity         = 1;
 	gib.move_movetype   = MOVETYPE_BOUNCE;
-	gib.move_origin     = gib.origin = _from;
+	gib.move_origin     = _from;
+	setorigin(gib,        _from);
 	gib.move_velocity   = _to;	
 	gib.move_avelocity  = prandomvec() * 32;
 	gib.move_time       = time;
@@ -601,6 +606,7 @@ void ent_turret()
 	    self.origin_x = ReadCoord();
 	    self.origin_y = ReadCoord();
 	    self.origin_z = ReadCoord();
+	    setorigin(self, self.origin);
 	    
 	    self.angles_x = ReadAngle();
 	    self.angles_y = ReadAngle();