Cvar each ring's action, and showing the ring for that purpose.

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index 86b5c597cc1740e03f8788086bfc76305811302c..cd056d83dd7a8eaf083bb03e9ce86e7ab729bba8 100644 (file)
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -1163,10 +1163,13 @@ seta sbar_ring1 1 "enables the first HUD ring"
 seta sbar_ring1_scale 80 "scale of the first HUD ring"\r
 seta sbar_ring1_text_scale 12 "scale of the text on the first HUD ring"\r
 seta sbar_ring1_alpha 0.75 "alpha of the first HUD ring"\r
 seta sbar_ring1_scale 80 "scale of the first HUD ring"\r
 seta sbar_ring1_text_scale 12 "scale of the text on the first HUD ring"\r
 seta sbar_ring1_alpha 0.75 "alpha of the first HUD ring"\r

+seta sbar_ring1_info_voredelay 1 "show the first HUD ring for indicating vore delay"\r
+seta sbar_ring1_info_kickdelay 1 "show the first HUD ring for indicating kick delay"\r

 seta sbar_ring2 1 "enables the second HUD ring"\r
 seta sbar_ring2_scale 40 "scale of the second HUD ring"\r
 seta sbar_ring2_text_scale 10 "scale of the text on the second HUD ring"\r
 seta sbar_ring2_alpha 0.75 "alpha of the second HUD ring"\r
 seta sbar_ring2 1 "enables the second HUD ring"\r
 seta sbar_ring2_scale 40 "scale of the second HUD ring"\r
 seta sbar_ring2_text_scale 10 "scale of the text on the second HUD ring"\r
 seta sbar_ring2_alpha 0.75 "alpha of the second HUD ring"\r

+seta sbar_ring2_info_regurgitateprepare 1 "show the second HUD ring for indicating regurgitation preparing"\r

 seta sbar_vote_alreadyvoted_alpha 0.75 "alpha of the vote dialog after you have voted"\r
 \r
 // for menu server list (eventually make them have engine support?)\r
 seta sbar_vote_alreadyvoted_alpha 0.75 "alpha of the vote dialog after you have voted"\r
 \r
 // for menu server list (eventually make them have engine support?)\r

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index d004509863b7a3fb608613661f922ed791bcc9c1..d9f805cf5225876f36e2e5cc151d42ceb610f375 100644 (file)
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -2001,11 +2001,15 @@ void Sbar_Ring()
                        break;\r
                case 1:\r
                        // ring shows vore system delay, empties with progress\r
                        break;\r
                case 1:\r
                        // ring shows vore system delay, empties with progress\r

+                       if not(cvar("sbar_ring1_info_voredelay"))\r
+                               break;\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 = '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

+                       if not(cvar("sbar_ring1_info_kickdelay"))\r
+                               break;\r

                        ring1_color = '1 1 0.5';\r
                        text1_msg = "Kick delay";\r
                        break;\r
                        ring1_color = '1 1 0.5';\r
                        text1_msg = "Kick delay";\r
                        break;\r


@@ -2020,6 +2024,8 @@ void Sbar_Ring()
                        break;\r
                case 1:\r
                        // ring shows regurgitation preparing, fills with progress\r
                        break;\r
                case 1:\r
                        // ring shows regurgitation preparing, fills with progress\r

+                       if not(cvar("sbar_ring2_info_regurgitateprepare"))\r
+                               break;\r

                        ring2_color = '1 0.5 1';\r
                        text2_msg = "Regurgitating...";\r
                        break;\r
                        ring2_color = '1 0.5 1';\r
                        text2_msg = "Regurgitating...";\r
                        break;\r