vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

func_button: Unstuck the 'health' trigger method.

Browse source
This commit is contained in:
Marco Cawthorne 2021-01-23 22:07:41 +01:00
parent 8b013035e3
commit ab1e5408df
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/gs-entbase/server/func_button.cpp
View file

@ -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) {