Get rid of TNSF_FAR, short is good enougth. Hide server based turret head from client.

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / tturrets / system / system_damage.qc

diff --git a/qcsrc/server/tturrets/system/system_damage.qc b/qcsrc/server/tturrets/system/system_damage.qc
index c7f25a4467825f6b9c6eefbd7ba9f4fc96b73289..ab64c6918b2b69a43be48baec90689f9e30190da 100644 (file)
--- a/qcsrc/server/tturrets/system/system_damage.qc
+++ b/qcsrc/server/tturrets/system/system_damage.qc
@@ -248,7 +248,15 @@ void turret_stdproc_respawn()
     self.ammo                   = self.ammo_max;
 
     self.nextthink  = time + self.ticrate;
-    self.think      = turret_think;
+    
+    if(self.SendEntity)
+    {
+        self.SendFlags  = TNSF_FULL_UPDATE;
+        self.think      = turret_link;  // CSQC?
+    }
+        
+    else
+        self.think      = turret_think; // Or not?
 
     if (self.turret_respawnhook)
         self.turret_respawnhook();
@@ -269,7 +277,7 @@ void turret_stdproc_damage (entity inflictor, entity attacker, float damage, flo
     if not (self.tur_active)
         return;
 
-    if (teams_matter)
+    if (teamplay)
     if (self.team == attacker.team)
     {
         // This does not happen anymore. Re-enable if you fix that.
@@ -289,6 +297,10 @@ void turret_stdproc_damage (entity inflictor, entity attacker, float damage, flo
     {
         self.tur_head.angles_x = self.tur_head.angles_x + (-0.5 + random()) * damage;
         self.tur_head.angles_y = self.tur_head.angles_y + (-0.5 + random()) * damage;
+        
+        if(self.SendEntity)
+            self.SendFlags  |= TNSF_ANG;
+
     }
 
     if (self.turrcaps_flags & TFL_TURRCAPS_MOVE)
@@ -304,4 +316,9 @@ void turret_stdproc_damage (entity inflictor, entity attacker, float damage, flo
         self.nextthink = time;
         self.think = turret_stdproc_die;
     }
+    
+    // CSQC
+    if(self.SendEntity)
+        self.SendFlags  |= TNSF_STATUS;
+
 }