From d4c6c7585835de52110f270dd5de18431579b689 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Fri, 1 Sep 2023 15:20:46 +0100
Subject: [PATCH] Y_DrawIntermissionButton

- The (A) that appears on the intermission to permit you to skip it now has its own drawer function.
- This drawer (interpolatedly) slides it in and out depending on the two times passed to it.
- Now slides in at the first half-second of intermission, preventing mashing through.
---
 src/y_inter.c | 86 ++++++++++++++++++++++++++++++++++++++++++++-------
 src/y_inter.h |  1 +
 2 files changed, 76 insertions(+), 11 deletions(-)

diff --git a/src/y_inter.c b/src/y_inter.c
index d3a26e164..e0d1008da 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -1349,6 +1349,67 @@ void Y_RoundQueueDrawer(y_data_t *standings, INT32 offset, boolean doanimations,
 	}
 }
 
+#define INTERBUTTONSLIDEIN (TICRATE/2)
+
+//
+// Y_DrawIntermissionButton
+//
+// It's a button that slides at the given time
+//
+void Y_DrawIntermissionButton(INT32 startslide, INT32 through)
+{
+	INT32 percentslide = 0;
+	const INT32 slidetime = (TICRATE/4);
+	boolean pressed = false;
+
+	if (startslide >= 0)
+	{
+		through = startslide;
+	}
+	else
+	{
+		through -= ((TICRATE/2) + 1);
+		pressed = (!menuactive && M_MenuConfirmHeld(0));
+	}
+
+	if (through >= 0)
+	{
+		if (through >= slidetime)
+		{
+			percentslide = FRACUNIT;
+		}
+		else
+		{
+			percentslide = R_InterpolateFixed(
+				(through - 1) * FRACUNIT,
+				(through * FRACUNIT)
+			) / slidetime;
+		}
+	}
+
+	if (percentslide < FRACUNIT)
+	{
+		INT32 offset = 0;
+
+		if (percentslide)
+		{
+			offset = Easing_InCubic(
+				percentslide,
+				0,
+				16 * FRACUNIT
+			);
+		}
+
+		K_drawButton(
+			2*FRACUNIT - offset,
+			(BASEVIDHEIGHT - 16)*FRACUNIT,
+			0,
+			kp_button_a[1],
+			pressed
+		);
+	}
+}
+
 //
 // Y_IntermissionDrawer
 //
@@ -1541,13 +1602,7 @@ finalcounter:
 
 	if (Y_CanSkipIntermission())
 	{
-		K_drawButton(
-				2*FRACUNIT,
-				(BASEVIDHEIGHT - 16)*FRACUNIT,
-				0,
-				kp_button_a[1],
-				M_MenuConfirmHeld(0)
-		);
+		Y_DrawIntermissionButton(INTERBUTTONSLIDEIN - intertic, 3*TICRATE - timer);
 	}
 	else
 	{
@@ -1597,14 +1652,22 @@ void Y_Ticker(void)
 
 	if (Y_CanSkipIntermission())
 	{
-		if (M_MenuConfirmPressed(0))
+		if (intertic < INTERBUTTONSLIDEIN)
+		{
+			intertic++;
+			return;
+		}
+
+		boolean preventintertic = (intertic == INTERBUTTONSLIDEIN);
+
+		if (!menuactive && M_MenuConfirmPressed(0))
 		{
 			// If there is a roundqueue, make time for it.
 			// Else, end instantly on button press.
 			// Actually, give it a slight delay, so the "kaching" sound isn't cut off.
 			const tic_t end = roundqueue.size != 0 ? 3*TICRATE : TICRATE;
 
-			if (intertic == -1) // card flip hasn't started
+			if (intertic == INTERBUTTONSLIDEIN) // card flip hasn't started
 			{
 				if (sorttic != -1)
 				{
@@ -1612,9 +1675,10 @@ void Y_Ticker(void)
 				}
 				else
 				{
-					intertic = 0;
 					timer = end;
 				}
+
+				preventintertic = false;
 			}
 			else if (timer >= INFINITE_TIMER && intertic >= sorttic + 16) // card done flipping
 			{
@@ -1629,7 +1693,7 @@ void Y_Ticker(void)
 			}
 		}
 
-		if (intertic == -1)
+		if (preventintertic)
 		{
 			return;
 		}
diff --git a/src/y_inter.h b/src/y_inter.h
index 6995023db..577ac78d1 100644
--- a/src/y_inter.h
+++ b/src/y_inter.h
@@ -51,6 +51,7 @@ void Y_Ticker(void);
 // Specific sub-drawers
 void Y_PlayerStandingsDrawer(y_data_t *standings, INT32 xoffset);
 void Y_RoundQueueDrawer(y_data_t *standings, INT32 offset, boolean doanimations, boolean widescreen);
+void Y_DrawIntermissionButton(INT32 startslide, INT32 through);
 
 void Y_StartIntermission(void);
 void Y_EndIntermission(void);