Cvar the alpha too

[voretournament/voretournament.git] / data / qcsrc / client / View.qc

diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc
index b73e51f0554bd82018ec16242f6d3306db5d3e47..1cdb755b80be93b1ae358ea2492484ef84a12705 100644 (file)
--- a/data/qcsrc/client/View.qc
+++ b/data/qcsrc/client/View.qc
@@ -251,6 +251,7 @@ float Sbar_WouldDrawScoreboard ();
 float view_set;\r
 float camera_mode;\r
 float chase_active_old;\r
+float artwork_fade;\r
 string artwork_image;\r
 string NextFrameCommand;\r
 void CSQC_UpdateView(float w, float h)\r
@@ -495,9 +496,17 @@ void CSQC_UpdateView(float w, float h)
                if(artwork_image == "")\r
                {\r
                        if(getstati(STAT_WINNING))\r
-                               artwork_image = strcat("gfx/artwork_won_", ftos(floor(1 + (random() * 2)))); // CCCCVVVVVAAAAAAAAARRRRRRRRRRRRRRR!!!!!!\r
+                       {\r
+                               if(!cvar("cl_artwork_won"))\r
+                                       return;\r
+                               artwork_image = strcat("gfx/artwork_won_", ftos(floor(1 + (random() * cvar("cl_artwork_won")))));\r
+                       }\r
                        else\r
-                               artwork_image = strcat("gfx/artwork_lost_", ftos(floor(1 + (random() * 2)))); // CCCCVVVVVAAAAAAAAARRRRRRRRRRRRRRR!!!!!!\r
+                       {\r
+                               if(!cvar("cl_artwork_lost"))\r
+                                       return;\r
+                               artwork_image = strcat("gfx/artwork_lost_", ftos(floor(1 + (random() * cvar("cl_artwork_lost")))));\r
+                       }\r
                        artwork_image = strzone(artwork_image);\r
                }\r
 \r
@@ -516,7 +525,12 @@ void CSQC_UpdateView(float w, float h)
                        artwork_pos_y = (vid_conheight - artwork_size_y) / 2;\r
                }\r
 \r
-               drawpic(artwork_pos, artwork_image, artwork_size, '1 1 1', 1, DRAWFLAG_NORMAL);\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 = cvar("cl_artwork_alpha");\r
+\r
+               drawpic(artwork_pos, artwork_image, artwork_size, '1 1 1', artwork_fade, DRAWFLAG_NORMAL);\r
        }\r
        else\r
        {\r
@@ -525,6 +539,7 @@ void CSQC_UpdateView(float w, float h)
                        strunzone(artwork_image);\r
                        artwork_image = "";\r
                }\r
+               artwork_fade = 0;\r
        }\r
 \r
        // draw sbar\r