From d755a7ae6c090a3dc62f2929ab5ff8bcb877ea32 Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Sun, 23 Aug 2020 14:51:02 -0400
Subject: [PATCH] Fix skincolor selection

---
 src/m_menu.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/m_menu.c b/src/m_menu.c
index e26ed218c..606749462 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -9511,7 +9511,7 @@ static void M_DrawSetupMultiPlayerMenu(void)
 #define charw 72
 #define indexwidth 8
 	{
-		const INT32 numcolors = (282-charw)/(2*indexwidth); // Number of colors per side
+		const INT32 numcolors = (250-charw)/(2*indexwidth); // Number of colors per side
 		INT32 x = mx;
 		INT32 w = indexwidth; // Width of a singular color block
 		menucolor_t *mc = setupm_fakecolor->prev; // Last accessed color
@@ -10079,6 +10079,11 @@ static boolean M_QuitMultiPlayerMenu(void)
 void M_AddMenuColor(UINT16 color) {
 	menucolor_t *c;
 
+	// SRB2Kart: I do not understand vanilla doesn't need this but WE do???!?!??!
+	if (!skincolors[color].accessible) {
+		return;
+	}
+
 	if (color >= numskincolors) {
 		CONS_Printf("M_AddMenuColor: color %d does not exist.",color);
 		return;