yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-10 07:12:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix background under cinematic and gamma values

Browse source
This commit is contained in:
Denis Pauk 2017-12-11 23:31:29 +02:00
parent 51200b3e6b
commit 4f9833153f
3 changed files with 35 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/client/cl_cin.c
View file

@ -505,6 +505,31 @@ SCR_RunCinematic(void)
}
}
static int
SCR_MinimalColor(void)
{
int i, min_color, min_index;
min_color = 255 * 3;
min_index = 0;
for(i=0; i<255; i++)
{
int current_color = (cl.cinematicpalette[i*3+0] +
cl.cinematicpalette[i*3+1] +
cl.cinematicpalette[i*3+2]);
if (min_color > current_color)
{
min_color = current_color;
min_index = i;
}
}
return min_index;
}
/*
* Returns true if a cinematic is active, meaning the
* view rendering should be skipped
@ -512,7 +537,7 @@ SCR_RunCinematic(void)
qboolean
SCR_DrawCinematic(void)
{
int x, y, w, h;
int x, y, w, h, color;
if (cl.cinematictime <= 0)
{
@ -557,21 +582,23 @@ SCR_DrawCinematic(void)
h = viddef.height;
}
color = SCR_MinimalColor();
if (x > 0)
{
Draw_Fill(0, 0, x, viddef.height, 0);
Draw_Fill(0, 0, x, viddef.height, color);
}
if (x + w < viddef.width)
{
Draw_Fill(x + w, 0, viddef.width - (x + w), viddef.height, 0);
Draw_Fill(x + w, 0, viddef.width - (x + w), viddef.height, color);
}
if (y > 0)
{
Draw_Fill(x, 0, w, y, 0);
Draw_Fill(x, 0, w, y, color);
}
if (y + h < viddef.height)
{
Draw_Fill(x, y + h, w, viddef.height - (y + h), 0);
Draw_Fill(x, y + h, w, viddef.height - (y + h), color);
}
Draw_StretchRaw(x, y, w, h, cin.width, cin.height, cin.pic);

1
src/client/menu/menu.c
View file

@ -1650,6 +1650,7 @@ static const char *idcredits[] = {
"Yamagi Burmeister",
"Daniel Gibson",
"Sander van Dijk",
"Denis Pauk",
"",
"Quake II(tm) (C)1997 Id Software, Inc.",
"All Rights Reserved. Distributed by",

3
src/client/refresh/soft/r_main.c
View file

@ -1205,7 +1205,8 @@ void Draw_BuildGammaTable (void)
if(overbright > 4.0)
overbright = 4.0;
g = vid_gamma->value;
g = (2.1 - vid_gamma->value);
if (g == 1.0)
{