stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 09:11:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'ending-star' into 'master'

Browse source 
Endings: Fireworks fallback graphics.

See merge request STJr/SRB2Internal!296
This commit is contained in:
toaster 2019-09-08 16:28:52 -04:00
commit e03d03110b
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/f_finale.c
View file

@ -1584,22 +1584,22 @@ void F_StartEnding(void)
UINT8 skinnum = players[consoleplayer].skin; UINT8 skinnum = players[consoleplayer].skin;
spritedef_t *sprdef; spritedef_t *sprdef;
spriteframe_t *sprframe; spriteframe_t *sprframe;
if (skins[skinnum].sprites[SPR2_XTRA].numframes >= 5) if (skins[skinnum].sprites[SPR2_XTRA].numframes >= 7)
{ {
sprdef = &skins[skinnum].sprites[SPR2_XTRA]; sprdef = &skins[skinnum].sprites[SPR2_XTRA];
// character head, skin specific // character head, skin specific
sprframe = &sprdef->spriteframes[2];
endfwrk[0] = W_CachePatchNum(sprframe->lumppat[0], PU_LEVEL);
sprframe = &sprdef->spriteframes[3];
endfwrk[1] = W_CachePatchNum(sprframe->lumppat[0], PU_LEVEL);
sprframe = &sprdef->spriteframes[4]; sprframe = &sprdef->spriteframes[4];
endfwrk[0] = W_CachePatchNum(sprframe->lumppat[0], PU_LEVEL);
sprframe = &sprdef->spriteframes[5];
endfwrk[1] = W_CachePatchNum(sprframe->lumppat[0], PU_LEVEL);
sprframe = &sprdef->spriteframes[6];
endfwrk[2] = W_CachePatchNum(sprframe->lumppat[0], PU_LEVEL); endfwrk[2] = W_CachePatchNum(sprframe->lumppat[0], PU_LEVEL);
} }
else // eh, yknow what? too lazy to put MISSINGs here. eggman wins if you don't give your character an ending firework display. else // Show a star if your character doesn't have an ending firework display. (Basically the MISSINGs for this)
{ {
endfwrk[0] = W_CachePatchName("ENDFWRK0", PU_LEVEL); endfwrk[0] = W_CachePatchName("ENDFWRK3", PU_LEVEL);
endfwrk[1] = W_CachePatchName("ENDFWRK1", PU_LEVEL); endfwrk[1] = W_CachePatchName("ENDFWRK4", PU_LEVEL);
endfwrk[2] = W_CachePatchName("ENDFWRK2", PU_LEVEL); endfwrk[2] = W_CachePatchName("ENDFWRK5", PU_LEVEL);
} }
endbrdr[0] = W_CachePatchName("ENDBRDR2", PU_LEVEL); endbrdr[0] = W_CachePatchName("ENDBRDR2", PU_LEVEL);