Better artwork cvar names

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

diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc
index 28539b031d52826b607f895907de7c6fd1684f9e..b497665a19f964f8faf6cbb2240667e16e7825af 100644 (file)
--- a/data/qcsrc/client/View.qc
+++ b/data/qcsrc/client/View.qc
@@ -492,20 +492,19 @@ void CSQC_UpdateView(float w, float h)
 \r
        // Draw Artwork\r
        if(intermission && !isdemo()) // the match has ended\r
+       if(!spectatee_status)\r
        {\r
                if(artwork_image == "")\r
                {\r
                        if(getstati(STAT_WINNING)) // we are the winner\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
+                               if(cvar("cl_artwork_win"))\r
+                                       artwork_image = strcat("gfx/artwork_won_", ftos(floor(1 + (random() * cvar("cl_artwork_win")))));\r
                        }\r
                        else // we have lost\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
+                               if(cvar("cl_artwork_lose"))\r
+                                       artwork_image = strcat("gfx/artwork_lost_", ftos(floor(1 + (random() * cvar("cl_artwork_lose")))));\r
                        }\r
                        artwork_image = strzone(artwork_image);\r
                }\r
@@ -525,12 +524,13 @@ void CSQC_UpdateView(float w, float h)
                        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
+               if(artwork_fade < cvar("cl_artwork_alpha") && cvar("cl_artwork_fade"))\r
+                       artwork_fade += frametime * cvar("cl_artwork_fade");\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
+               if(artwork_image != "")\r
+                       drawpic(artwork_pos, artwork_image, artwork_size, '1 1 1', artwork_fade, DRAWFLAG_NORMAL);\r
        }\r
        else\r
        {\r