From cc27f0c12851cbe300058b3a0ad7535b5a489263 Mon Sep 17 00:00:00 2001
From: Jakob MG <jakob_mg@hotmail.com>
Date: Tue, 10 Aug 2010 16:59:21 +0200
Subject: [PATCH] Add relay_(de)activate entity, make trigger_push and
 func_rotating work with it.

---
 qcsrc/server/defs.qh       |  8 +++++++
 qcsrc/server/g_triggers.qc | 43 ++++++++++++++++++++++++++++++++++++++
 qcsrc/server/t_jumppads.qc | 27 ++++++++++++++++++++++--
 qcsrc/server/t_plats.qc    | 27 +++++++++++++++++++++++-
 4 files changed, 102 insertions(+), 3 deletions(-)

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 74b4ecea8..26e7075d3 100644
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -635,3 +635,11 @@ string deathmessage;
 .float selectweapon; // last selected weapon of the player
 
 .float ballistics_density; // wall piercing factor, larger = bullet can pass through more
+
+#define ACTIVE_NOT 		0
+#define ACTIVE_ACTIVE 	1
+#define ACTIVE_IDLE 	2
+#define ACTIVE_BUSY 	2
+#define ACTIVE_TOGGLE	3
+.float active;
+.float (float act_state) setactive;
\ No newline at end of file
diff --git a/qcsrc/server/g_triggers.qc b/qcsrc/server/g_triggers.qc
index c31352ed5..2ed219ac2 100644
--- a/qcsrc/server/g_triggers.qc
+++ b/qcsrc/server/g_triggers.qc
@@ -1931,3 +1931,46 @@ void spawnfunc_trigger_magicear()
 	// target:
 	//   what to trigger
 }
+
+void relay_activateors_use()
+{
+	entity trg, os;
+	
+	os = self;
+	
+	for(trg = world; (trg = find(trg, targetname, os.target)); )
+	{
+		self = trg;
+		if (trg.setactive)
+			trg.setactive(os.cnt);
+		else
+		{
+			if(os.cnt == ACTIVE_TOGGLE)
+				if(trg.active)
+					trg.active = ACTIVE_NOT;
+				else	
+					trg.active = ACTIVE_ACTIVE;
+			else
+				trg.active = os.cnt;
+		}		
+	}
+	self = os;
+}
+
+void spawnfunc_relay_activate()
+{
+	self.cnt = ACTIVE_ACTIVE;
+	self.use = relay_activateors_use;
+}
+
+void spawnfunc_relay_deactivate()
+{
+	self.cnt = ACTIVE_NOT;
+	self.use = relay_activateors_use;	
+}
+
+void spawnfunc_relay_activatetoggle()
+{
+	self.cnt = ACTIVE_TOGGLE;
+	self.use = relay_activateors_use;	
+}
diff --git a/qcsrc/server/t_jumppads.qc b/qcsrc/server/t_jumppads.qc
index 9bb8f7c92..606f3b3de 100644
--- a/qcsrc/server/t_jumppads.qc
+++ b/qcsrc/server/t_jumppads.qc
@@ -127,6 +127,9 @@ vector trigger_push_calculatevelocity(vector org, entity tgt, float ht)
 
 void trigger_push_touch()
 {
+	if (self.active == ACTIVE_NOT) 
+		return;		
+		
 	// FIXME: add a .float for whether an entity should be tossed by jumppads
 	if (!other.iscreature)
 	if (other.classname != "corpse")
@@ -228,8 +231,26 @@ void trigger_push_touch()
 	}
 };
 
-.vector dest;
+void trigger_push_setactive(float astate)
+{
+	self.active = astate;
+		
+	if(astate == ACTIVE_NOT)
+		self.touch = SUB_Null;
+	else if (astate == ACTIVE_TOGGLE)
+	{
+		if(self.active)
+			self.active = ACTIVE_NOT;
+		else
+			self.active = ACTIVE_ACTIVE;
+	}
+	else
+		self.touch = trigger_push_touch;
+}
+
 
+
+.vector dest;
 void trigger_push_findtarget()
 {
 	local entity e;
@@ -287,7 +308,9 @@ void spawnfunc_trigger_push()
 		SetMovedir ();
 
 	EXACTTRIGGER_INIT;
-
+	
+	self.active = ACTIVE_ACTIVE;	
+	self.setactive = trigger_push_setactive;
 	self.use = trigger_push_use;
 	self.touch = trigger_push_touch;
 
diff --git a/qcsrc/server/t_plats.qc b/qcsrc/server/t_plats.qc
index ad80e7f99..8dac99e41 100644
--- a/qcsrc/server/t_plats.qc
+++ b/qcsrc/server/t_plats.qc
@@ -327,6 +327,25 @@ void spawnfunc_func_train()
 	// TODO make a reset function for this one
 };
 
+void func_rotating_setactive(float astate)
+{
+	
+	if (astate == ACTIVE_TOGGLE)
+	{
+		if(self.active)
+			self.active = ACTIVE_NOT;
+		else
+			self.active = ACTIVE_ACTIVE;
+	}
+	else
+		self.active = astate;
+		
+	if(astate == ACTIVE_NOT)		
+		self.avelocity = '0 0 0';
+	else
+		self.avelocity = self.pos1;
+}
+
 /*QUAKED spawnfunc_func_rotating (0 .5 .8) ? - - X_AXIS Y_AXIS
 Brush model that spins in place on one axis (default Z).
 speed   : speed to rotate (in degrees per second)
@@ -342,6 +361,10 @@ void spawnfunc_func_rotating()
 		precache_sound(self.noise);
 		ambientsound(self.origin, self.noise, VOL_BASE, ATTN_IDLE);
 	}
+	
+	self.active = ACTIVE_ACTIVE;
+	self.setactive = func_rotating_setactive;
+	
 	if (!self.speed)
 		self.speed = 100;
 	// FIXME: test if this turns the right way, then remove this comment (negate as needed)
@@ -353,7 +376,9 @@ void spawnfunc_func_rotating()
 	// FIXME: test if this turns the right way, then remove this comment (negate as needed)
 	else // Z
 		self.avelocity = '0 1 0' * self.speed;
-
+	
+	self.pos1 = self.avelocity;
+    
     if(self.dmg & (!self.message))
         self.message = " was squished";
     if(self.dmg && (!self.message2))
-- 
2.39.2