lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Kill off SPR2_NTAG

This commit is contained in:
Steel Titanium 2019-10-16 18:25:20 -04:00
parent edea290b0f
commit 28607a81b5
No known key found for this signature in database
GPG Key ID: 924BA411F18DFDBE
3 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/info.c
View File

@ -599,7 +599,6 @@ char spr2names[NUMPLAYERSPRITES][5] =
"LIFE",
"XTRA",
"NTAG",
};
playersprite_t free_spr2 = SPR2_FIRSTFREESLOT;

2
src/info.h
View File

@ -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
{

14
src/m_menu.c
View File

@ -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;