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:
commit
6d6eb79226
|
@ -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;
|
||||||
|
|
Loading…
Reference in New Issue