From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 22 Jan 2011 16:15:09 +0000 (+0200)
Subject: Rename the Laser cvar, to avoid a functionality conflict
X-Git-Tag: xonotic-v0.5.0~309^2~7^2~112
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=e7f2a704da9e9230be32250b326dd7a19f14eb2d;p=xonotic%2Fxonotic-data.pk3dir.git

Rename the Laser cvar, to avoid a functionality conflict
---

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index 7e5327c33..869c9a1cb 100644
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -243,7 +243,7 @@ set g_balance_laser_secondary_gauntlet 1
 set g_balance_laser_secondary_force_zscale 1.25
 set g_balance_laser_secondary_force_velocitybias 0
 set g_balance_laser_secondary_force_other_scale 0
-set g_balance_laser_reload_count 5
+set g_balance_laser_reload_ammo 5
 set g_balance_laser_reload_time 2
 // }}}
 // {{{ shotgun
diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 308635f05..636297248 100644
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -422,7 +422,7 @@ float autocvar_g_balance_laser_secondary_force_zscale;
 float autocvar_g_balance_laser_secondary_lifetime;
 float autocvar_g_balance_laser_secondary_radius;
 float autocvar_g_balance_laser_secondary_speed;
-float autocvar_g_balance_laser_reload_count;
+float autocvar_g_balance_laser_reload_ammo;
 float autocvar_g_balance_laser_reload_time;
 float autocvar_g_balance_minelayer_ammo;
 float autocvar_g_balance_minelayer_animtime;
diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 183f31fe6..0f5326425 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -890,7 +890,7 @@ void PutClientInServer (void)
 		}
 
 		// all weapons must be fully loaded the first time we pick them up, so set their load to maximum at respawn
-		self.laser_load = autocvar_g_balance_laser_reload_count;
+		self.laser_load = autocvar_g_balance_laser_reload_ammo;
 		self.shotgun_load = autocvar_g_balance_shotgun_reload_ammo;
 		self.sniperrifle_load = autocvar_g_balance_sniperrifle_reload_ammo;
 		self.uzi_load = autocvar_g_balance_uzi_reload_ammo;
diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc
index 0dde022e8..05542ee6a 100644
--- a/qcsrc/server/w_laser.qc
+++ b/qcsrc/server/w_laser.qc
@@ -9,12 +9,12 @@ void(float imp) W_SwitchWeapon;
 void W_Laser_SetAmmoCounter()
 {
 	// set clip_load to the weapon we have switched to, if the gun uses reloading
-	if(!autocvar_g_balance_laser_reload_count)
+	if(!autocvar_g_balance_laser_reload_ammo)
 		self.clip_load = 0; // also keeps crosshair ammo from displaying
 	else
 	{
 		self.clip_load = self.laser_load;
-		self.clip_size = autocvar_g_balance_laser_reload_count; // for the crosshair ammo display
+		self.clip_size = autocvar_g_balance_laser_reload_ammo; // for the crosshair ammo display
 	}
 }
 
@@ -22,7 +22,7 @@ void W_Laser_ReloadedAndReady()
 {
 	float t;
 
-	self.clip_load = autocvar_g_balance_laser_reload_count; // maximum load since this weapon uses no ammo
+	self.clip_load = autocvar_g_balance_laser_reload_ammo; // maximum load since this weapon uses no ammo
 	self.laser_load = self.clip_load;
 
 	t = ATTACK_FINISHED(self) - autocvar_g_balance_laser_reload_time - 1;
@@ -33,7 +33,7 @@ void W_Laser_ReloadedAndReady()
 void W_Laser_Reload()
 {
 	// return if reloading is disabled for this weapon
-	if(!autocvar_g_balance_laser_reload_count)
+	if(!autocvar_g_balance_laser_reload_ammo)
 		return;
 
 	if(!W_ReloadCheck(1, 0))
@@ -273,7 +273,7 @@ float w_laser(float req)
 	}
 	else if (req == WR_THINK)
 	{
-		if(autocvar_g_balance_laser_reload_count && self.clip_load < 1) // forced reload
+		if(autocvar_g_balance_laser_reload_ammo && self.clip_load < 1) // forced reload
 			W_Laser_Reload();
 		else if (self.BUTTON_ATCK)
 		{
@@ -282,7 +282,7 @@ float w_laser(float req)
 				// if this weapon is reloadable, decrease its load
 				if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
 				{
-					if(autocvar_g_balance_laser_reload_count)
+					if(autocvar_g_balance_laser_reload_ammo)
 					{
 						self.clip_load -= 1;
 						self.laser_load = self.clip_load;
@@ -300,7 +300,7 @@ float w_laser(float req)
 				// if this weapon is reloadable, decrease its load
 				if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
 				{
-					if(autocvar_g_balance_laser_reload_count)
+					if(autocvar_g_balance_laser_reload_ammo)
 					{
 						self.clip_load -= 1;
 						self.laser_load = self.clip_load;