From 1848ce4b9785ba044496c92fb8f1f8594804c369 Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Mon, 24 Feb 2020 10:02:36 -0600
Subject: [PATCH] Skip empty gametypes in level select menu
---
src/m_menu.c | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/m_menu.c b/src/m_menu.c
index 945ce3de0b..b39fcc2bf5 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -5045,6 +5045,17 @@ static boolean M_SetNextMapOnPlatter(void)
}
#endif
+static boolean M_GametypeHasLevels(INT32 gt)
+{
+ INT32 mapnum;
+
+ for (mapnum = 0; mapnum < NUMMAPS; mapnum++)
+ if (M_CanShowLevelOnPlatter(mapnum, gt))
+ return true;
+
+ return false;
+}
+
static INT32 M_CountRowsToShowOnPlatter(INT32 gt)
{
INT32 mapnum = 0, prevmapnum = 0, col = 0, rows = 0;
@@ -5362,7 +5373,9 @@ static void M_HandleLevelPlatter(INT32 choice)
case KEY_RIGHTARROW:
if (levellistmode == LLM_CREATESERVER && !lsrow)
{
- CV_AddValue(&cv_newgametype, 1);
+ do
+ CV_AddValue(&cv_newgametype, 1);
+ while (!M_GametypeHasLevels(cv_newgametype.value));
S_StartSound(NULL,sfx_menu1);
lscol = 0;
@@ -5391,7 +5404,9 @@ static void M_HandleLevelPlatter(INT32 choice)
case KEY_LEFTARROW:
if (levellistmode == LLM_CREATESERVER && !lsrow)
{
- CV_AddValue(&cv_newgametype, -1);
+ do
+ CV_AddValue(&cv_newgametype, -1);
+ while (!M_GametypeHasLevels(cv_newgametype.value));
S_StartSound(NULL,sfx_menu1);
lscol = 0;
--
GitLab