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 3e99076b69b43b0ee84f9a2e05cd18d00250a78a..ac7455bd570afdde76db51c7083de90e05863c9d 100644 (file)
--- 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 808876542c3d8e2128e58c5dbfac4397c4c39cc5..8662d51ed48adb93f7f76498e461209fa9aea916 100644 (file)
--- 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 7fddd579986f9a59b4de0192e25e0a0bfdfa64d5..ff5512c9f08f380e35b2b9e5cf21d008e901618b 100644 (file)
--- 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()