build fixes, miscalc on bar thing

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2249 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
TimeServ 2006-05-07 07:25:18 +00:00
parent f93e5f1657
commit 18de9855ae
3 changed files with 10 additions and 6 deletions

View file

@ -1368,27 +1368,27 @@ void SCR_DrawLoading (void)
x = (vid.width - pic->width)/2;
y = (vid.height - 48 - pic->height)/2;
Draw_Pic (x, y, pic);
x = (vid.width/2) - 80;
x = (vid.width/2) - 96;
y += pic->height + 8;
}
else
{
x = (vid.width/2) - 80;
x = (vid.width/2) - 96;
y = (vid.height/2) - 8;
}
if (loading_stage)
{
sizex = current_loading_size * 160 / total_loading_size;
sizex = current_loading_size * 192 / total_loading_size;
if (loading_stage == 1)
{
Draw_FillRGB(x, y, sizex, 16, 1.0, 0.0, 0.0);
Draw_FillRGB(x+sizex, y, 160-sizex, 16, 0.0, 0.0, 0.0);
Draw_FillRGB(x+sizex, y, 192-sizex, 16, 0.0, 0.0, 0.0);
}
else
{
Draw_FillRGB(x, y, sizex, 16, 1.0, 1.0, 0.0);
Draw_FillRGB(x+sizex, y, 160-sizex, 16, 1.0, 0.0, 0.0);
Draw_FillRGB(x+sizex, y, 192-sizex, 16, 1.0, 0.0, 0.0);
}
Draw_String(x+8, y+4, va("Loading %s... %i%%",

View file

@ -365,19 +365,23 @@ void BuildGammaTable (float g, float c)
V_CheckGamma
=================
*/
#ifdef SWQUAKE
void SWV_Gamma_Callback(struct cvar_s *var, char *oldvalue)
{
BuildGammaTable (v_gamma.value, v_contrast.value);
vid.recalc_refdef = 1; // force a surface cache flush
SWV_UpdatePalette (true);
}
#endif
#ifdef RGLQUAKE
void GLV_Gamma_Callback(struct cvar_s *var, char *oldvalue)
{
BuildGammaTable (v_gamma.value, v_contrast.value);
vid.recalc_refdef = 1; // force a surface cache flush
GLV_UpdatePalette (true);
}
#endif
qboolean V_CheckGamma (void)
{

View file

@ -654,7 +654,7 @@ if (!data)
*/
void GLR_TimeRefresh_f (void);
extern cvar_t gl_bump, v_contrast;
extern cvar_t gl_bump, v_contrast, r_drawflat;
extern cvar_t r_stains, r_stainfadetime, r_stainfadeammount;
// callback defines