From 28607a81b58b856b09473057c9a14b84a6b9e591 Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Wed, 16 Oct 2019 18:25:20 -0400
Subject: [PATCH] Kill off SPR2_NTAG

---
 src/info.c   |  1 -
 src/info.h   |  2 --
 src/m_menu.c | 14 +-------------
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/info.c b/src/info.c
index 28cdb6cf2..930b079e9 100644
--- a/src/info.c
+++ b/src/info.c
@@ -599,7 +599,6 @@ char spr2names[NUMPLAYERSPRITES][5] =
 	"LIFE",
 
 	"XTRA",
-	"NTAG",
 };
 playersprite_t free_spr2 = SPR2_FIRSTFREESLOT;
 
diff --git a/src/info.h b/src/info.h
index 46d57042f..38e6276ab 100644
--- a/src/info.h
+++ b/src/info.h
@@ -865,7 +865,6 @@ typedef enum playersprite
 	SPR2_LIFE, // life monitor icon
 
 	SPR2_XTRA, // stuff that isn't in-map - "would this ever need an md2 or variable length animation?"
-	SPR2_NTAG, // Character name tag
 
 	SPR2_FIRSTFREESLOT,
 	SPR2_LASTFREESLOT = 0x7f,
@@ -877,7 +876,6 @@ typedef enum playersprite
 #define XTRA_CHARSEL    1                 // Character select picture
 #define XTRA_CONTINUE   2                 // Continue icon
 #define XTRA_ENDING     3                 // Ending finale patches
-#define XTRA_NAMETAG    6                 // Character select nametag
 
 typedef enum state
 {
diff --git a/src/m_menu.c b/src/m_menu.c
index 613f1b65c..bd9aaa092 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -7903,7 +7903,6 @@ static void M_SetupChoosePlayer(INT32 choice)
 	{
 		if (description[i].used) // If the character's disabled through SOC, there's nothing we can do for it.
 		{
-			char *botskin = strchr(description[i].skinname, '&');
 			name = strtok(Z_StrDup(description[i].skinname), "&");
 			skinnum = R_SkinAvailable(name);
 			if ((skinnum != -1) && (R_SkinUsable(-1, skinnum)))
@@ -7935,18 +7934,7 @@ static void M_SetupChoosePlayer(INT32 choice)
 				else
 					description[i].charpic = W_CachePatchName(description[i].picname, PU_CACHE);
 
-				if (!(description[i].nametag[0]) && (!botskin))
-				{
-					if (skins[skinnum].sprites[SPR2_NTAG].numframes >= 1)
-					{
-						spritedef_t *sprdef = &skins[skinnum].sprites[SPR2_NTAG];
-						spriteframe_t *sprframe = &sprdef->spriteframes[0];
-						description[i].namepic = W_CachePatchNum(sprframe->lumppat[0], PU_CACHE);
-					}
-					else
-						description[i].namepic = NULL;
-				}
-				else if (description[i].nametag[0])
+				if (description[i].nametag[0])
 				{
 					const char *nametag = description[i].nametag;
 					description[i].namepic = NULL;