]> de.git.xonotic.org Git - voretournament/voretournament.git/commitdiff
Draw artwork behind the scoreboard
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 26 Sep 2010 13:49:24 +0000 (16:49 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 26 Sep 2010 13:49:24 +0000 (16:49 +0300)
data/qcsrc/client/View.qc

index 45e39d8190b49b37be0911069b8d728c6578efb1..b73e51f0554bd82018ec16242f6d3306db5d3e47 100644 (file)
@@ -489,6 +489,44 @@ void CSQC_UpdateView(float w, float h)
          )\r
                teamradar_view();\r
 \r
          )\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
+                               artwork_image = strcat("gfx/artwork_won_", ftos(floor(1 + (random() * 2)))); // CCCCVVVVVAAAAAAAAARRRRRRRRRRRRRRR!!!!!!\r
+                       else\r
+                               artwork_image = strcat("gfx/artwork_lost_", ftos(floor(1 + (random() * 2)))); // CCCCVVVVVAAAAAAAAARRRRRRRRRRRRRRR!!!!!!\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
+               drawpic(artwork_pos, artwork_image, artwork_size, '1 1 1', 1, DRAWFLAG_NORMAL);\r
+       }\r
+       else\r
+       {\r
+               if(artwork_image != "")\r
+               {\r
+                       strunzone(artwork_image);\r
+                       artwork_image = "";\r
+               }\r
+       }\r
+\r
        // draw sbar\r
        if(cvar("r_letterbox") == 0) {\r
                if (cvar("cl_showpressedkeys")) { // draw pressed keys when spectating and playing\r
        // draw sbar\r
        if(cvar("r_letterbox") == 0) {\r
                if (cvar("cl_showpressedkeys")) { // draw pressed keys when spectating and playing\r
@@ -678,44 +716,6 @@ void CSQC_UpdateView(float w, float h)
                }\r
        }\r
 \r
                }\r
        }\r
 \r
-       // Draw Artwork\r
-       if(intermission && !isdemo()) // match has ended\r
-       {\r
-               if(artwork_image == "")\r
-               {\r
-                       if(getstati(STAT_WINNING))\r
-                               artwork_image = strcat("gfx/artwork_won_", ftos(floor(1 + (random() * 2)))); // CCCCVVVVVAAAAAAAAARRRRRRRRRRRRRRR!!!!!!\r
-                       else\r
-                               artwork_image = strcat("gfx/artwork_lost_", ftos(floor(1 + (random() * 2)))); // CCCCVVVVVAAAAAAAAARRRRRRRRRRRRRRR!!!!!!\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
-               drawpic(artwork_pos, artwork_image, artwork_size, '1 1 1', 1, DRAWFLAG_NORMAL);\r
-       }\r
-       else\r
-       {\r
-               if(artwork_image != "")\r
-               {\r
-                       strunzone(artwork_image);\r
-                       artwork_image = "";\r
-               }\r
-       }\r
-\r
        if(NextFrameCommand)\r
        {\r
                localcmd("\n", NextFrameCommand, "\n");\r
        if(NextFrameCommand)\r
        {\r
                localcmd("\n", NextFrameCommand, "\n");\r