zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-06-02 10:11:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

- merged in the changes RedNukem made to the Build code.

Browse source
This commit is contained in:
Christoph Oelckers 2019-09-19 00:19:02 +02:00
parent 3a90d21661
commit 51dc82b6a6
7 changed files with 77 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

9
source/build/src/palette.cpp
View file

@ -719,7 +719,7 @@ void videoSetPalette(char dabrightness, uint8_t dapalid, uint8_t flags)
}
videoSetGamma();
j = !gammabrightness ? curbrightness : 0;
j = (!gammabrightness || (flags&32) != 0) ? curbrightness : 0;
for (i=0; i<256; i++)
{
@ -736,6 +736,13 @@ void videoSetPalette(char dabrightness, uint8_t dapalid, uint8_t flags)
curpalettefaded[i].f = 0;
}
#ifdef USE_OPENGL
if ((flags&32) != 0 && videoGetRenderMode() == REND_POLYMOST)
r_brightnesshack = j;
else
r_brightnesshack = 0;
#endif
if ((flags&16) && palfadedelta) // keep the fade
paletteSetFade(palfadedelta>>2);