From: terencehill <piuntn@gmail.com>
Date: Mon, 18 Jun 2018 18:57:49 +0000 (+0200)
Subject: Remove a redundant Weapons_from call
X-Git-Tag: xonotic-v0.8.5~2010^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0a4df55ee43e504f4d6b84d0d7e9fd7d663a3206;p=xonotic%2Fxonotic-data.pk3dir.git

Remove a redundant Weapons_from call
---

diff --git a/qcsrc/common/mutators/mutator/nix/sv_nix.qc b/qcsrc/common/mutators/mutator/nix/sv_nix.qc
index da5dcc234..586deda3e 100644
--- a/qcsrc/common/mutators/mutator/nix/sv_nix.qc
+++ b/qcsrc/common/mutators/mutator/nix/sv_nix.qc
@@ -130,7 +130,7 @@ void NIX_GiveCurrentWeapon(entity this)
 	}
 
 	// get weapon info
-	entity e = Weapons_from(nix_weapon);
+	entity wpn = Weapons_from(nix_weapon);
 
 	if(nix_nextchange != this.nix_lastchange_id) // this shall only be called once per round!
 	{
@@ -142,7 +142,7 @@ void NIX_GiveCurrentWeapon(entity this)
 		SetResourceAmount(this, RESOURCE_FUEL, 0);
 		if(this.items & IT_UNLIMITED_WEAPON_AMMO)
 		{
-			switch (e.ammo_type)
+			switch (wpn.ammo_type)
 			{
 				case RESOURCE_SHELLS:  SetResourceAmount(this, RESOURCE_SHELLS, autocvar_g_pickup_shells_max);  break;
 				case RESOURCE_BULLETS: SetResourceAmount(this, RESOURCE_BULLETS, autocvar_g_pickup_nails_max);   break;
@@ -154,7 +154,7 @@ void NIX_GiveCurrentWeapon(entity this)
 		}
 		else
 		{
-			switch (e.ammo_type)
+			switch (wpn.ammo_type)
 			{
 				case RESOURCE_SHELLS:  SetResourceAmount(this, RESOURCE_SHELLS, autocvar_g_balance_nix_ammo_shells);  break;
 				case RESOURCE_BULLETS: SetResourceAmount(this, RESOURCE_BULLETS, autocvar_g_balance_nix_ammo_nails);   break;
@@ -171,15 +171,15 @@ void NIX_GiveCurrentWeapon(entity this)
 		else
 			Send_Notification(NOTIF_ONE_ONLY, this, MSG_CENTER, CENTER_NIX_NEWWEAPON, nix_weapon);
 
-		e.wr_resetplayer(e, this);
+		wpn.wr_resetplayer(wpn, this);
 
 		// all weapons must be fully loaded when we spawn
-		if(e.spawnflags & WEP_FLAG_RELOADABLE) // prevent accessing undefined cvars
+		if (wpn.spawnflags & WEP_FLAG_RELOADABLE) // prevent accessing undefined cvars
 		{
-			for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
+			for (int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
 			{
 				.entity weaponentity = weaponentities[slot];
-				this.(weaponentity).(weapon_load[nix_weapon]) = e.reloading_ammo;
+				this.(weaponentity).(weapon_load[nix_weapon]) = wpn.reloading_ammo;
 			}
 		}
 
@@ -195,7 +195,7 @@ void NIX_GiveCurrentWeapon(entity this)
 
 	if(!(this.items & IT_UNLIMITED_WEAPON_AMMO) && time > this.nix_nextincr)
 	{
-		switch (e.ammo_type)
+		switch (wpn.ammo_type)
 		{
 			case RESOURCE_SHELLS:  GiveResource(this, RESOURCE_SHELLS, autocvar_g_balance_nix_ammoincr_shells);  break;
 			case RESOURCE_BULLETS: GiveResource(this, RESOURCE_BULLETS, autocvar_g_balance_nix_ammoincr_nails);   break;
@@ -211,20 +211,19 @@ void NIX_GiveCurrentWeapon(entity this)
 	STAT(WEAPONS, this) = '0 0 0';
 	if(g_nix_with_blaster)
 		STAT(WEAPONS, this) |= WEPSET(BLASTER);
-	STAT(WEAPONS, this) |= e.m_wepset;
+	STAT(WEAPONS, this) |= wpn.m_wepset;
 
-    Weapon w = Weapons_from(nix_weapon);
-    for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
-    {
-    	.entity weaponentity = weaponentities[slot];
-    	if(this.(weaponentity).m_weapon == WEP_Null && slot != 0)
-    		continue;
+	for (int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
+	{
+		.entity weaponentity = weaponentities[slot];
+		if (this.(weaponentity).m_weapon == WEP_Null && slot != 0)
+			continue;
 
-		if(this.(weaponentity).m_switchweapon != w)
-		if(!client_hasweapon(this, this.(weaponentity).m_switchweapon, weaponentity, true, false))
+		if (this.(weaponentity).m_switchweapon != wpn)
+		if (!client_hasweapon(this, this.(weaponentity).m_switchweapon, weaponentity, true, false))
 		{
-			if(client_hasweapon(this, w, weaponentity, true, false))
-				W_SwitchWeapon(this, w, weaponentity);
+			if (client_hasweapon(this, wpn, weaponentity, true, false))
+				W_SwitchWeapon(this, wpn, weaponentity);
 		}
 	}
 }