Make nametags compatible with current player.dta

(again)
This commit is contained in:
Jaime Passos 2019-09-11 22:18:03 -03:00
parent f2915817a7
commit 9b0e2b8991
2 changed files with 5 additions and 4 deletions

View File

@ -844,8 +844,9 @@ typedef enum playersprite
// SPR2_XTRA
#define XTRA_LIFEPIC 0 // Life icon patch
#define XTRA_CHARSEL 1 // Character select picture
#define XTRA_ENDING 2 // Ending finale patches
#define XTRA_NAMETAG (XTRA_ENDING+3) // Character select nametag
#define XTRA_NAMETAG 2 // Character select nametag
#define XTRA_CONTINUE 3 // Continue icon
#define XTRA_ENDING 4 // Ending finale patches
typedef enum state
{

View File

@ -8574,10 +8574,10 @@ void M_DrawTimeAttackMenu(void)
// Character face!
{
if (skins[cv_chooseskin.value-1].sprites[SPR2_XTRA].numframes >= 2)
if (skins[cv_chooseskin.value-1].sprites[SPR2_XTRA].numframes >= XTRA_CHARSEL+1)
{
spritedef_t *sprdef = &skins[cv_chooseskin.value-1].sprites[SPR2_XTRA];
spriteframe_t *sprframe = &sprdef->spriteframes[1];
spriteframe_t *sprframe = &sprdef->spriteframes[XTRA_CHARSEL];
PictureOfUrFace = W_CachePatchNum(sprframe->lumppat[0], PU_CACHE);
}
else