From e0417a1715dd61d1a6cc05a200a57d90f4e36822 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Sun, 26 Sep 2010 17:24:33 +0300 Subject: [PATCH 1/1] Cvar the alpha too --- data/defaultVoretournament.cfg | 3 +-- data/qcsrc/client/View.qc | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg index aed8ddca..18c7c06e 100644 --- a/data/defaultVoretournament.cfg +++ b/data/defaultVoretournament.cfg @@ -116,9 +116,8 @@ seta crosshair_hittest_showimpact 0 "move the crosshair to the actual impact loc seta cl_artwork_won 2 "number of artwork_won_ images available in the gfx folder, 0 disables winning artwork" seta cl_artwork_lost 2 "number of artwork_lost_ images available in the gfx folder, 0 disables loosing artwork" seta cl_artwork_stretch 0 "stretch artwork to fit the screen, even if it brakes image proportions" +seta cl_artwork_alpha 1 "artwork alpha" seta cl_artwork_fadespeed 0.5 "artwork fade-in speed" - - fov 90 seta cl_velocityzoom 0 "velocity based zooming of fov, negative values zoom out" seta cl_velocityzoomtime 0.3 "time value for averaging speed values" diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc index 70b61f4d..1cdb755b 100644 --- a/data/qcsrc/client/View.qc +++ b/data/qcsrc/client/View.qc @@ -525,10 +525,10 @@ void CSQC_UpdateView(float w, float h) artwork_pos_y = (vid_conheight - artwork_size_y) / 2; } - if(artwork_fade < 1) + if(artwork_fade < cvar("cl_artwork_alpha") && cvar("cl_artwork_fadespeed")) artwork_fade += frametime * cvar("cl_artwork_fadespeed"); else - artwork_fade = 1; + artwork_fade = cvar("cl_artwork_alpha"); drawpic(artwork_pos, artwork_image, artwork_size, '1 1 1', artwork_fade, DRAWFLAG_NORMAL); } -- 2.39.2