From: FruitieX <fruitiex@gmail.com>
Date: Wed, 15 Dec 2010 17:47:01 +0000 (+0200)
Subject: argh! use self.weapon instead of weapid here
X-Git-Tag: xonotic-v0.1.0preview~20^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f876eb93d0a7b813f1bd36066f344bda27f6179a;p=xonotic%2Fxonotic-data.pk3dir.git

argh! use self.weapon instead of weapid here
---

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index c42d67fa0..1226c252c 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -1770,10 +1770,10 @@ void HUD_Weapons(void)
 				drawstring(wpnpos, getcommandkey(ftos(weapid), strcat("impulse ", ftos(weapid))), '1 1 0' * 0.5 * wpnsize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
 
 			// draw ammo status bar
-			if(show_ammo && weapid != WEP_TUBA && weapid != WEP_LASER && weapid != WEP_PORTO)
+			if(show_ammo && self.weapon != WEP_TUBA && self.weapon != WEP_LASER && self.weapon != WEP_PORTO)
 			{
 				a = 0;
-				type = GetAmmoTypeForWep(weapid);
+				type = GetAmmoTypeForWep(self.weapon);
 				if(type != -1)
 					a = getstati(GetAmmoStat(type)); // how much ammo do we have?