From 78bce113b465fe67234a218680a85635a0e8700b Mon Sep 17 00:00:00 2001
From: tzork <tzork@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Wed, 5 Aug 2009 08:43:21 +0000
Subject: [PATCH] FL_NOTARGET for buttons and no expensive classname check for
 turrets.

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@7341 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/server/t_plats.qc                  | 25 ++++++++++---------
 .../server/tturrets/system/system_main.qc     |  2 ++
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/data/qcsrc/server/t_plats.qc b/data/qcsrc/server/t_plats.qc
index a6560d69d..e52a0cf0a 100644
--- a/data/qcsrc/server/t_plats.qc
+++ b/data/qcsrc/server/t_plats.qc
@@ -614,6 +614,7 @@ void spawnfunc_func_button()
 
 	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 @@ void door_blocked()
 			if (self.classname == "door")
 			{
 				door_go_up ();
-			} else 
+			} else
 			{
 				door_rotating_go_up ();
 			}
@@ -675,7 +676,7 @@ void door_blocked()
 			if (self.classname == "door")
 			{
 				door_go_down ();
-			} else 
+			} else
 			{
 				door_rotating_go_down ();
 			}
@@ -711,7 +712,7 @@ void door_hit_top()
 	if (self.classname == "door")
 	{
 		self.think = door_go_down;
-	} else 
+	} else
 	{
 		self.think = door_rotating_go_down;
 	}
@@ -788,7 +789,7 @@ void door_fire()
 			starte = self;
 			do
 			{
-				if (self.classname == "door") 
+				if (self.classname == "door")
 				{
 					door_go_down ();
 				}
@@ -810,13 +811,13 @@ void door_fire()
 		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 @@ void door_rotating_hit_bottom()
 	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 @@ void LinkDoors()
 		return;		// don't want to link this door
 	}
 
-	cmins = self.absmin;			  
+	cmins = self.absmin;
 	cmaxs = self.absmax;
 
 	starte = self;
@@ -1298,7 +1299,7 @@ void door_rotating_init_startopen()
 
 void spawnfunc_func_door_rotating()
 {
-	
+
 	//if (!self.deathtype) // map makers can override this
 	//	self.deathtype = " got in the way";
 
diff --git a/data/qcsrc/server/tturrets/system/system_main.qc b/data/qcsrc/server/tturrets/system/system_main.qc
index 03fd26e1f..144ea54da 100644
--- a/data/qcsrc/server/tturrets/system/system_main.qc
+++ b/data/qcsrc/server/tturrets/system/system_main.qc
@@ -580,8 +580,10 @@ float turret_validate_target(entity e_turret,entity e_target,float validate_flag
     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");
-- 
2.39.2