From: Mario <mario@smbclan.net>
Date: Thu, 18 Feb 2016 02:52:27 +0000 (+1000)
Subject: Don't use health when getting armor value
X-Git-Tag: xonotic-v0.8.2~1185
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3af9366331cc31ba8063e666d78be8b905b194a7;p=xonotic%2Fxonotic-data.pk3dir.git

Don't use health when getting armor value
---

diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc
index 0bb3ac174..7003dfd7f 100644
--- a/qcsrc/common/t_items.qc
+++ b/qcsrc/common/t_items.qc
@@ -1529,7 +1529,7 @@ spawnfunc(target_items)
 		if(self.ammo_plasma != 0) self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, max(0, self.ammo_plasma), "plasma");
 		if(self.ammo_fuel != 0) self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, max(0, self.ammo_fuel), "fuel");
 		if(self.health != 0) self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, max(0, self.health), "health");
-		if(self.armorvalue != 0) self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, max(0, self.health), "armor");
+		if(self.armorvalue != 0) self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, max(0, self.armorvalue), "armor");
 		FOREACH(Weapons, it != WEP_Null, LAMBDA(self.netname = sprintf("%s %s%d %s", self.netname, itemprefix, !!(self.weapons & (it.m_wepset)), it.netname)));
 	}
 	self.netname = strzone(self.netname);