From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Fri, 18 Nov 2011 13:41:17 +0000 (+0200)
Subject: Display digits - Use owner.weapon, not owner.switchweapon
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f2ced266108c7dfddf64780c0e20f9ffc85173bc;p=voretournament%2Fvoretournament.git

Display digits - Use owner.weapon, not owner.switchweapon
---

diff --git a/data/qcsrc/server/cl_weaponsystem.qc b/data/qcsrc/server/cl_weaponsystem.qc
index b16a5efb..58d96ec4 100644
--- a/data/qcsrc/server/cl_weaponsystem.qc
+++ b/data/qcsrc/server/cl_weaponsystem.qc
@@ -1584,7 +1584,7 @@ void W_DisplayDigitThink()
 	self.nextthink = time;
 
 	// the owner has switched to another weapon, remove the digits
-	if(self.weapon != self.owner.switchweapon)
+	if(self.weapon != self.owner.weapon)
 	{
 		self.nextthink = 0;
 		remove(self);
@@ -1630,7 +1630,7 @@ void W_DisplayDigitThink()
 		}
 		else
 		{
-			txt = ftos(floor(self.owner.weapon_load[self.owner.switchweapon]));
+			txt = ftos(floor(self.owner.weapon_load[self.owner.weapon]));
 			txt = substring(txt, self.cnt - 1, 1);
 		}
 	}
@@ -1651,7 +1651,7 @@ void W_DisplayDigitSetup(entity own, float num, float load, float exterior)
 	entity digit, e;
 	digit = spawn();
 	digit.owner = own;
-	digit.weapon = own.switchweapon;
+	digit.weapon = own.weapon;
 	digit.dmg = exterior;
 	digit.team = load;
 	digit.cnt = num;