Some tweaks to the sbar rings

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index d3ed8028a5d237d9fe648e1a05e669ee3e0fe856..445db813b2b92ebe84ad827e6f0bb5cf5eadf569 100644 (file)
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -1189,18 +1189,13 @@ seta sbar_stomachboard_highlight_alpha 0.25 "alpha of the stomach board highligh
 seta sbar_timer_increment 0 "1 = show elapsed time on the timer"\r
 seta sbar_timer_scale 1 "scale multiplier of the timer"\r
 seta sbar_ring1 1 "enables the first HUD ring"\r
-seta sbar_ring1_scale 80 "scale of the first HUD ring"\r
+seta sbar_ring1_scale 120 "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_ring1_info_swallowprogress_pred 1 "show the first HUD ring for indicating predator swallow progress"\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_scale 90 "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_ring2_info_swallowprogress_prey 1 "show the first HUD ring for indicating prey swallow progress"\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 f8d7eefc002920842e0e5a6e91d46bc9e10bc9e6..6cb3007d66cb9ac5a5809a4cfd3a406fa4905b7b 100644 (file)
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -2001,22 +2001,16 @@ void Sbar_Ring()
                        break;\r
                case 1:\r
                        // ring shows predator swallow progress, fills with progress\r
-                       if not(cvar("sbar_ring1_info_swallowprogress_pred"))\r
-                               break;\r
                        ring1_color = '0.5 1 0.5';\r
                        text1_msg = "Swallowing...";\r
                        break;\r
                case 2:\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 3:\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
@@ -2031,15 +2025,11 @@ void Sbar_Ring()
                        break;\r
                case 1:\r
                        // ring shows prey swallow progress, fills with progress\r
-                       if not(cvar("sbar_ring2_info_swallowprogress_prey"))\r
-                               break;\r
                        ring2_color = '1 0.5 0.5';\r
                        text2_msg = "Swallowed...";\r
                        break;\r
                case 2:\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