From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 3 May 2011 20:18:46 +0000 (+0300)
Subject: Cvar sbar ring settings
X-Git-Url: https://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=d334bd20eb6cdd1e278529d61125092075a8f74e

Cvar sbar ring settings
---

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index 26acfb94..5eb0c869 100644
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -1159,6 +1159,14 @@ seta sbar_stomachboard_status_fade 1 "color fading speed of the stomach board st
 seta sbar_stomachboard_highlight_alpha 0.25 "alpha of the stomach board highlight"
 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 100 "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_ring2 1 "enables the second HUD ring"
+seta sbar_ring2_scale 60 "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_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 f0586cda..d0045098 100644
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -1982,16 +1982,17 @@ void Sbar_Ring()
 {
 	vector ring_pos, ring1_color, ring2_color;
 	vector text_pos, text1_size, text2_size;
-	float ring_alpha, ring1_size, ring1_clip, ring2_size, ring2_clip;
+	float ring1_alpha, ring2_alpha, ring1_size, ring1_clip, ring2_size, ring2_clip;
 	string text1_msg, text2_msg;
 
 	ring_pos_x = vid_conwidth / 2;
 	ring_pos_y = vid_conheight / 1.375;
-	ring1_size = 100;
-	ring2_size = 60;
-	ring_alpha = sbar_alpha_fg * 1;
-	text1_size = '12 12 0';
-	text2_size = '10 10 0';
+	ring1_size = cvar("sbar_ring1_scale");
+	ring2_size = cvar("sbar_ring2_scale");
+	ring1_alpha = sbar_alpha_fg * cvar("sbar_ring1_alpha");
+	ring2_alpha = sbar_alpha_fg * cvar("sbar_ring2_alpha");
+	text1_size = '1 1 0' * cvar("sbar_ring1_text_scale");
+	text2_size = '1 1 0' * cvar("sbar_ring2_text_scale");
 
 	switch(getstati(STAT_SBRING1_TYPE))
 	{
@@ -2029,16 +2030,16 @@ void Sbar_Ring()
 	ring1_clip = getstatf(STAT_SBRING1_CLIP);
 	ring2_clip = getstatf(STAT_SBRING2_CLIP);
 
-	if(text1_msg != "")
+	if(text1_msg != "" && cvar("sbar_ring1"))
 	{
-		DrawCircleClippedPic(ring_pos, ring1_size, "gfx/hud/sb_ring.tga", ring1_clip, ring1_color, ring_alpha, DRAWFLAG_ADDITIVE);
+		DrawCircleClippedPic(ring_pos, ring1_size, "gfx/hud/sb_ring.tga", ring1_clip, ring1_color, ring1_alpha, DRAWFLAG_ADDITIVE);
 		text_pos_x = ring_pos_x - stringwidth(text1_msg, FALSE, text1_size) / 2;
 		text_pos_y = ring_pos_y - ring1_size / 2;
 		drawstring(text_pos, text1_msg, text1_size, ring1_color, sbar_alpha_fg, DRAWFLAG_NORMAL);
 	}
-	if(text2_msg != "")
+	if(text2_msg != "" && cvar("sbar_ring2"))
 	{
-		DrawCircleClippedPic(ring_pos, ring2_size, "gfx/hud/sb_ring.tga", ring2_clip, ring2_color, ring_alpha, DRAWFLAG_ADDITIVE);
+		DrawCircleClippedPic(ring_pos, ring2_size, "gfx/hud/sb_ring.tga", ring2_clip, ring2_color, ring2_alpha, DRAWFLAG_ADDITIVE);
 		text_pos_x = ring_pos_x - stringwidth(text2_msg, FALSE, text2_size) / 2;
 		text_pos_y = ring_pos_y + ring1_size / 2;
 		drawstring(text_pos, text2_msg, text2_size, ring2_color, sbar_alpha_fg, DRAWFLAG_NORMAL);