From: Jakob MG <jakob_mg@hotmail.com>
Date: Tue, 14 Jun 2011 18:40:53 +0000 (+0200)
Subject: Netlink turrets in the right place
X-Git-Tag: xonotic-v0.5.0~199^2^2~18
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=af982b89e29acaae68ca0801f42f8e0070f6d576;p=xonotic%2Fxonotic-data.pk3dir.git

Netlink turrets in the right place
---

diff --git a/qcsrc/server/tturrets/system/system_damage.qc b/qcsrc/server/tturrets/system/system_damage.qc
index 3e99076b6..ac7455bd5 100644
--- a/qcsrc/server/tturrets/system/system_damage.qc
+++ b/qcsrc/server/tturrets/system/system_damage.qc
@@ -70,8 +70,7 @@ void turret_stdproc_respawn()
     self.ammo                   = self.ammo_max;
 
     self.nextthink  = time + self.ticrate;
-    //self.think      = turret_think;
-    self.think      = turret_link;
+    self.think      = turret_think;
     
     self.SendFlags  = TNSF_FULL_UPDATE;
 
diff --git a/qcsrc/server/tturrets/system/system_main.qc b/qcsrc/server/tturrets/system/system_main.qc
index 808876542..8662d51ed 100644
--- a/qcsrc/server/tturrets/system/system_main.qc
+++ b/qcsrc/server/tturrets/system/system_main.qc
@@ -1317,7 +1317,7 @@ float turret_stdproc_init (string cvar_base_name, string base, string head, floa
         self.use();
     }
     
-	//turret_link();
+	turret_link();
 	turret_stdproc_respawn();
 	    
     if (!turret_tag_fire_update())
diff --git a/qcsrc/server/tturrets/units/unit_walker.qc b/qcsrc/server/tturrets/units/unit_walker.qc
index 7fddd5799..ff5512c9f 100644
--- a/qcsrc/server/tturrets/units/unit_walker.qc
+++ b/qcsrc/server/tturrets/units/unit_walker.qc
@@ -595,7 +595,6 @@ void walker_respawnhook()
             self.pathgoal = e;
         }
     }
-    self.colormod = randomvec() * 5;
 }
 
 void walker_diehook()