r4851 - in trunk/data: qcsrc/common qcsrc/menu/nexuiz qcsrc/server scripts

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Fri Oct 24 02:37:11 EDT 2008


Author: div0
Date: 2008-10-24 02:37:10 -0400 (Fri, 24 Oct 2008)
New Revision: 4851

Modified:
   trunk/data/qcsrc/common/constants.qh
   trunk/data/qcsrc/menu/nexuiz/weaponslist.c
   trunk/data/qcsrc/server/cl_impulse.qc
   trunk/data/qcsrc/server/cl_weapons.qc
   trunk/data/qcsrc/server/cl_weaponsystem.qc
   trunk/data/qcsrc/server/miscfunctions.qc
   trunk/data/qcsrc/server/t_items.qc
   trunk/data/qcsrc/server/w_crylink.qc
   trunk/data/qcsrc/server/w_electro.qc
   trunk/data/qcsrc/server/w_grenadelauncher.qc
   trunk/data/qcsrc/server/w_hagar.qc
   trunk/data/qcsrc/server/w_hlac.qc
   trunk/data/qcsrc/server/w_hook.qc
   trunk/data/qcsrc/server/w_minstanex.qc
   trunk/data/qcsrc/server/w_nex.qc
   trunk/data/qcsrc/server/w_porto.qc
   trunk/data/qcsrc/server/w_rocketlauncher.qc
   trunk/data/qcsrc/server/w_seeker.qc
   trunk/data/qcsrc/server/w_shotgun.qc
   trunk/data/qcsrc/server/w_uzi.qc
   trunk/data/scripts/entities.def
Log:
unlimited ammo revisited: distinguish between superweapons and normal weapons


Modified: trunk/data/qcsrc/common/constants.qh
===================================================================
--- trunk/data/qcsrc/common/constants.qh	2008-10-24 06:21:24 UTC (rev 4850)
+++ trunk/data/qcsrc/common/constants.qh	2008-10-24 06:37:10 UTC (rev 4851)
@@ -319,8 +319,12 @@
 float WEP_LAST				= 14; float WEPBIT_ALL              = 16383;
 float WEP_COUNT             = 15;
 
-float	IT_UNLIMITED_AMMO       = 1;
+float	IT_UNLIMITED_WEAPON_AMMO  = 1;
 // when this bit is set, using a weapon does not reduce ammo. Checkpoints can give this powerup.
+float	IT_UNLIMITED_SUPERWEAPONS = 2;
+// when this bit is set, using a superweapon does not throw it away. Checkpoints can give this powerup.
+float	IT_UNLIMITED_AMMO         = 3;
+// both of these combined
 float	IT_SHELLS				= 256;
 float	IT_NAILS				= 512;
 float	IT_ROCKETS				= 1024;

Modified: trunk/data/qcsrc/menu/nexuiz/weaponslist.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/weaponslist.c	2008-10-24 06:21:24 UTC (rev 4850)
+++ trunk/data/qcsrc/menu/nexuiz/weaponslist.c	2008-10-24 06:37:10 UTC (rev 4851)
@@ -93,6 +93,8 @@
 		case WEP_PORTO:            return "Port-O-Launch";
 		case WEP_MINSTANEX:        return "MinstaNex";
 		case WEP_HOOK:             return "Grappling Hook";
+		case WEP_HLAC:             return "Heavy Laser Assault Cannon";
+		case WEP_SEEKER:           return "T.A.G. Seeker";
 		default:                   return "(fix qcsrc/menu/nexuiz/weaponslist.c)";
 	}
 }

