Larger fonts for the larger ring

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

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index ade2c076c515dc28cf85237242f1d9df8927eac4..f0586cdacd7f5c653030cb81968818de8a93cbe6 100644 (file)
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -1981,7 +1981,7 @@ void Sbar_Timer()
 void Sbar_Ring()\r
 {\r
        vector ring_pos, ring1_color, ring2_color;\r
-       vector text_pos, text_size;\r
+       vector text_pos, text1_size, text2_size;\r
        float ring_alpha, ring1_size, ring1_clip, ring2_size, ring2_clip;\r
        string text1_msg, text2_msg;\r
 \r
@@ -1990,24 +1990,59 @@ void Sbar_Ring()
        ring1_size = 100;\r
        ring2_size = 60;\r
        ring_alpha = sbar_alpha_fg * 1;\r
-       text_size = '10 10 0';\r
-\r
-       ring1_clip = 0.85;\r
-       ring2_clip = 0.95;\r
-       ring1_color = '1 0.25 0.25';\r
-       ring2_color = '0.25 1 0.25';\r
-       text1_msg = "Text 1 ssdfsdfdsfsdf";\r
-       text2_msg = "Text 2 3453rf234f";\r
-\r
-       DrawCircleClippedPic(ring_pos, ring1_size, "gfx/hud/sb_ring.tga", ring1_clip, ring1_color, ring_alpha, DRAWFLAG_ADDITIVE);\r
-       text_pos_x = ring_pos_x - stringwidth(text1_msg, FALSE, text_size) / 2;\r
-       text_pos_y = ring_pos_y - ring1_size / 2;\r
-       drawstring(text_pos, text1_msg, text_size, ring1_color, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
-\r
-       DrawCircleClippedPic(ring_pos, ring2_size, "gfx/hud/sb_ring.tga", ring2_clip, ring2_color, ring_alpha, DRAWFLAG_ADDITIVE);\r
-       text_pos_x = ring_pos_x - stringwidth(text2_msg, FALSE, text_size) / 2;\r
-       text_pos_y = ring_pos_y + ring1_size / 2;\r
-       drawstring(text_pos, text2_msg, text_size, ring2_color, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+       text1_size = '12 12 0';\r
+       text2_size = '10 10 0';\r
+\r
+       switch(getstati(STAT_SBRING1_TYPE))\r
+       {\r
+               case 0:\r
+                       // ring disabled\r
+                       break;\r
+               case 1:\r
+                       // ring shows vore system delay, empties with progress\r
+                       ring1_color = '0.5 0.5 1';\r
+                       text1_msg = "Vore delay";\r
+                       break;\r
+               case 2:\r
+                       // ring shows stomach kick delay, empties with progress\r
+                       ring1_color = '1 1 0.5';\r
+                       text1_msg = "Kick delay";\r
+                       break;\r
+               default:\r
+                       print(strcat("^1Error:^7 Unknown ring type: ", ftos(getstati(STAT_SBRING1_TYPE)), "\n"));\r
+                       break;\r
+       }\r
+       switch(getstati(STAT_SBRING2_TYPE))\r
+       {\r
+               case 0:\r
+                       // ring disabled\r
+                       break;\r
+               case 1:\r
+                       // ring shows regurgitation preparing, fills with progress\r
+                       ring2_color = '1 0.5 1';\r
+                       text2_msg = "Regurgitating...";\r
+                       break;\r
+               default:\r
+                       print(strcat("^1Error:^7 Unknown ring type: ", ftos(getstati(STAT_SBRING1_TYPE)), "\n"));\r
+                       break;\r
+       }\r
+       ring1_clip = getstatf(STAT_SBRING1_CLIP);\r
+       ring2_clip = getstatf(STAT_SBRING2_CLIP);\r
+\r
+       if(text1_msg != "")\r
+       {\r
+               DrawCircleClippedPic(ring_pos, ring1_size, "gfx/hud/sb_ring.tga", ring1_clip, ring1_color, ring_alpha, DRAWFLAG_ADDITIVE);\r
+               text_pos_x = ring_pos_x - stringwidth(text1_msg, FALSE, text1_size) / 2;\r
+               text_pos_y = ring_pos_y - ring1_size / 2;\r
+               drawstring(text_pos, text1_msg, text1_size, ring1_color, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+       }\r
+       if(text2_msg != "")\r
+       {\r
+               DrawCircleClippedPic(ring_pos, ring2_size, "gfx/hud/sb_ring.tga", ring2_clip, ring2_color, ring_alpha, DRAWFLAG_ADDITIVE);\r
+               text_pos_x = ring_pos_x - stringwidth(text2_msg, FALSE, text2_size) / 2;\r
+               text_pos_y = ring_pos_y + ring1_size / 2;\r
+               drawstring(text_pos, text2_msg, text2_size, ring2_color, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+       }\r
 }\r
 \r
 void CSQC_Strength_Timer() {\r