From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 10 Jul 2011 22:27:09 +0000 (+0300)
Subject: Some tweaks to the sbar rings
X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=5a52586936a9bfdeeb5e2bf7e48ca78478f7284b

Some tweaks to the sbar rings
---

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index d3ed8028..445db813 100644
--- 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"
 seta sbar_timer_scale 1 "scale multiplier of the timer"
 seta sbar_ring1 1 "enables the first HUD ring"
-seta sbar_ring1_scale 80 "scale of the first HUD ring"
+seta sbar_ring1_scale 120 "scale of the first HUD ring"
 seta sbar_ring1_text_scale 12 "scale of the text on the first HUD ring"
 seta sbar_ring1_alpha 0.75 "alpha of the first HUD ring"
-seta sbar_ring1_info_voredelay 1 "show the first HUD ring for indicating vore delay"
-seta sbar_ring1_info_kickdelay 1 "show the first HUD ring for indicating kick delay"
-seta sbar_ring1_info_swallowprogress_pred 1 "show the first HUD ring for indicating predator swallow progress"
 seta sbar_ring2 1 "enables the second HUD ring"
-seta sbar_ring2_scale 40 "scale of the second HUD ring"
+seta sbar_ring2_scale 90 "scale of the second HUD ring"
 seta sbar_ring2_text_scale 10 "scale of the text on the second HUD ring"
 seta sbar_ring2_alpha 0.75 "alpha of the second HUD ring"
-seta sbar_ring2_info_regurgitateprepare 1 "show the second HUD ring for indicating regurgitation preparing"
-seta sbar_ring2_info_swallowprogress_prey 1 "show the first HUD ring for indicating prey swallow progress"
 seta sbar_vote_alreadyvoted_alpha 0.75 "alpha of the vote dialog after you have voted"
 
 // for menu server list (eventually make them have engine support?)
diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index f8d7eefc..6cb3007d 100644
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -2001,22 +2001,16 @@ void Sbar_Ring()
 			break;
 		case 1:
 			// ring shows predator swallow progress, fills with progress
-			if not(cvar("sbar_ring1_info_swallowprogress_pred"))
-				break;
 			ring1_color = '0.5 1 0.5';
 			text1_msg = "Swallowing...";
 			break;
 		case 2:
 			// ring shows vore system delay, empties with progress
-			if not(cvar("sbar_ring1_info_voredelay"))
-				break;
 			ring1_color = '0.5 0.5 1';
 			text1_msg = "Vore delay";
 			break;
 		case 3:
 			// ring shows stomach kick delay, empties with progress
-			if not(cvar("sbar_ring1_info_kickdelay"))
-				break;
 			ring1_color = '1 1 0.5';
 			text1_msg = "Kick delay";
 			break;
@@ -2031,15 +2025,11 @@ void Sbar_Ring()
 			break;
 		case 1:
 			// ring shows prey swallow progress, fills with progress
-			if not(cvar("sbar_ring2_info_swallowprogress_prey"))
-				break;
 			ring2_color = '1 0.5 0.5';
 			text2_msg = "Swallowed...";
 			break;
 		case 2:
 			// ring shows regurgitation preparing, fills with progress
-			if not(cvar("sbar_ring2_info_regurgitateprepare"))
-				break;
 			ring2_color = '1 0.5 1';
 			text2_msg = "Regurgitating...";
 			break;