X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_weaponsystem.qc;h=bb71d5965af2f2be6bb548f0aa11bca000d613ff;hp=5bfad53530b8b7446c14c33ef4fdaca68510f41c;hb=ce607085bc5684e0066498289cc4c19b2dab1bb6;hpb=7b8473b5128d64ae34f128ad44933834139aa364

diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc
index 5bfad5353..bb71d5965 100644
--- a/qcsrc/server/cl_weaponsystem.qc
+++ b/qcsrc/server/cl_weaponsystem.qc
@@ -19,13 +19,13 @@ float W_WeaponRateFactor()
 		if(self.runes & RUNE_SPEED)
 		{
 			if(self.runes & CURSE_SLOW)
-				t = t * cvar("g_balance_rune_speed_combo_atkrate");
+				t = t * autocvar_g_balance_rune_speed_combo_atkrate;
 			else
-				t = t * cvar("g_balance_rune_speed_atkrate");
+				t = t * autocvar_g_balance_rune_speed_atkrate;
 		}
 		else if(self.runes & CURSE_SLOW)
 		{
-			t = t * cvar("g_balance_curse_slow_atkrate");
+			t = t * autocvar_g_balance_curse_slow_atkrate;
 		}
 	}
 
@@ -191,7 +191,7 @@ void W_SetupShot_Dir_ProjectileSize_Range(entity ent, vector s_forward, vector m
 	if (antilag)
 	if (!ent.cvar_cl_noantilag)
 	{
-		if (cvar("g_antilag") == 1) // switch to "ghost" if not hitting original
+		if (autocvar_g_antilag == 1) // switch to "ghost" if not hitting original
 		{
 			traceline(w_shotorg, w_shotorg + w_shotdir * range, MOVE_NORMAL, ent);
 			if (!trace_ent.takedamage)
@@ -207,7 +207,7 @@ void W_SetupShot_Dir_ProjectileSize_Range(entity ent, vector s_forward, vector m
 				}
 			}
 		}
-		else if(cvar("g_antilag") == 3) // client side hitscan
+		else if(autocvar_g_antilag == 3) // client side hitscan
 		{
 			// this part MUST use prydon cursor
 			if (ent.cursor_trace_ent)                 // client was aiming at someone
@@ -242,9 +242,9 @@ void W_SetupShot_Dir_ProjectileSize_Range(entity ent, vector s_forward, vector m
 	if(ent.items & IT_STRENGTH)
 	if(!g_minstagib)
 	if(
-		(time > ent.prevstrengthsound + cvar("sv_strengthsound_antispam_time"))
+		(time > ent.prevstrengthsound + autocvar_sv_strengthsound_antispam_time)
 		||
-		(time > ent.prevstrengthsoundattempt + cvar("sv_strengthsound_antispam_refire_threshold"))
+		(time > ent.prevstrengthsoundattempt + autocvar_sv_strengthsound_antispam_refire_threshold)
 	) // prevent insane sound spam
 	{
 		sound(ent, CHAN_AUTO, "weapons/strength_fire.wav", VOL_BASE, ATTN_NORM);
@@ -616,7 +616,7 @@ void CL_Weaponentity_Think()
 	f = 0;
 	if (self.state == WS_RAISE && !intermission_running)
 	{
-		f = (self.owner.weapon_nextthink - time) * g_weaponratefactor / cvar("g_balance_weaponswitchdelay");
+		f = (self.owner.weapon_nextthink - time) * g_weaponratefactor / autocvar_g_balance_weaponswitchdelay;
 		self.angles_x = -90 * f * f;
 		if (qcweaponanimation)
 		{
@@ -626,7 +626,7 @@ void CL_Weaponentity_Think()
 	}
 	else if (self.state == WS_DROP && !intermission_running)
 	{
-		f = 1 - (self.owner.weapon_nextthink - time) * g_weaponratefactor / cvar("g_balance_weaponswitchdelay");
+		f = 1 - (self.owner.weapon_nextthink - time) * g_weaponratefactor / autocvar_g_balance_weaponswitchdelay;
 		self.angles_x = -90 * f * f;
 		if (qcweaponanimation)
 		{
@@ -952,7 +952,7 @@ float client_hasweapon(entity cl, float wpn, float andammo, float complain)
 			sprint(cl, strcat("You do not have the ^2", W_Name(wpn), "\n") );
 			Send_WeaponComplain (cl, wpn, W_Name(wpn), 1);
 
-			if(cvar("g_showweaponspawns"))
+			if(autocvar_g_showweaponspawns)
 			{
 				entity e;
 				string s;
@@ -1011,7 +1011,7 @@ void w_ready()
 void weapon_setup(float windex)
 {
 	entity e;
-	qcweaponanimation = cvar("sv_qcweaponanimation");
+	qcweaponanimation = autocvar_sv_qcweaponanimation;
 	e = get_weaponinfo(windex);
 	self.items &~= IT_AMMO;
 	self.items = self.items | e.items;
@@ -1275,7 +1275,7 @@ vector W_CalculateProjectileVelocity(vector pvelocity, vector mvelocity, float f
 	mdirection = normalize(mvelocity);
 	mspeed = vlen(mvelocity);
 
-	nstyle = cvar("g_projectiles_newton_style");
+	nstyle = autocvar_g_projectiles_newton_style;
 	if(nstyle == 0 || forceAbsolute)
 	{
 		// absolute velocity
@@ -1312,7 +1312,7 @@ vector W_CalculateProjectileVelocity(vector pvelocity, vector mvelocity, float f
 			//dprint("impossible shot, adjusting\n");
 		}
 
-		outspeed = bound(mspeed * cvar("g_projectiles_newton_style_2_minfactor"), outspeed, mspeed * cvar("g_projectiles_newton_style_2_maxfactor"));
+		outspeed = bound(mspeed * autocvar_g_projectiles_newton_style_2_minfactor, outspeed, mspeed * autocvar_g_projectiles_newton_style_2_maxfactor);
 		outvelocity = mdirection * outspeed;
 	}
 	else if(nstyle == 3)
@@ -1455,7 +1455,7 @@ vector W_CalculateProjectileSpread(vector forward, float spread)
 	spread *= g_weaponspreadfactor;
 	if(spread <= 0)
 		return forward;
-	sstyle = cvar("g_projectiles_spread_style");
+	sstyle = autocvar_g_projectiles_spread_style;
 	
 	if(sstyle == 0)
 	{
@@ -1580,10 +1580,10 @@ void W_SetupProjectileVelocityEx(entity missile, vector dir, vector upDir, float
 	dir = normalize(dir);
 
 #if 0
-	if(cvar("g_projectiles_spread_style") != mspercallsstyle)
+	if(autocvar_g_projectiles_spread_style != mspercallsstyle)
 	{
 		mspercallsum = mspercallcount = 0;
-		mspercallsstyle = cvar("g_projectiles_spread_style");
+		mspercallsstyle = autocvar_g_projectiles_spread_style;
 	}
 	mspercallsum -= gettime(GETTIME_HIRES);
 #endif