From a2caa2dc166fc1a735cef8bf08a161bb3fad988b Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Sat, 15 Aug 2020 22:40:49 -0400
Subject: [PATCH] Character select can open without crashing

---
 src/d_netcmd.c | 2 +-
 src/m_menu.c   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 1e92b846f..a901cf22d 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -1479,7 +1479,7 @@ static void SendNameAndColor(UINT8 n)
 	WRITEUINT16(p, (UINT16)cv_playercolor[n].value);
 	WRITEUINT8(p, (UINT8)cv_skin[n].value);
 	WRITESINT8(p, (UINT8)cv_follower[n].value);
-	WRITESINT8(p, (UINT8)cv_followercolor[n].value);
+	WRITEUINT16(p, (UINT8)cv_followercolor[n].value);
 	SendNetXCmdForPlayer(n, XD_NAMEANDCOLOR, buf, p - buf);
 }
 
diff --git a/src/m_menu.c b/src/m_menu.c
index fb8059c3d..d404ab0c4 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -9563,7 +9563,7 @@ static void M_DrawSetupMultiPlayerMenu(void)
 		INT32 offx = 8, offy = 8;
 		patch_t *cursor;
 		static UINT8 cursorframe = 0;
-		patch_t *face;
+		//patch_t *face;
 		UINT8 *colmap;
 
 		if (skullAnimCounter % 4 == 0)
@@ -9580,19 +9580,19 @@ static void M_DrawSetupMultiPlayerMenu(void)
 			if (!(k++))
 			{
 				scale = FRACUNIT;
-				face = facewantprefix[col];
+				//face = facewantprefix[col];
 				offx = 12;
 				offy = 0;
 			}
 			else
 			{
 				scale = FRACUNIT/2;
-				face = facerankprefix[col];
+				//face = facerankprefix[col];
 				offx = 8;
 				offy = 8;
 			}
 			colmap =  R_GetTranslationColormap(col, setupm_fakecolor->color, GTC_MENUCACHE);
-			V_DrawFixedPatch((x+offx)<<FRACBITS, (my+28+offy)<<FRACBITS, FRACUNIT, 0, face, colmap);
+			//V_DrawFixedPatch((x+offx)<<FRACBITS, (my+28+offy)<<FRACBITS, FRACUNIT, 0, face, colmap);
 			if (scale == FRACUNIT) // bit of a hack
 				V_DrawFixedPatch((x+offx)<<FRACBITS, (my+28+offy)<<FRACBITS, FRACUNIT, 0, cursor, colmap);
 			if (++col >= numskins)