X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fw_nex.qc;h=f6fe16dab6b6e8ca7b2862903e087d312f5c893b;hb=3a4facfc84d13dfd813e8e7cd4210af518f75c81;hp=9a7a423bed450ee0ca364fbc0279f346875a3a1d;hpb=818d8304e980794193411df430b2f348cfa612c2;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/weapons/w_nex.qc b/qcsrc/common/weapons/w_nex.qc
index 9a7a423be..f6fe16dab 100644
--- a/qcsrc/common/weapons/w_nex.qc
+++ b/qcsrc/common/weapons/w_nex.qc
@@ -6,6 +6,7 @@ REGISTER_WEAPON(
 /* impulse  */ 7,
 /* flags    */ WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN,
 /* rating   */ BOT_PICKUP_RATING_HIGH,
+/* color	*/ '0.5 1 1',
 /* model    */ "nex",
 /* netname  */ "nex",
 /* fullname */ _("Vortex")
@@ -202,11 +203,11 @@ float w_nex(float req)
 										}
 										else
 										{
-											dt = min(dt, (self.(self.current_ammo) - WEP_CVAR_PRI(nex, ammo)) / WEP_CVAR_SEC(nex, ammo));
+											dt = min(dt, (self.AMMO_VAL(WEP_NEX) - WEP_CVAR_PRI(nex, ammo)) / WEP_CVAR_SEC(nex, ammo));
 											dt = max(0, dt);
 											if(dt > 0)
 											{
-												self.(self.current_ammo) = max(WEP_CVAR_SEC(nex, ammo), self.(self.current_ammo) - WEP_CVAR_SEC(nex, ammo) * dt);
+												self.AMMO_VAL(WEP_NEX) = max(WEP_CVAR_SEC(nex, ammo), self.AMMO_VAL(WEP_NEX) - WEP_CVAR_SEC(nex, ammo) * dt);
 											}
 										}
 									}
@@ -250,7 +251,7 @@ float w_nex(float req)
 		}
 		case WR_CHECKAMMO1:
 		{
-			ammo_amount = self.(self.current_ammo) >= WEP_CVAR_PRI(nex, ammo);
+			ammo_amount = self.AMMO_VAL(WEP_NEX) >= WEP_CVAR_PRI(nex, ammo);
 			ammo_amount += (autocvar_g_balance_nex_reload_ammo && self.(weapon_load[WEP_NEX]) >= WEP_CVAR_PRI(nex, ammo));
 			return ammo_amount;
 		}
@@ -259,8 +260,8 @@ float w_nex(float req)
 			if(WEP_CVAR(nex, secondary))
 			{
 				// don't allow charging if we don't have enough ammo
-				ammo_amount = self.(self.current_ammo) >= WEP_CVAR_SEC(nex, ammo);
-				ammo_amount += self.(weapon_load[WEP_NEX]) >= WEP_CVAR_SEC(nex, ammo);	
+				ammo_amount = self.AMMO_VAL(WEP_NEX) >= WEP_CVAR_SEC(nex, ammo);
+				ammo_amount += self.(weapon_load[WEP_NEX]) >= WEP_CVAR_SEC(nex, ammo);
 				return ammo_amount;
 			}
 			else