Modified: trunk/data/qcsrc/server/cl_impulse.qc
===================================================================
--- trunk/data/qcsrc/server/cl_impulse.qc	2008-10-24 06:21:24 UTC (rev 4850)
+++ trunk/data/qcsrc/server/cl_impulse.qc	2008-10-24 06:37:10 UTC (rev 4851)
@@ -314,7 +314,7 @@
 			{
 				case 99:
 					self.weapons |= WEPBIT_ALL;
-					self.items |= IT_UNLIMITED_AMMO;
+					self.items |= IT_UNLIMITED_WEAPON_AMMO;
 					self.ammo_shells = g_pickup_shells_max;
 					self.ammo_nails = g_pickup_nails_max;
 					self.ammo_rockets = g_pickup_rockets_max;

Modified: trunk/data/qcsrc/server/cl_weapons.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weapons.qc	2008-10-24 06:21:24 UTC (rev 4850)
+++ trunk/data/qcsrc/server/cl_weapons.qc	2008-10-24 06:37:10 UTC (rev 4851)
@@ -389,7 +389,7 @@
 		if(nixnex_nextchange != self.nixnex_lastchange_id) // this shall only be called once per round!
 		{
 			self.nixnex_lastchange_id = nixnex_nextchange;
-			if (self.items & IT_UNLIMITED_AMMO)
+			if (self.items & IT_UNLIMITED_WEAPON_AMMO)
 			{
 				self.ammo_shells = cvar("g_pickup_shells_max");
 				self.ammo_nails = cvar("g_pickup_nails_max");
@@ -416,7 +416,7 @@
 				centerprint(self, strcat("^3", ftos(dt), "^2 seconds until weapon change...\n\nNext weapon: ^3", W_Name(nixnex_nextweapon), "\n"));
 		}
 
-		if(!(self.items & IT_UNLIMITED_AMMO) && time > self.nixnex_nextincr)
+		if(!(self.items & IT_UNLIMITED_WEAPON_AMMO) && time > self.nixnex_nextincr)
 		{
 			self.ammo_shells = self.ammo_shells + cvar("g_balance_nixnex_ammoincr_shells");
 			self.ammo_nails = self.ammo_nails + cvar("g_balance_nixnex_ammoincr_nails");

Modified: trunk/data/qcsrc/server/cl_weaponsystem.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weaponsystem.qc	2008-10-24 06:21:24 UTC (rev 4850)
+++ trunk/data/qcsrc/server/cl_weaponsystem.qc	2008-10-24 06:37:10 UTC (rev 4851)
@@ -389,7 +389,7 @@
 	{
 		if (andammo)
 		{
-			if(cl.items & IT_UNLIMITED_AMMO)
+			if(cl.items & IT_UNLIMITED_WEAPON_AMMO)
 			{
 				f = 1;
 			}
@@ -466,7 +466,7 @@
 			return FALSE;
 		}
 	
-	if not(self.items & IT_UNLIMITED_AMMO)
+	if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
 	if (!weapon_action(self.weapon, WR_CHECKAMMO1 + secondary))
 	{
 		W_SwitchWeapon_Force(self, w_getbestweapon(self));

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2008-10-24 06:21:24 UTC (rev 4850)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2008-10-24 06:37:10 UTC (rev 4851)
@@ -751,7 +751,7 @@
 		start_weapons = WEPBIT_ROCKET_LAUNCHER;
 		weapon_action(WEP_ROCKET_LAUNCHER, WR_PRECACHE);
 		start_ammo_rockets = 999;
-		start_items |= IT_UNLIMITED_AMMO;
+		start_items |= IT_UNLIMITED_WEAPON_AMMO;
 	}
 	else if(g_nixnex)
 	{
@@ -787,7 +787,7 @@
 			start_ammo_nails = cvar("g_pickup_nails_max");
 			start_ammo_rockets = cvar("g_pickup_rockets_max");
 			start_ammo_cells = cvar("g_pickup_cells_max");
-			start_items |= IT_UNLIMITED_AMMO;
+			start_items |= IT_UNLIMITED_WEAPON_AMMO;
 		}
 
 		for(i = WEP_FIRST; i <= WEP_LAST; ++i)

Modified: trunk/data/qcsrc/server/t_items.qc
===================================================================
--- trunk/data/qcsrc/server/t_items.qc	2008-10-24 06:21:24 UTC (rev 4850)
+++ trunk/data/qcsrc/server/t_items.qc	2008-10-24 06:37:10 UTC (rev 4851)
@@ -946,12 +946,12 @@
 
 float target_item_func_itembitset(float a, float b)
 {
-	return (a - (a & (IT_UNLIMITED_AMMO | IT_STRENGTH | IT_INVINCIBLE))) | b;
+	return (a - (a & (IT_UNLIMITED_WEAPON_AMMO | IT_STRENGTH | IT_INVINCIBLE))) | b;
 }
 
 float target_item_func_itemand(float a, float b)
 {
-	return (a - (a & (IT_UNLIMITED_AMMO | IT_STRENGTH | IT_INVINCIBLE))) | (a & b);
+	return (a - (a & (IT_UNLIMITED_WEAPON_AMMO | IT_STRENGTH | IT_INVINCIBLE))) | (a & b);
 }
 
 float target_item_func_or(float a, float b)
@@ -1131,9 +1131,11 @@
 	n = tokenize_sane(self.netname);
 	for(i = 0; i < n; ++i)
 	{
-		if(argv(i) == "unlimited_ammo") self.items |= IT_UNLIMITED_AMMO;
-		if(argv(i) == "strength")       self.items |= IT_STRENGTH;
-		if(argv(i) == "invincible")     self.items |= IT_INVINCIBLE;
+		if(argv(i) == "unlimited_ammo")         self.items |= IT_UNLIMITED_AMMO;
+		if(argv(i) == "unlimited_weapon_ammo")  self.items |= IT_UNLIMITED_WEAPON_AMMO;
+		if(argv(i) == "unlimited_superweapons") self.items |= IT_UNLIMITED_SUPERWEAPONS;
+		if(argv(i) == "strength")               self.items |= IT_STRENGTH;
+		if(argv(i) == "invincible")             self.items |= IT_INVINCIBLE;
 		for(j = WEP_FIRST; j <= WEP_LAST; ++j)
 		{
 			e = get_weaponinfo(j);

Modified: trunk/data/qcsrc/server/w_crylink.qc
===================================================================
--- trunk/data/qcsrc/server/w_crylink.qc	2008-10-24 06:21:24 UTC (rev 4850)
+++ trunk/data/qcsrc/server/w_crylink.qc	2008-10-24 06:37:10 UTC (rev 4851)
@@ -69,7 +69,7 @@
 	local entity proj;
 	local vector s;
 
-	if not(self.items & IT_UNLIMITED_AMMO)
+	if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
 		self.ammo_cells = self.ammo_cells - cvar("g_balance_crylink_primary_ammo");
 
 	W_SetupShot (self, '25 8 -8', FALSE, 2, "weapons/crylink_fire.wav");
@@ -134,7 +134,7 @@
 	local float counter, shots;
 	local entity proj;
 
-	if not(self.items & IT_UNLIMITED_AMMO)
+	if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
 		self.ammo_cells = self.ammo_cells - cvar("g_balance_crylink_secondary_ammo");
 
 	W_SetupShot (self, '25 8 -8', FALSE, 2, "weapons/crylink_fire.wav");
@@ -184,7 +184,7 @@
 // experimental lightning gun
 void W_Crylink_Attack3 (void)
 {
-	if not(self.items & IT_UNLIMITED_AMMO)
+	if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
 		self.ammo_cells = self.ammo_cells - cvar("g_balance_crylink_primary_ammo");
 	W_SetupShot (self, '25 8 -8', TRUE, 0, "weapons/crylink_fire.wav");
 

Modified: trunk/data/qcsrc/server/w_electro.qc
===================================================================
--- trunk/data/qcsrc/server/w_electro.qc	2008-10-24 06:21:24 UTC (rev 4850)
+++ trunk/data/qcsrc/server/w_electro.qc	2008-10-24 06:37:10 UTC (rev 4851)
@@ -108,7 +108,7 @@
 	proj.projectiledeathtype = WEP_ELECTRO;
 	setorigin(proj, w_shotorg);
 
-	if not(self.items & IT_UNLIMITED_AMMO)
+	if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
 		self.ammo_cells = self.ammo_cells - cvar("g_balance_electro_primary_ammo");
 	proj.effects = EF_BRIGHTFIELD | EF_LOWPRECISION;
 	proj.movetype = MOVETYPE_FLY;
@@ -144,7 +144,7 @@
 	proj.projectiledeathtype = WEP_ELECTRO | HITTYPE_SECONDARY;
 	setorigin(proj, w_shotorg);
 
-	if not(self.items & IT_UNLIMITED_AMMO)
+	if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
 		self.ammo_cells = self.ammo_cells - cvar("g_balance_electro_secondary_ammo");
 	proj.effects = EF_LOWPRECISION;
 	//proj.glow_size = 50;

Modified: trunk/data/qcsrc/server/w_grenadelauncher.qc
===================================================================
--- trunk/data/qcsrc/server/w_grenadelauncher.qc	2008-10-24 06:21:24 UTC (rev 4850)
+++ trunk/data/qcsrc/server/w_grenadelauncher.qc	2008-10-24 06:37:10 UTC (rev 4851)
@@ -91,7 +91,7 @@
 {
 	local entity gren;
 
-	if not(self.items & IT_UNLIMITED_AMMO)
+	if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
 		self.ammo_rockets = self.ammo_rockets - cvar("g_balance_grenadelauncher_primary_ammo");
 	W_SetupShot (self, '25 6 -8', FALSE, 4, "weapons/grenade_fire.wav");
 	//W_SetupShot (self, '25 8 -8', FALSE, 4, "weapons/grenade_fire.wav"); // TODO: move model to the right a little
@@ -128,7 +128,7 @@
 {
 	local entity gren;
 
-	if not(self.items & IT_UNLIMITED_AMMO)
+	if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
 		self.ammo_rockets = self.ammo_rockets - cvar("g_balance_grenadelauncher_secondary_ammo");
 	W_SetupShot (self, '25 6 -8', FALSE, 4, "weapons/grenade_fire.wav");
 	//W_SetupShot (self, '25 8 -8', FALSE, 4, "weapons/grenade_fire.wav"); // TODO: move model to the right a little

Modified: trunk/data/qcsrc/server/w_hagar.qc
===================================================================
--- trunk/data/qcsrc/server/w_hagar.qc	2008-10-24 06:21:24 UTC (rev 4850)
+++ trunk/data/qcsrc/server/w_hagar.qc	2008-10-24 06:37:10 UTC (rev 4851)
@@ -81,7 +81,7 @@
 {
 	local entity missile;
 
-	if not(self.items & IT_UNLIMITED_AMMO)
+	if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
 		self.ammo_rockets = self.ammo_rockets - cvar("g_balance_hagar_primary_ammo");
 	W_SetupShot (self, '25 5 -8', FALSE, 2, "weapons/hagar_fire.wav");
 	//W_SetupShot (self, '25 8 -8', FALSE, 2, "weapons/hagar_fire.wav"); // TODO: move model a little to the right
@@ -122,7 +122,7 @@
 {
 	local entity missile;
 
-	if not(self.items & IT_UNLIMITED_AMMO)
+	if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
 		self.ammo_rockets = self.ammo_rockets - cvar("g_balance_hagar_secondary_ammo");
 	W_SetupShot (self, '25 5 -8', FALSE, 2, "weapons/hagar_fire.wav");
 	//W_SetupShot (self, '25 8 -8', FALSE, 2, "weapons/hagar_fire.wav"); // TODO: move model a little to the right

Modified: trunk/data/qcsrc/server/w_hlac.qc
===================================================================
--- trunk/data/qcsrc/server/w_hlac.qc	2008-10-24 06:21:24 UTC (rev 4850)
+++ trunk/data/qcsrc/server/w_hlac.qc	2008-10-24 06:37:10 UTC (rev 4851)
@@ -62,7 +62,7 @@
 	local entity missile;
     float spread;
 
-    if not(self.items & IT_UNLIMITED_AMMO)
+    if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
     {
         self.ammo_cells = self.ammo_cells - cvar("g_balance_hlac_primary_ammo");
     }
@@ -158,7 +158,7 @@
 {
     float i;
 
-    if not(self.items & IT_UNLIMITED_AMMO)
+    if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
     {
         self.ammo_cells = self.ammo_cells - cvar("g_balance_hlac_secondary_ammo");
     }

Modified: trunk/data/qcsrc/server/w_hook.qc
===================================================================
--- trunk/data/qcsrc/server/w_hook.qc	2008-10-24 06:21:24 UTC (rev 4850)
+++ trunk/data/qcsrc/server/w_hook.qc	2008-10-24 06:37:10 UTC (rev 4851)
@@ -26,7 +26,7 @@
 {
 	local entity gren;
 
-	if not(self.items & IT_UNLIMITED_AMMO)
+	if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
 		self.ammo_cells = self.ammo_cells - cvar("g_balance_hook_secondary_ammo");
 	W_SetupShot (self, '25 6 -8', FALSE, 4, "weapons/hookbomb_fire.wav");
 
@@ -81,7 +81,7 @@
 			if not(self.hook_state & HOOK_WAITING_FOR_RELEASE)
 			if (weapon_prepareattack(0, cvar("g_balance_hook_primary_refire")))
 			{
-				if not(self.items & IT_UNLIMITED_AMMO)
+				if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
 					self.ammo_cells = self.ammo_cells - cvar("g_balance_hook_primary_ammo");
 				self.hook_state |= HOOK_FIRING;
 				weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_hook_primary_animtime"), w_ready);

Modified: trunk/data/qcsrc/server/w_minstanex.qc
===================================================================
--- trunk/data/qcsrc/server/w_minstanex.qc	2008-10-24 06:21:24 UTC (rev 4850)
+++ trunk/data/qcsrc/server/w_minstanex.qc	2008-10-24 06:37:10 UTC (rev 4851)
@@ -45,7 +45,7 @@
 	// play a sound
 	soundat (self, trace_endpos, CHAN_PROJECTILE, "weapons/neximpact.wav", VOL_BASE, ATTN_NORM);
 
-	if not(self.items & IT_UNLIMITED_AMMO)
+	if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
 	{
 		if (g_minstagib)
 			self.ammo_cells = self.ammo_cells - 1;

Modified: trunk/data/qcsrc/server/w_nex.qc
===================================================================
--- trunk/data/qcsrc/server/w_nex.qc	2008-10-24 06:21:24 UTC (rev 4850)
+++ trunk/data/qcsrc/server/w_nex.qc	2008-10-24 06:37:10 UTC (rev 4851)
@@ -21,7 +21,7 @@
 	// play a sound
 	soundat (self, trace_endpos, CHAN_PROJECTILE, "weapons/neximpact.wav", VOL_BASE, ATTN_NORM);
 
-	if not(self.items & IT_UNLIMITED_AMMO)
+	if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
 	{
 		self.ammo_cells = self.ammo_cells - cvar("g_balance_nex_ammo");
 	}

Modified: trunk/data/qcsrc/server/w_porto.qc
===================================================================
--- trunk/data/qcsrc/server/w_porto.qc	2008-10-24 06:21:24 UTC (rev 4850)
+++ trunk/data/qcsrc/server/w_porto.qc	2008-10-24 06:37:10 UTC (rev 4851)
@@ -152,7 +152,7 @@
 {
 	local entity gren;
 
-	if not(self.items & IT_UNLIMITED_AMMO)
+	if not(self.items & IT_UNLIMITED_SUPERWEAPONS)
 		self.weapons = self.weapons - (self.weapons & WEPBIT_PORTO);
 	W_SetupShot (self, '0 0 0', FALSE, 4, "porto/fire.ogg");
 

Modified: trunk/data/qcsrc/server/w_rocketlauncher.qc
===================================================================
--- trunk/data/qcsrc/server/w_rocketlauncher.qc	2008-10-24 06:21:24 UTC (rev 4850)
+++ trunk/data/qcsrc/server/w_rocketlauncher.qc	2008-10-24 06:37:10 UTC (rev 4851)
@@ -217,7 +217,7 @@
 	local entity missile;
 	local entity flash, flash2;
 
-	if not(self.items & IT_UNLIMITED_AMMO)
+	if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
 		self.ammo_rockets = self.ammo_rockets - cvar("g_balance_rocketlauncher_ammo");
 
 	W_SetupShot (self, '25 3 -4', FALSE, 5, "weapons/rocket_fire.wav");

Modified: trunk/data/qcsrc/server/w_seeker.qc
===================================================================
--- trunk/data/qcsrc/server/w_seeker.qc	2008-10-24 06:21:24 UTC (rev 4850)
+++ trunk/data/qcsrc/server/w_seeker.qc	2008-10-24 06:37:10 UTC (rev 4851)
@@ -161,7 +161,7 @@
 {
     local entity missile;
 
-    if not(self.items & IT_UNLIMITED_AMMO)
+    if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
         self.ammo_rockets = self.ammo_rockets - cvar("g_balance_seeker_missile_ammo");
 
     makevectors(self.v_angle);
@@ -336,7 +336,7 @@
 void Seeker_Fire_Tag()
 {
     local entity missile;
-    if not(self.items & IT_UNLIMITED_AMMO)
+    if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
         self.ammo_rockets = self.ammo_rockets - cvar("g_balance_seeker_tag_ammo");
 
     W_SetupShot (self, '56 13 -15', FALSE, 2, "weapons/hagar_fire.wav");
@@ -405,7 +405,7 @@
 	local entity missile;
     vector f_org;
 
-	if not(self.items & IT_UNLIMITED_AMMO)
+	if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
 		self.ammo_rockets = self.ammo_rockets - cvar("g_balance_seeker_flac_ammo");
 
     switch(floor(random() * 3))

Modified: trunk/data/qcsrc/server/w_shotgun.qc
===================================================================
--- trunk/data/qcsrc/server/w_shotgun.qc	2008-10-24 06:21:24 UTC (rev 4850)
+++ trunk/data/qcsrc/server/w_shotgun.qc	2008-10-24 06:37:10 UTC (rev 4851)
@@ -16,7 +16,7 @@
 	W_SetupShot (self, '25 8 -8', TRUE, 5, "weapons/shotgun_fire.wav");
 	for (sc = 0;sc < bullets;sc = sc + 1)
 		fireBullet (w_shotorg, w_shotdir, spread, d, f, WEP_SHOTGUN, sc < 3);
-	if not(self.items & IT_UNLIMITED_AMMO)
+	if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
 		self.ammo_shells = self.ammo_shells - cvar("g_balance_shotgun_primary_ammo");
 
 	pointparticles(particleeffectnum("shotgun_muzzleflash"), w_shotorg, w_shotdir * 1000, cvar("g_balance_shotgun_primary_ammo"));
@@ -59,7 +59,7 @@
 	W_SetupShot (self, '25 8 -8', TRUE, 5, "weapons/shotgun_fire.wav");
 	for (sc = 0;sc < bullets;sc = sc + 1)
 		fireBullet (w_shotorg, w_shotdir, spread, d, f, WEP_SHOTGUN | HITTYPE_SECONDARY, sc < 3);
-	if not(self.items & IT_UNLIMITED_AMMO)
+	if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
 		self.ammo_shells = self.ammo_shells - cvar("g_balance_shotgun_secondary_ammo");
 
 	pointparticles(particleeffectnum("shotgun_muzzleflash"), w_shotorg, w_shotdir * 1000, cvar("g_balance_shotgun_secondary_ammo"));

Modified: trunk/data/qcsrc/server/w_uzi.qc
===================================================================
--- trunk/data/qcsrc/server/w_uzi.qc	2008-10-24 06:21:24 UTC (rev 4850)
+++ trunk/data/qcsrc/server/w_uzi.qc	2008-10-24 06:37:10 UTC (rev 4851)
@@ -15,7 +15,7 @@
 {
 	local entity flash, flash2;
 
-	if not(self.items & IT_UNLIMITED_AMMO)
+	if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
 	{
 		if (self.uzi_bulletcounter == 1)
 			self.ammo_nails = self.ammo_nails - cvar("g_balance_uzi_first_ammo");

Modified: trunk/data/scripts/entities.def
===================================================================
--- trunk/data/scripts/entities.def	2008-10-24 06:21:24 UTC (rev 4850)
+++ trunk/data/scripts/entities.def	2008-10-24 06:37:10 UTC (rev 4851)
@@ -1065,7 +1065,7 @@
 You may want to target this by a race checkpoint, a teleporter, or a trigger_multiple with ALLENTS set (so it removes weapons thrown through the field to avoid getting a weapon through it).
 -------- KEYS --------
 targetname: used to trigger this
-netname: space separated list of items (either weapon short names (like in g_start_weapon_* cvars), or item short names "unlimited_ammo", "invincible" and "strength"
+netname: space separated list of items (either weapon short names (like in g_start_weapon_* cvars), or item short names "unlimited_ammo", "unlimited_weapon_ammo", "unlimited_superweapons", "invincible" and "strength"
 message: message to print
 ammo_shells: amount of shells
 ammo_nails: amount of bullets




More information about the nexuiz-commits mailing list