r2940 - branches/nexuiz-2.0/data/qcsrc/server trunk/data trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: kadaverjack
Date: 2007-11-12 07:27:16 -0500 (Mon, 12 Nov 2007)
New Revision: 2940

Modified:
   branches/nexuiz-2.0/data/qcsrc/server/t_items.qc
   trunk/data/entities.def
   trunk/data/qcsrc/server/t_items.qc
Log:
new item for minstagib: item_minst_cells (disables auto-replacement of nex & rl, so mappers can place ammo where they want)


Modified: branches/nexuiz-2.0/data/qcsrc/server/t_items.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/t_items.qc	2007-11-10 23:52:08 UTC (rev 2939)
+++ branches/nexuiz-2.0/data/qcsrc/server/t_items.qc	2007-11-12 12:27:16 UTC (rev 2940)
@@ -482,6 +482,12 @@
 
 }
 
+float minst_no_auto_cells;
+void minst_remove_item (void) {
+	if(minst_no_auto_cells)
+		remove(self);
+}
+
 void weapon_uzi (void) {
 	if(!self.ammo_nails)
 		self.ammo_nails = cvar("g_pickup_nails");
@@ -531,6 +537,8 @@
 	if (cvar("g_minstagib"))
 	{
 		minstagib_items(IT_CELLS);
+		self.think = minst_remove_item;
+		self.nextthink = time + cvar("sys_ticrate");
 		return;
 	}
 	if(!self.ammo_cells)
@@ -559,6 +567,8 @@
 	if (cvar("g_minstagib"))
 	{
 		minstagib_items(IT_CELLS);
+		self.think = minst_remove_item;
+		self.nextthink = time + cvar("sys_ticrate");
 		return;
 	}
 	if(!self.ammo_rockets)
@@ -676,6 +686,16 @@
 //void item_speed (void) {self.speed_finished = 30;StartItem ("models/items/g_speed.md3", "misc/powerup.wav", 120, "Speed Powerup", IT_SPEED, FL_POWERUP, generic_pickupevalfunc, 10000);}
 //void item_slowmo (void) {self.slowmo_finished = 30;StartItem ("models/items/g_slowmo.md3", "misc/powerup.wav", 120, "Slow Motion", IT_SLOWMO, FL_POWERUP, generic_pickupevalfunc, 10000);}
 
+void item_minst_cells (void) {
+	if (cvar("g_minstagib"))
+	{
+		minst_no_auto_cells = 1;
+		minstagib_items(IT_CELLS);
+	}
+	else
+		remove(self);
+}
+
 // compatibility:
 void item_quad (void) {self.classname = "item_strength";item_strength();}
 

Modified: trunk/data/entities.def
===================================================================
--- trunk/data/entities.def	2007-11-10 23:52:08 UTC (rev 2939)
+++ trunk/data/entities.def	2007-11-12 12:27:16 UTC (rev 2940)
@@ -371,6 +371,15 @@
 
 //===================================================================
 
+/*QUAKED item_minst_cells (.3 .3 1) (-16 -16 -16) (16 16 16)
+ammo get over it, shall i say no more
+-----------KEYS------------
+-----------SPAWNFLAGS-----------
+---------NOTES----------
+minstagib ammo (prevents auto-replacement of nex & rocket launcher when used)*/
+
+//===================================================================
+
 /*QUAKED item_bullets (.3 .3 1) (-16 -16 -16) (16 16 16)
 ammo get over it, shall i say no more
 -----------KEYS------------

Modified: trunk/data/qcsrc/server/t_items.qc
===================================================================
--- trunk/data/qcsrc/server/t_items.qc	2007-11-10 23:52:08 UTC (rev 2939)
+++ trunk/data/qcsrc/server/t_items.qc	2007-11-12 12:27:16 UTC (rev 2940)
@@ -482,6 +482,12 @@
 
 }
 
+float minst_no_auto_cells;
+void minst_remove_item (void) {
+	if(minst_no_auto_cells)
+		remove(self);
+}
+
 void weapon_uzi (void) {
 	if(!self.ammo_nails)
 		self.ammo_nails = cvar("g_pickup_nails");
@@ -531,6 +537,8 @@
 	if (cvar("g_minstagib"))
 	{
 		minstagib_items(IT_CELLS);
+		self.think = minst_remove_item;
+		self.nextthink = time + cvar("sys_ticrate");
 		return;
 	}
 	if(!self.ammo_cells)
@@ -559,6 +567,8 @@
 	if (cvar("g_minstagib"))
 	{
 		minstagib_items(IT_CELLS);
+		self.think = minst_remove_item;
+		self.nextthink = time + cvar("sys_ticrate");
 		return;
 	}
 	if(!self.ammo_rockets)
@@ -676,6 +686,16 @@
 //void item_speed (void) {self.speed_finished = 30;StartItem ("models/items/g_speed.md3", "misc/powerup.wav", 120, "Speed Powerup", IT_SPEED, FL_POWERUP, generic_pickupevalfunc, 10000);}
 //void item_slowmo (void) {self.slowmo_finished = 30;StartItem ("models/items/g_slowmo.md3", "misc/powerup.wav", 120, "Slow Motion", IT_SLOWMO, FL_POWERUP, generic_pickupevalfunc, 10000);}
 
+void item_minst_cells (void) {
+	if (cvar("g_minstagib"))
+	{
+		minst_no_auto_cells = 1;
+		minstagib_items(IT_CELLS);
+	}
+	else
+		remove(self);
+}
+
 // compatibility:
 void item_quad (void) {self.classname = "item_strength";item_strength();}