Cvar the alpha too

diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg
index aed8ddca99abca5b548f5ea8e261ebdfa7745d93..18c7c06e02821ab2081289b24ef534a4066900ac 100644 (file)
--- 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"\r
 seta cl_artwork_lost 2 "number of artwork_lost_ images available in the gfx folder, 0 disables loosing artwork"\r
 seta cl_artwork_stretch 0 "stretch artwork to fit the screen, even if it brakes image proportions"\r
 seta cl_artwork_won 2 "number of artwork_won_ images available in the gfx folder, 0 disables winning artwork"\r
 seta cl_artwork_lost 2 "number of artwork_lost_ images available in the gfx folder, 0 disables loosing artwork"\r
 seta cl_artwork_stretch 0 "stretch artwork to fit the screen, even if it brakes image proportions"\r

+seta cl_artwork_alpha 1 "artwork alpha"\r

 seta cl_artwork_fadespeed 0.5 "artwork fade-in speed"\r
 seta cl_artwork_fadespeed 0.5 "artwork fade-in speed"\r

-\r
-\r

 fov 90\r
 seta cl_velocityzoom 0 "velocity based zooming of fov, negative values zoom out"\r
 seta cl_velocityzoomtime 0.3   "time value for averaging speed values"\r
 fov 90\r
 seta cl_velocityzoom 0 "velocity based zooming of fov, negative values zoom out"\r
 seta cl_velocityzoomtime 0.3   "time value for averaging speed values"\r

diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc
index 70b61f4daa05f1ac546029c7b9c63b24832fffd1..1cdb755b80be93b1ae358ea2492484ef84a12705 100644 (file)
--- 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;\r
                }\r
 \r
                        artwork_pos_y = (vid_conheight - artwork_size_y) / 2;\r
                }\r
 \r

-               if(artwork_fade < 1)\r
+               if(artwork_fade < cvar("cl_artwork_alpha") && cvar("cl_artwork_fadespeed"))\r

                        artwork_fade += frametime * cvar("cl_artwork_fadespeed");\r
                else\r
                        artwork_fade += frametime * cvar("cl_artwork_fadespeed");\r
                else\r

-                       artwork_fade = 1;\r
+                       artwork_fade = cvar("cl_artwork_alpha");\r

 \r
                drawpic(artwork_pos, artwork_image, artwork_size, '1 1 1', artwork_fade, DRAWFLAG_NORMAL);\r
        }\r
 \r
                drawpic(artwork_pos, artwork_image, artwork_size, '1 1 1', artwork_fade, DRAWFLAG_NORMAL);\r
        }\r