From fc407cf6ce3c589906e76c00d275ded9d81f127e Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Mon, 25 Nov 2019 16:55:06 +0000
Subject: [PATCH] Skip tagteam characters (ie, Sonic&Tails) for NiGHTS secret
 map character selection.

---
 src/m_menu.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/m_menu.c b/src/m_menu.c
index 44a06ca044..38b0728700 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -8350,6 +8350,8 @@ static void M_SetupChoosePlayer(INT32 choice)
 				if (and)
 				{
 					char firstskin[SKINNAMESIZE+1];
+					if (mapheaderinfo[startmap-1]->typeoflevel & TOL_NIGHTS) // skip tagteam characters for NiGHTS levels
+						continue;
 					strncpy(firstskin, description[i].skinname, (and - description[i].skinname));
 					firstskin[(and - description[i].skinname)] = '\0';
 					description[i].skinnum[0] = R_SkinAvailable(firstskin);
-- 
GitLab