From f01bb3e793fadc55ce441c2748dd5b4688ce2755 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Thu, 17 Nov 2022 18:30:55 +0000
Subject: [PATCH] Make the second page of cups accessible by up/down input at
 the limit, rather than left/right input

---
 src/k_menufunc.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/k_menufunc.c b/src/k_menufunc.c
index 73eeb4aef..7c06c3ecd 100644
--- a/src/k_menufunc.c
+++ b/src/k_menufunc.c
@@ -3528,12 +3528,7 @@ void M_CupSelectHandler(INT32 choice)
 	{
 		cupgrid.x++;
 		if (cupgrid.x >= CUPMENU_COLUMNS)
-		{
 			cupgrid.x = 0;
-			cupgrid.pageno++;
-			if (cupgrid.pageno >= cupgrid.numpages)
-				cupgrid.pageno = 0;
-		}
 		S_StartSound(NULL, sfx_s3k5b);
 		M_SetMenuDelay(pid);
 	}
@@ -3541,12 +3536,7 @@ void M_CupSelectHandler(INT32 choice)
 	{
 		cupgrid.x--;
 		if (cupgrid.x < 0)
-		{
 			cupgrid.x = CUPMENU_COLUMNS-1;
-			cupgrid.pageno--;
-			if (cupgrid.pageno < 0)
-				cupgrid.pageno = cupgrid.numpages-1;
-		}
 		S_StartSound(NULL, sfx_s3k5b);
 		M_SetMenuDelay(pid);
 	}
@@ -3555,7 +3545,12 @@ void M_CupSelectHandler(INT32 choice)
 	{
 		cupgrid.y++;
 		if (cupgrid.y >= CUPMENU_ROWS)
+		{
 			cupgrid.y = 0;
+			cupgrid.pageno--;
+			if (cupgrid.pageno < 0)
+				cupgrid.pageno = cupgrid.numpages-1;
+		}
 		S_StartSound(NULL, sfx_s3k5b);
 		M_SetMenuDelay(pid);
 	}
@@ -3563,7 +3558,12 @@ void M_CupSelectHandler(INT32 choice)
 	{
 		cupgrid.y--;
 		if (cupgrid.y < 0)
+		{
 			cupgrid.y = CUPMENU_ROWS-1;
+			cupgrid.pageno++;
+			if (cupgrid.pageno >= cupgrid.numpages)
+				cupgrid.pageno = 0;
+		}
 		S_StartSound(NULL, sfx_s3k5b);
 		M_SetMenuDelay(pid);
 	}