r4939 - in trunk/data/qcsrc/server: . tturrets/system

[DONOTREPLY at icculus.org]

Author: tzork
Date: 2008-10-29 15:48:32 -0400 (Wed, 29 Oct 2008)
New Revision: 4939

Modified:
   trunk/data/qcsrc/server/assault.qc
   trunk/data/qcsrc/server/tturrets/system/system_main.qc
Log:
turret_stdproc_use team changes the turret to its *activator* now.
no need for the special turrets case in assault anymore.

Modified: trunk/data/qcsrc/server/assault.qc
===================================================================
--- trunk/data/qcsrc/server/assault.qc	2008-10-29 19:19:14 UTC (rev 4938)
+++ trunk/data/qcsrc/server/assault.qc	2008-10-29 19:48:32 UTC (rev 4939)
@@ -259,6 +259,7 @@
 	activator = self;
 	SUB_UseTargets();
 
+/*
 #ifdef TTURRETS_ENABLED
     entity ent,oldself;
 
@@ -282,6 +283,7 @@
 	}
 	self = oldself;
 #endif
+*/
 
 }
 

Modified: trunk/data/qcsrc/server/tturrets/system/system_main.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/system/system_main.qc	2008-10-29 19:19:14 UTC (rev 4938)
+++ trunk/data/qcsrc/server/tturrets/system/system_main.qc	2008-10-29 19:48:32 UTC (rev 4939)
@@ -735,8 +735,16 @@
 {
     // bprint("Used:",self.netname, " By ",other.netname,"\n");
 
+    self.team = activator.team;
+
+    if(self.team == 0)
+        self.tur_active = 0;
+    else
+        self.tur_active = 1;
+
     // ONS Uses _use to communicate.
     //if (g_onslaught)
+    /*
     if (1) // if anyone ever figures out why i needed a active toggle here, fix this
     {
         entity e;
@@ -764,6 +772,7 @@
         else
             self.tur_active = 1;
     }
+    */
 
 }