From 2418480af4db7d76cfb3b23ee3e8c0b320881fc2 Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Fri, 27 Nov 2020 03:03:39 +0100
Subject: [PATCH] func_button: Add support for the 'OnPressed' output.

---
 .../textures/dev/model_bone.mat               |   8 ++++++++
 .../textures/dev/model_bone.tga               | Bin 0 -> 1042 bytes
 src/client/sound.c                            |   2 --
 src/gs-entbase/server/func_button.cpp         |  18 +++++++++++++++++-
 src/gs-entbase/server/info_intermission.cpp   |   1 -
 5 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 platform/base_textures.pk3dir/textures/dev/model_bone.mat
 create mode 100644 platform/base_textures.pk3dir/textures/dev/model_bone.tga

diff --git a/platform/base_textures.pk3dir/textures/dev/model_bone.mat b/platform/base_textures.pk3dir/textures/dev/model_bone.mat
new file mode 100644
index 00000000..42859b01
--- /dev/null
+++ b/platform/base_textures.pk3dir/textures/dev/model_bone.mat
@@ -0,0 +1,8 @@
+{
+	diffusemap textures/dev/model_bone.tga
+	
+	{
+		map $diffuse
+		blendFunc blend
+	}
+}
diff --git a/platform/base_textures.pk3dir/textures/dev/model_bone.tga b/platform/base_textures.pk3dir/textures/dev/model_bone.tga
new file mode 100644
index 0000000000000000000000000000000000000000..7afd2da6169aceb435656fc3e5073b4d04675f76
GIT binary patch
literal 1042
zcmYL|eN2^A9LLYShP-syLlR0wLuhjqLDC%vNWzSl$N&W)Kx1m!vPnXlwvkOh3Jk>8
zd*_9ziLCyR&E*oyRgj};w-?MnyiyQKa)|`w<;I2QKA#TUxz6_6+1bwbdp^H&&Q}N@
z@nHA~Ke5!SA}}yec#9>?qM)$IXpG%t4vT!vw$Lxb>7k@L!y;a?MMfo=3kq_K!vCO{
z-(5Z@dAO#g!Vs5KY6<ZwQB%Yg^27#mMJ|aVoe;4W;hl=7?+P_$Wvb<)%3{O3N|}=$
zsH-)^84tF;rz_=HPy(hPLETe2s)BWt`wMpY2JpH_=1Gw$T@ne8Olh5SnA0jEWI}9Q
z{fXtwqEgOBFTzw9K+zsAva38utI)HqNYB<}!QLPp#fIfX%%da`6TikH9yJMN_x3N0
z7ebDy*4!{m$Cpw4rNWi#k8$I-Ksv0CaOvBHe9$1sltyLY53$Q&Bvj<%sU)fS1sjY?
zTh>?RzVwxxJsr=5o-mvvt8fjkW_B<E$DI|}yPxL9PXU}dw}6~t9Uq74c}tgvFy!+>
z^g6R*&#JfGJDksn{&=+U0{Ht)7~bxlhc==Ou3@r2ir=pXQPHHQG{b}aPdrbsc$>M$
zQPko?&d&B7{5887M#^Bc7RC<AI^bRp?*Mx?Qv=al=?LK6z1}n|)$_90iKqV?PKB~^
zXV=jCXjH;@BTRk{Qx|2Ohlw-NutpNSBZ<<n+n=Gt>_hW%1BLqCcrD)PR8;eR+n<xi
zfs^p>WpH-EOply9!O<p7nk30SX|Rcji8#ud9_Lc*Vzzkf<GGkUvW14D=4tgJ_i2{G
zKR}z5H3P0Ox$c%EEwY^>lA?&du|yghB502dBi*N-sKjdX0>{}Fqjvi{b&&5twNoxx
z@RoX*9gqyIaKB!1lyG|BMY^lfXn(eXCBC1jh1=?k3hN!h)p6OPX+w<DC$&;IKeYc1
zCQVr76<_;i8zXtIP_?Xu#I?;95j-H~Kl0tty9U=_Z>vk2W{Odq+>=en)3qO@X(Luw
zC3kLBLD^QiR#{0%zS?@!baMV9yF+Amj2c|My%t9PQB`e9ss^ObuQ*&^qg^`z)ra{d
zuSeaS-*2fub<Q0kcVuU7A*O%6ZPc#bG;2TJw9(e-)IRNWI%@lE)|zp1`G-SB5sEvq
Z4>G?#D<?TOEjukUBRnr9?bYN6@gLSbWSIZ}

literal 0
HcmV?d00001

diff --git a/src/client/sound.c b/src/client/sound.c
index 7fa612ce..8c2b819f 100644
--- a/src/client/sound.c
+++ b/src/client/sound.c
@@ -48,5 +48,3 @@ Sound_ParseLoopingEntity(entity sndent, float isNew)
 	}
 	sound(new, CHAN_VOICE, new.m_strSample, new.m_flVolume, new.m_flAttn, new.m_flPitch);
 }
-
-
diff --git a/src/gs-entbase/server/func_button.cpp b/src/gs-entbase/server/func_button.cpp
index 265708e2..bcb98de0 100644
--- a/src/gs-entbase/server/func_button.cpp
+++ b/src/gs-entbase/server/func_button.cpp
@@ -94,6 +94,9 @@ class func_button:CBaseTrigger
 	string m_strSndPressed;
 	string m_strSndUnpressed;
 
+	/* input/output */
+	string m_strOnPressed;
+
 	virtual void(void) Respawn;
 	virtual void(void) Arrived;
 	virtual void(void) Returned;
@@ -214,7 +217,11 @@ func_button::Trigger(entity act, int state)
 		Sound_Play(this, CHAN_VOICE, m_strSndPressed);
 
 	MoveAway();
-	UseTargets(act, TRIG_TOGGLE, m_flDelay);
+
+	if (m_strOnPressed)
+		UseOutput(act, m_strOnPressed);
+	else
+		UseTargets(act, TRIG_TOGGLE, m_flDelay);
 }
 
 void
@@ -366,6 +373,11 @@ func_button::SpawnKey(string strKey, string strValue)
 	case "wait":
 		m_flWait = stof(strValue);
 		break;
+	/* input/output */
+	case "OnPressed":
+		strValue = strreplace(",", ",_", strValue);
+		m_strOnPressed = strcat(m_strOnPressed, ",_", strValue);
+		break;
 	/* compatibility */
 	case "sounds":
 		m_strSndPressed = sprintf("func_button.hlsfx_%i", stoi(strValue) + 1i);
@@ -387,4 +399,8 @@ func_button::func_button(void)
 
 	if (m_strSndUnpressed)
 		Sound_Precache(m_strSndUnpressed);
+
+	/* input/output */
+	if (m_strOnPressed)
+		m_strOnPressed = CreateOutput(m_strOnPressed);
 }
diff --git a/src/gs-entbase/server/info_intermission.cpp b/src/gs-entbase/server/info_intermission.cpp
index 3afcf67a..3187661b 100644
--- a/src/gs-entbase/server/info_intermission.cpp
+++ b/src/gs-entbase/server/info_intermission.cpp
@@ -16,7 +16,6 @@
 
 /*QUAKED info_intermission (1 0 0) (-8 -8 -8) (8 8 8)
 "targetname" Name
-"targetname" Target entity to aim towards
 
 An entity that's used to create an 'Intermission' camera.
 Some mods use this while displaying the final scores, once a timelimit