From ab1e5408df6261279a19d9be7bdb4f15ce9177bb Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Sat, 23 Jan 2021 22:07:41 +0100
Subject: [PATCH] func_button: Unstuck the 'health' trigger method.

---
 src/gs-entbase/server/func_button.cpp | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/gs-entbase/server/func_button.cpp b/src/gs-entbase/server/func_button.cpp
index 5cf08350..9e690658 100644
--- a/src/gs-entbase/server/func_button.cpp
+++ b/src/gs-entbase/server/func_button.cpp
@@ -26,6 +26,7 @@
 "delay"         Delay until the Target gets triggered.
 "sounds"        Obsolete legacy key for HL/Q1 style buttons to decide
                 which sounds to play.
+"health"        Amount of damage this button takes before it triggers.
 
 Outputs:
 "OnDamaged"     Fired when the button is damaged.
@@ -116,8 +117,8 @@ class func_button:CBaseTrigger
 	virtual void(void) Touch;
 	virtual void(void) Blocked;
 	virtual void(entity, int) Trigger;
+	virtual void(void) DeathTrigger;
 	virtual void(void) Use;
-	virtual void(void) Death;
 	
 	virtual void(void) SetMovementDirection;
 	virtual void(vector, void(void)) MoveToDestination;
@@ -236,6 +237,13 @@ func_button::Trigger(entity act, int state)
 
 	UseOutput(act, m_strOnPressed);
 	UseTargets(act, TRIG_TOGGLE, m_flDelay);
+	health = m_oldHealth;
+}
+
+void
+func_button::DeathTrigger(void)
+{
+	Trigger(g_dmg_eAttacker, TRIG_TOGGLE);
 }
 
 void
@@ -256,17 +264,6 @@ func_button::Use(void)
 	Trigger(eActivator, TRIG_TOGGLE);
 }
 
-void
-func_button::Death(void)
-{
-	if (m_strOnOut)
-		UseOutput(g_dmg_eAttacker, m_strOnDamaged);
-	else
-		Trigger(g_dmg_eAttacker, TRIG_TOGGLE);
-
-	health = m_oldHealth;
-}
-
 void
 func_button::Blocked(void)
 {
@@ -346,6 +343,7 @@ func_button::Respawn(void)
 
 	if (health > 0) {
 		takedamage = DAMAGE_YES;
+		Death = DeathTrigger;
 	}
 
 	if (!m_flSpeed) {