Some small tweaks and fixes

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index f87754595e96fbe15e2283626b08a1bd43259b7b..ade2c076c515dc28cf85237242f1d9df8927eac4 100644 (file)
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -1987,27 +1987,26 @@ void Sbar_Ring()
 \r
        ring_pos_x = vid_conwidth / 2;\r
        ring_pos_y = vid_conheight / 1.375;\r
 \r
        ring_pos_x = vid_conwidth / 2;\r
        ring_pos_y = vid_conheight / 1.375;\r

-       ring_pos_z = 0;\r
-       ring1_size = 60;\r
-       ring2_size = 40;\r
+       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
        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 0';\r
-       ring2_color = '0 1 0';\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
        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 - vlen(text_size);\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
        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 + vlen(text_size);\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
 }\r
 \r
        drawstring(text_pos, text2_msg, text_size, ring2_color, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 }\r
 \r