Lephenixnoir
/
CGDoom
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix skull keys not showing up as intended

This commit is contained in:
Lephenixnoir 2021-08-25 15:18:12 +02:00
parent cc2fed1be4
commit fb06f2258a
Signed by: Lephenixnoir
GPG Key ID: 1BBA026E13FC0495
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cgdoom/st_stuff.c
View File

@ -322,7 +322,7 @@ static const patch_t* tallpercent;
static const patch_t* shortnum[10];
// 3 key-cards, 3 skulls
static const patch_t* keys[3];
static const patch_t* keys[6];
// face status patches
static const patch_t* faces[ST_NUMFACES];
@ -760,11 +760,11 @@ void ST_updateWidgets(void)
// update keycard multiple widgets
keyboxes_0 = plyr->cards[0] ? 0 : -1;
//if (plyr->cards[3]) keyboxes_0 = 3; //would crash
if (plyr->cards[3]) keyboxes_0 = 3;
keyboxes_1 = plyr->cards[1] ? 1 : -1;
//if (plyr->cards[4]) keyboxes_1 = 4; //would crash
if (plyr->cards[4]) keyboxes_1 = 4;
keyboxes_2 = plyr->cards[2] ? 2 : -1;
//if (plyr->cards[5]) keyboxes_2 = 5; //would crash
if (plyr->cards[5]) keyboxes_2 = 5;
// refresh everything if this is him coming back to life
ST_updateFaceWidget();
@ -913,6 +913,13 @@ void ST_loadGraphics(void)
keys[1] = W_CacheLumpNamePatch("STKEYS1", PU_STATIC);
keys[2] = W_CacheLumpNamePatch("STKEYS2", PU_STATIC);
if(W_CheckNumForName("STKEYS3") >= 0)
keys[3] = W_CacheLumpNamePatch("STKEYS3", PU_STATIC);
if(W_CheckNumForName("STKEYS4") >= 0)
keys[4] = W_CacheLumpNamePatch("STKEYS4", PU_STATIC);
if(W_CheckNumForName("STKEYS5") >= 0)
keys[5] = W_CacheLumpNamePatch("STKEYS5", PU_STATIC);
// arms background
armsbg = W_CacheLumpNamePatch("STARMS", PU_STATIC);