From 5c6ecc7367dcca14b46399e08bfc0c70305434e8 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Sun, 7 Jan 2024 22:21:11 +0000
Subject: [PATCH] Since we're polishing `advancemap`, let's also make it so the
 Pause menu Gametype switch doesn't set up the Voting screen if it's anything
 other than `advancemap vote`

---
 src/menus/transient/pause-game.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/menus/transient/pause-game.c b/src/menus/transient/pause-game.c
index bbf9c3eec..762b778cc 100644
--- a/src/menus/transient/pause-game.c
+++ b/src/menus/transient/pause-game.c
@@ -336,7 +336,14 @@ void M_HandlePauseMenuGametype(INT32 choice)
 			M_ClearMenus(true);
 			if (server || IsPlayerAdmin(consoleplayer))
 			{
-				D_SetupVote(menugametype);
+				if (cv_advancemap.value == 3) // Voting screen.
+				{
+					D_SetupVote(menugametype);
+				}
+				else // ideally for "random" only, but no sane fallback for "same" and "next"
+				{
+					COM_ImmedExecute(va("randommap -gt %s", gametypes[menugametype]->name));
+				}
 			}
 			return;
 		}