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

Merge branch 'uncap-palettes' into 'next' 

Uncap palette lump palettes & allow flashpal palettes to display during pause

See merge request STJr/SRB2!1255
This commit is contained in:
James R 2020-11-22 17:16:21 -05:00
parent e95a05880f 5454068843
commit 6d6eb79226
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/st_stuff.c
View File

@ -203,9 +203,7 @@ void ST_doPaletteStuff(void)
{ {
INT32 palette; INT32 palette;
if (paused || P_AutoPause()) if (stplyr && stplyr->flashcount)
palette = 0;
else if (stplyr && stplyr->flashcount)
palette = stplyr->flashpal; palette = stplyr->flashpal;
else else
palette = 0; palette = 0;
@ -215,8 +213,6 @@ void ST_doPaletteStuff(void)
palette = 0; // No flashpals here in OpenGL palette = 0; // No flashpals here in OpenGL
#endif #endif
palette = min(max(palette, 0), 13);
if (palette != st_palette) if (palette != st_palette)
{ {
st_palette = palette; st_palette = palette;