[nexuiz-commits] r7341 - in trunk/data/qcsrc/server: . tturrets/system

[DONOTREPLY at icculus.org]

Author: tzork
Date: 2009-08-05 04:43:21 -0400 (Wed, 05 Aug 2009)
New Revision: 7341

Modified:
   trunk/data/qcsrc/server/t_plats.qc
   trunk/data/qcsrc/server/tturrets/system/system_main.qc
Log:
FL_NOTARGET for buttons and no expensive classname check for turrets.

Modified: trunk/data/qcsrc/server/t_plats.qc
===================================================================
--- trunk/data/qcsrc/server/t_plats.qc	2009-08-05 06:07:45 UTC (rev 7340)
+++ trunk/data/qcsrc/server/t_plats.qc	2009-08-05 08:43:21 UTC (rev 7341)
@@ -614,6 +614,7 @@
 
 	self.pos1 = self.origin;
 	self.pos2 = self.pos1 + self.movedir*(fabs(self.movedir*self.size) - self.lip);
+    self.flags |= FL_NOTARGET;
 
 	button_reset();
 };
@@ -667,7 +668,7 @@
 			if (self.classname == "door")
 			{
 				door_go_up ();
-			} else 
+			} else
 			{
 				door_rotating_go_up ();
 			}
@@ -675,7 +676,7 @@
 			if (self.classname == "door")
 			{
 				door_go_down ();
-			} else 
+			} else
 			{
 				door_rotating_go_down ();
 			}
@@ -711,7 +712,7 @@
 	if (self.classname == "door")
 	{
 		self.think = door_go_down;
-	} else 
+	} else
 	{
 		self.think = door_rotating_go_down;
 	}
@@ -788,7 +789,7 @@
 			starte = self;
 			do
 			{
-				if (self.classname == "door") 
+				if (self.classname == "door")
 				{
 					door_go_down ();
 				}
@@ -810,13 +811,13 @@
 		if (self.classname == "door")
 		{
 			door_go_up ();
-		} else 
+		} else
 		{
 			// if the BIDIR spawnflag (==2) is set and the trigger has set trigger_reverse, reverse the opening direction
-			if ((self.spawnflags & 2) && other.trigger_reverse!=0 && self.lip!=666 && self.state == STATE_BOTTOM) 
-			{ 
+			if ((self.spawnflags & 2) && other.trigger_reverse!=0 && self.lip!=666 && self.state == STATE_BOTTOM)
+			{
 				self.lip = 666; // self.lip is used to remember reverse opening direction for door_rotating
-			  	self.pos2 = '0 0 0' - self.pos2; 
+			  	self.pos2 = '0 0 0' - self.pos2;
 			}
 			// if BIDIR_IN_DOWN (==8) is set, prevent the door from reoping during closing if it is triggered from the wrong side
 			if (!((self.spawnflags & 2) &&  (self.spawnflags & 8) && self.state == STATE_DOWN
@@ -960,8 +961,8 @@
 	if (self.noise1 != "")
 		sound (self, CHAN_TRIGGER, self.noise1, VOL_BASE, ATTN_NORM);
 	if (self.lip==666) // self.lip is used to remember reverse opening direction for door_rotating
-	{ 
-		self.pos2 = '0 0 0' - self.pos2; 
+	{
+		self.pos2 = '0 0 0' - self.pos2;
 		self.lip = 0;
 	}
 	self.state = STATE_BOTTOM;
@@ -1081,7 +1082,7 @@
 		return;		// don't want to link this door
 	}
 
-	cmins = self.absmin;			  
+	cmins = self.absmin;
 	cmaxs = self.absmax;
 
 	starte = self;
@@ -1298,7 +1299,7 @@
 
 void spawnfunc_func_door_rotating()
 {
-	
+
 	//if (!self.deathtype) // map makers can override this
 	//	self.deathtype = " got in the way";
 

Modified: trunk/data/qcsrc/server/tturrets/system/system_main.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/system/system_main.qc	2009-08-05 06:07:45 UTC (rev 7340)
+++ trunk/data/qcsrc/server/tturrets/system/system_main.qc	2009-08-05 08:43:21 UTC (rev 7341)
@@ -580,8 +580,10 @@
     if (e_target.classname == "grapplinghook")
         return -20;
 
+    /*
     if (e_target.classname == "func_button")
         return -21;
+    */
 
 #ifdef TURRET_DEBUG_TARGETSELECT
     dprint("Target:",e_target.netname," is a valid target for ",e_turret.netname,"\n");