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 7d803a60737cc8f4030221bbd7a0acf4d542fc4e..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
@@ -489,6 +490,58 @@ void CSQC_UpdateView(float w, float h)
          )\r
                teamradar_view();\r
 \r
+       // Draw Artwork\r
+       if(intermission && !isdemo()) // match has ended\r
+       {\r
+               if(artwork_image == "")\r
+               {\r
+                       if(getstati(STAT_WINNING))\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
+                       {\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
+               if(cvar("cl_artwork_stretch"))\r
+               {\r
+                       artwork_size_x = vid_conwidth;\r
+                       artwork_size_y = vid_conheight;\r
+                       artwork_pos_x = 0;\r
+                       artwork_pos_y = 0;\r
+               }\r
+               else\r
+               {\r
+                       artwork_size_x = max(vid_conwidth, vid_conheight);\r
+                       artwork_size_y = max(vid_conwidth, vid_conheight);\r
+                       artwork_pos_x = (vid_conwidth - artwork_size_x) / 2;\r
+                       artwork_pos_y = (vid_conheight - artwork_size_y) / 2;\r
+               }\r
+\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
+               if(artwork_image != "")\r
+               {\r
+                       strunzone(artwork_image);\r
+                       artwork_image = "";\r
+               }\r
+               artwork_fade = 0;\r
+       }\r
+\r
        // draw sbar\r
        if(cvar("r_letterbox") == 0) {\r
                if (cvar("cl_showpressedkeys")) { // draw pressed keys when spectating and playing\r
@@ -678,30 +731,6 @@ void CSQC_UpdateView(float w, float h)
                }\r
        }\r
 \r
-       // Draw Artwork\r
-       if(intermission && !isdemo()) // match has ended\r
-       {\r
-               //if(getstati(STAT_WINNING))\r
-                       //localcmd("disconnect\n");\r
-\r
-               if(cvar("cl_artwork_stretch"))\r
-               {\r
-                       artwork_size_x = vid_conwidth;\r
-                       artwork_size_y = vid_conheight;\r
-                       artwork_pos_x = 0;\r
-                       artwork_pos_y = 0;\r
-               }\r
-               else\r
-               {\r
-                       artwork_size_x = max(vid_conwidth, vid_conheight);\r
-                       artwork_size_y = max(vid_conwidth, vid_conheight);\r
-                       artwork_pos_x = (vid_conwidth - artwork_size_x) / 2;\r
-                       artwork_pos_y = (vid_conheight - artwork_size_y) / 2;\r
-               }\r
-\r
-               drawpic(artwork_pos, "gfx/hslimage", artwork_size, '1 1 1', 1, DRAWFLAG_NORMAL);\r
-       }\r
-\r
        if(NextFrameCommand)\r
        {\r
                localcmd("\n", NextFrameCommand, "\n");\r