X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_nex.qc;h=cdcabc86688996cde0ce04f43dd94816ab9eb88e;hb=71ee5248f3bc5e5fbddb4d42fb74c2e247658039;hp=802298912d96eb774796b893d222705f92eeb754;hpb=5c1853300daf8fd4855f5a693c86a1c05c79633c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc
index 802298912..cdcabc866 100644
--- a/qcsrc/server/w_nex.qc
+++ b/qcsrc/server/w_nex.qc
@@ -221,10 +221,17 @@ float w_nex(float req)
 	}
 	else if (req == WR_CHECKAMMO2)
 	{
-		// don't allow charging if we don't have enough ammo
-		ammo_amount = self.ammo_cells >= autocvar_g_balance_nex_secondary_ammo;
-		ammo_amount += self.(weapon_load[WEP_NEX]) >= autocvar_g_balance_nex_secondary_ammo;
-		return ammo_amount;
+		if(autocvar_g_balance_nex_secondary)
+		{
+			// don't allow charging if we don't have enough ammo
+			ammo_amount = self.ammo_cells >= autocvar_g_balance_nex_secondary_ammo;
+			ammo_amount += self.(weapon_load[WEP_NEX]) >= autocvar_g_balance_nex_secondary_ammo;	
+			return ammo_amount;
+		}
+		else
+		{
+			return FALSE; // zoom is not a fire mode
+		}
 	}
 	else if (req == WR_RELOAD)
 	{
@@ -232,7 +239,7 @@ float w_nex(float req)
 	}
 
 	return TRUE;
-};
+}
 #endif
 #ifdef CSQC
 float w_nex(float req)
@@ -252,7 +259,7 @@ float w_nex(float req)
 	else if (req == WR_SUICIDEMESSAGE)
 		w_deathtypestring = _("%s is now thinking with portals");
 	else if (req == WR_KILLMESSAGE)
-		w_deathtypestring = _("%s has been vaporized by %s");
+		w_deathtypestring = _("%s has been vaporized by %s's nex");
 	return TRUE;
 }
 #endif