Implement code to fade the portrait in and out, using a percentage of the total time

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

diff --git a/data/qcsrc/client/hud.qc b/data/qcsrc/client/hud.qc
index f2a7a57309b32b11053620a7f45392143dc9e8ba..0ccabe927b4c53faf0185f2fcb3bf8c50010539a 100644 (file)
--- a/data/qcsrc/client/hud.qc
+++ b/data/qcsrc/client/hud.qc
@@ -1682,6 +1682,24 @@ void Sbar_DrawRaceStatus(vector pos)
 \r
 void Sbar_Portrait()\r
 {\r
+       float fade_time;\r
+       float fade1_start, fade1_end, fade2_start, fade2_end;\r
+       float fade_in, fade_out;\r
+\r
+       fade_time = cvar("sbar_portrait_time") * bound(0, cvar("sbar_portrait_fade"), 0.5);\r
+\r
+       fade1_start = portrait_time + cvar("sbar_portrait_time") - fade_time;\r
+       fade1_end = portrait_time + cvar("sbar_portrait_time");\r
+       fade2_start = portrait_time;\r
+       fade2_end = portrait_time + fade_time;\r
+\r
+       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
@@ -1696,12 +1714,6 @@ void Sbar_Portrait()
                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
        }\r
-       else if(portrait_time)\r
-       {\r
-               strunzone(portrait_name);\r
-               strunzone(portrait_image);\r
-               portrait_time = 0;\r
-       }\r
 }\r
 \r
 void Sbar_Score()\r
@@ -3590,12 +3602,11 @@ void Ent_ReadPortrait()
        pl_skin = ReadByte();\r
        pl_name = ReadString();\r
 \r
-       // updating an existent portrait\r
-       if(portrait_time)\r
-       {\r
+       // update existing portraits\r
+       if(portrait_name)\r
                strunzone(portrait_name);\r
+       if(portrait_image)\r
                strunzone(portrait_image);\r
-       }\r
 \r
        portrait_time = time;\r
        portrait_name = strzone(pl_name);\r