From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 3 May 2011 20:37:34 +0000 (+0300)
Subject: Cvar each ring's action, and showing the ring for that purpose.
X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=0b7595586c3cac537e3f1ea700229149b11fab0a

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

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index 86b5c597..cd056d83 100644
--- 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"
 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_ring2 1 "enables the second HUD ring"
 seta sbar_ring2_scale 40 "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_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 d0045098..d9f805cf 100644
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -2001,11 +2001,15 @@ void Sbar_Ring()
 			break;
 		case 1:
 			// 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 2:
 			// 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;
@@ -2020,6 +2024,8 @@ void Sbar_Ring()
 			break;
 		case 1:
 			// 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;