From: MirceaKitsune Date: Sun, 26 Sep 2010 17:26:29 +0000 (+0300) Subject: Fade cvar adjustments X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9d079b2cc65ec91124cdd245c2f2775a24847382;p=voretournament%2Fvoretournament.git Fade cvar adjustments --- diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg index 18c7c06e..801420d2 100644 --- a/data/defaultVoretournament.cfg +++ b/data/defaultVoretournament.cfg @@ -117,7 +117,7 @@ seta cl_artwork_won 2 "number of artwork_won_ images available in the gfx folder 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" +seta cl_artwork_fade 0.65 "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 e4dd37f5..1eda42f0 100644 --- a/data/qcsrc/client/View.qc +++ b/data/qcsrc/client/View.qc @@ -524,8 +524,8 @@ void CSQC_UpdateView(float w, float h) artwork_pos_y = (vid_conheight - artwork_size_y) / 2; } - if(artwork_fade < cvar("cl_artwork_alpha") && cvar("cl_artwork_fadespeed")) - artwork_fade += frametime * cvar("cl_artwork_fadespeed"); + if(artwork_fade < cvar("cl_artwork_alpha") && cvar("cl_artwork_fade")) + artwork_fade += frametime * cvar("cl_artwork_fade"); else artwork_fade = cvar("cl_artwork_alpha");