From fe19e8f234f533821d5296e8b271b4b9e9447814 Mon Sep 17 00:00:00 2001
From: terencehill <piuntn@gmail.com>
Date: Sat, 6 Nov 2010 00:50:22 +0100
Subject: [PATCH] autocvar_cl_gentle* and autocvar_hud_panel_notify_* gone!

---
 qcsrc/client/autocvars.qh |  8 --------
 qcsrc/client/gibs.qc      |  9 +++++----
 qcsrc/client/hud.qc       | 13 +++++++------
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index 1daecc5a5..ff8d92314 100644
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -6,10 +6,6 @@ var float autocvar_cl_gibs_sloppy = 1;
 var float autocvar_cl_casings_ticrate = 0.1;
 var float autocvar_cl_casings_sloppy = 1;
 
-var float autocvar_cl_gentle;
-var float autocvar_cl_gentle_gibs;
-var float autocvar_cl_gentle_messages;
-
 var float autocvar_scoreboard_color_bg_team;
 
 var float autocvar__menu_alpha;
@@ -48,10 +44,6 @@ var float autocvar_hud_panel_powerups;
 var float autocvar_hud_panel_healtharmor;
 
 var float autocvar_hud_panel_notify;
-var float autocvar_hud_panel_notify_print;
-var float autocvar_hud_panel_notify_time;
-var float autocvar_hud_panel_notify_fadetime;
-var float autocvar_hud_panel_notify_flip;
 
 var float autocvar_hud_panel_timer;
 var float autocvar_hud_panel_timer_increment;
diff --git a/qcsrc/client/gibs.qc b/qcsrc/client/gibs.qc
index 86b970c1a..6f6e14393 100644
--- a/qcsrc/client/gibs.qc
+++ b/qcsrc/client/gibs.qc
@@ -153,14 +153,15 @@ void Ent_GibSplash(float isNew)
 	org_z = ReadShort() * 4 + 2;
 	vel = decompressShortVector(ReadShort());
 
-	if(autocvar_cl_gentle_gibs || cvar("cl_gentle"))
+	float cl_gentle_gibs = cvar("cl_gentle_gibs");
+	if(cl_gentle_gibs || cvar("cl_gentle"))
 		type |= 0x80; // set gentle bit
 
 	if(type & 0x80)
 	{
-		if(autocvar_cl_gentle_gibs == 2)
+		if(cl_gentle_gibs == 2)
 			gentle_prefix = "";
-		else if(autocvar_cl_gentle_gibs == 3) 
+		else if(cl_gentle_gibs == 3) 
 			gentle_prefix = "happy_";
 		else
 			gentle_prefix = "morphed_";
@@ -171,7 +172,7 @@ void Ent_GibSplash(float isNew)
 		gentle_prefix = "particlegibs_";
 	}
 
-	if not(autocvar_cl_gentle_gibs || cvar("cl_gentle"))
+	if not(cl_gentle_gibs || cvar("cl_gentle"))
 		amount *= 1 - cvar("cl_nogibs");
 
 	if(cvar("ekg"))
diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index c22f4341b..0bf30cf6c 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -2647,8 +2647,8 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) // s
 {
 	float w;
 	float alsoprint, gentle;
-	alsoprint = (autocvar_hud_panel_notify_print || !panel_enabled); // print message to console if: notify panel disabled, or cvar to do so enabled
-	gentle = (autocvar_cl_gentle || autocvar_cl_gentle_messages);
+	alsoprint = (cvar("hud_panel_notify_print") || !panel_enabled); // print message to console if: notify panel disabled, or cvar to do so enabled
+	gentle = (cvar("cl_gentle") || cvar("cl_gentle_messages"));
 	
 	if(msg == MSG_SUICIDE) {
 		w = DEATH_WEAPONOF(type);
@@ -2984,7 +2984,7 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) // s
 void HUD_Centerprint(string s1, string s2, float type, float msg)
 {
 	float gentle;
-	gentle = (autocvar_cl_gentle || autocvar_cl_gentle_messages);
+	gentle = (cvar("cl_gentle") || cvar("cl_gentle_messages"));
 	if(msg == MSG_SUICIDE) {
 		if (type == DEATH_TEAMCHANGE) {
 			centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "You are now on: ", s1));
@@ -3095,9 +3095,9 @@ void HUD_Notify (void)
 
 	float a;
 	float when;
-	when = autocvar_hud_panel_notify_time;
+	when = cvar("hud_panel_notify_time");
 	float fadetime;
-	fadetime = autocvar_hud_panel_notify_fadetime;
+	fadetime = cvar("hud_panel_notify_fadetime");
 
 	string s;
 
@@ -3107,10 +3107,11 @@ void HUD_Notify (void)
 	string attacker, victim;
 
 	float i, j, w;
+	float flip = cvar("hud_panel_notify_flip");
 	for(j = 0; j < entries; ++j)
 	{
 		s = "";
-		if(autocvar_hud_panel_notify_flip)
+		if(flip)
 			i = j;
 		else // rather nasty hack for ordering items from the bottom up
 			i = entries - j - 1;
-- 
2.39.2