From 38d044e47584fbcc98d98aec0da4f63dfc6ddd35 Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Wed, 16 Oct 2019 00:22:05 -0400
Subject: [PATCH] Seperate name tag sprite into SPR2_NTAG
---
src/info.c | 2 ++
src/info.h | 1 +
src/m_menu.c | 6 +++---
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/info.c b/src/info.c
index dd5338ef0f..28cdb6cf29 100644
--- a/src/info.c
+++ b/src/info.c
@@ -599,6 +599,7 @@ char spr2names[NUMPLAYERSPRITES][5] =
"LIFE",
"XTRA",
+ "NTAG",
};
playersprite_t free_spr2 = SPR2_FIRSTFREESLOT;
@@ -702,6 +703,7 @@ playersprite_t spr2defaults[NUMPLAYERSPRITES] = {
0, // SPR2_LIFE,
0, // SPR2_XTRA (should never be referenced)
+ 0, // SPR2_NTAG
};
// Doesn't work with g++, needs actionf_p1 (don't modify this comment)
diff --git a/src/info.h b/src/info.h
index dd94677a7c..46d57042f4 100644
--- a/src/info.h
+++ b/src/info.h
@@ -865,6 +865,7 @@ 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,
diff --git a/src/m_menu.c b/src/m_menu.c
index 2a028834de..f39b0f4495 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -7938,10 +7938,10 @@ static void M_SetupChoosePlayer(INT32 choice)
if (!(description[i].nametag[0]) && (!botskin))
{
- if (skins[skinnum].sprites[SPR2_XTRA].numframes >= XTRA_NAMETAG+1)
+ if (skins[skinnum].sprites[SPR2_NTAG].numframes >= 1)
{
- spritedef_t *sprdef = &skins[skinnum].sprites[SPR2_XTRA];
- spriteframe_t *sprframe = &sprdef->spriteframes[XTRA_NAMETAG];
+ 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
--
GitLab