stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-06 16:31:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Seperate name tag sprite into SPR2_NTAG

Browse source
This commit is contained in:
Steel Titanium 2019-10-16 00:22:05 -04:00
parent 58ef85d591
commit 38d044e475
No known key found for this signature in database
GPG key ID: 924BA411F18DFDBE
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/info.c
View file

@ -599,6 +599,7 @@ char spr2names[NUMPLAYERSPRITES][5] =
"LIFE", "LIFE",
"XTRA", "XTRA",
"NTAG",
}; };
playersprite_t free_spr2 = SPR2_FIRSTFREESLOT; playersprite_t free_spr2 = SPR2_FIRSTFREESLOT;
@ -702,6 +703,7 @@ playersprite_t spr2defaults[NUMPLAYERSPRITES] = {
0, // SPR2_LIFE, 0, // SPR2_LIFE,
0, // SPR2_XTRA (should never be referenced) 0, // SPR2_XTRA (should never be referenced)
0, // SPR2_NTAG
}; };
// Doesn't work with g++, needs actionf_p1 (don't modify this comment) // Doesn't work with g++, needs actionf_p1 (don't modify this comment)

1
src/info.h
View file

@ -865,6 +865,7 @@ typedef enum playersprite
SPR2_LIFE, // life monitor icon SPR2_LIFE, // life monitor icon
SPR2_XTRA, // stuff that isn't in-map - "would this ever need an md2 or variable length animation?" 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_FIRSTFREESLOT,
SPR2_LASTFREESLOT = 0x7f, SPR2_LASTFREESLOT = 0x7f,

6
src/m_menu.c
View file

@ -7938,10 +7938,10 @@ static void M_SetupChoosePlayer(INT32 choice)
if (!(description[i].nametag[0]) && (!botskin)) 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]; spritedef_t *sprdef = &skins[skinnum].sprites[SPR2_NTAG];
spriteframe_t *sprframe = &sprdef->spriteframes[XTRA_NAMETAG]; spriteframe_t *sprframe = &sprdef->spriteframes[0];
description[i].namepic = W_CachePatchNum(sprframe->lumppat[0], PU_CACHE); description[i].namepic = W_CachePatchNum(sprframe->lumppat[0], PU_CACHE);
} }
else else