Finish my last commit

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

diff --git a/data/qcsrc/client/hud.qc b/data/qcsrc/client/hud.qc
index 0ccabe927b4c53faf0185f2fcb3bf8c50010539a..0852aa6fbad3ae119369ad706ea1c507757bf67a 100644 (file)
--- a/data/qcsrc/client/hud.qc
+++ b/data/qcsrc/client/hud.qc
@@ -1682,6 +1682,9 @@ void Sbar_DrawRaceStatus(vector pos)
 \r
 void Sbar_Portrait()\r
 {\r
+       // draws the portrait, using the values set in Ent_ReadPortrait\r
+\r
+       // make the portrait slide in and out of the left edge\r
        float fade_time;\r
        float fade1_start, fade1_end, fade2_start, fade2_end;\r
        float fade_in, fade_out;\r
@@ -1696,23 +1699,35 @@ void Sbar_Portrait()
        fade_in = bound(0, (time / fade1_end - 1) / (fade1_start / fade1_end - 1), 1);\r
        fade_out = 1 - bound(0, (time / fade2_end - 1) / (fade2_start / fade2_end - 1), 1);\r
 \r
-       dprint(strcat(ftos(fade_in), " IN --------\n"));\r
-       dprint(strcat(ftos(fade_out), " OUT --------\n"));\r
-       dprint("________________\n");\r
-\r
-       // draws the portrait, using the values set in Ent_ReadPortrait\r
-\r
-       vector left;\r
+       vector left, fade_pos;\r
        left_x = 0;\r
        left_y = vid_conheight / 2;\r
+       fade_pos_x = -130 * fade_in * fade_out;\r
 \r
        if(!cvar("sbar_portrait"))\r
                return;\r
 \r
        if(portrait_time + cvar("sbar_portrait_time") >= time)\r
        {\r
-               drawpic(left + '10 -80 0', portrait_image, '120 160 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
-               drawcolorcodedstring(left + '10 80 0', portrait_name, '12 12 0', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+               if(portrait_image && portrait_name) // prevent using bad strings\r
+               {\r
+                       drawpic(left - '120 80 0' - fade_pos, portrait_image, '120 160 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+                       drawcolorcodedstring(left - '120 -80 0' - fade_pos, textShortenToWidth(portrait_name, 120, '12 12 0', stringwidth_colors), '12 12 0', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+               }\r
+       }\r
+       else\r
+       {\r
+               // free unused strings from memory\r
+               if(portrait_image)\r
+               {\r
+                       strunzone(portrait_image);\r
+                       portrait_image = string_null;\r
+               }\r
+               if(portrait_name)\r
+               {\r
+                       strunzone(portrait_name);\r
+                       portrait_name = string_null;\r
+               }\r
        }\r
 }\r
 \r
@@ -2000,6 +2015,10 @@ void Sbar_Status()
        health_pos -= '1 0 0' * stringwidth(ftos(x), FALSE, '22 22 0') * 0.5;\r
        Sbar_DrawXNum(health_pos, x, 3, 0, 22, Sbar_NumColor(x), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 \r
+       // if we are dead, we can skip the HUD from here\r
+       if(health <= 0)\r
+               return;\r
+\r
        // ammo\r
        pos_x = bottom_x + 140;\r
        pos_y = bottom_y - 20;\r
@@ -3103,6 +3122,7 @@ void Sbar_Draw (void)
                Sbar_DrawScoreboard();\r
                Sbar_Score();\r
                Sbar_Timer();\r
+               Sbar_Portrait();\r
                if(getstati(STAT_VORE_EATEN))\r
                        Sbar_Status();\r
 \r
@@ -3132,6 +3152,7 @@ void Sbar_Draw (void)
                                drawpic(warn_pos - '128 0 0', "gfx/hud/sb_power_fail", '256 256 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                                drawpic(warn_pos - '16 0 0' + '0 150 0', "gfx/hud/sb_power_fail_icon", '32 32 0', '1 1 1', sbar_alpha_fg * (0.5 + sin(time * 5) / 2), DRAWFLAG_NORMAL);\r
                                power_boot = time + g_power_reboot;\r
+                               Sbar_Portrait(); // draw the portrait still\r
                                return; // skip drawing the HUD\r
                        }\r
                        else if(time <= power_boot)\r
@@ -3139,6 +3160,7 @@ void Sbar_Draw (void)
                                // subsystems are rebooting\r
                                drawpic(warn_pos - '128 0 0', "gfx/hud/sb_power_reboot", '256 256 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                                drawpic(warn_pos - '16 0 0' + '0 150 0', "gfx/hud/sb_power_reboot_icon", '32 32 0', '1 1 1', sbar_alpha_fg * (0.5 + sin(time * 5) / 2), DRAWFLAG_NORMAL);\r
+                               Sbar_Portrait(); // draw the portrait still\r
                                return; // skip drawing the HUD\r
                        }\r
                }\r
@@ -3189,7 +3211,7 @@ void Sbar_Draw (void)
                                status_pos = bottomleft - '-43 168 0';\r
                                status_size = 16;\r
                        }\r
-                       else if(g_healthsize_center >= 0) // no point in showing it otherwise\r
+                       else\r
                        {\r
                                status_text = strcat(status_color, ftos(stomach_maxload));\r
                                status_pos = bottomleft - '-43 170 0';\r