r4395 - in trunk/data: qcsrc/server scripts

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sun Sep 7 09:36:17 EDT 2008


Author: div0
Date: 2008-09-07 09:36:17 -0400 (Sun, 07 Sep 2008)
New Revision: 4395

Modified:
   trunk/data/qcsrc/server/defs.qh
   trunk/data/qcsrc/server/t_items.qc
   trunk/data/scripts/entities.def
Log:
rename trigger_items to target_items (Radiant sucks)


Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh	2008-09-07 13:32:01 UTC (rev 4394)
+++ trunk/data/qcsrc/server/defs.qh	2008-09-07 13:36:17 UTC (rev 4395)
@@ -18,7 +18,6 @@
 
 float g_dm, g_domination, g_ctf, g_tdm, g_keyhunt, g_onslaught, g_assault, g_arena, g_lms, g_runematch, g_race;
 float g_cloaked, g_footsteps, g_jump_grunt, g_grappling_hook, g_laserguided_missile, g_midair, g_minstagib, g_nixnex, g_nixnex_with_laser, g_norecoil, g_rocketarena, g_vampire, g_minstagib_invis_alpha;
-float g_warmup;
 float g_warmup_limit;
 float g_warmup_allguns;
 float g_warmup_allow_timeout;

Modified: trunk/data/qcsrc/server/t_items.qc
===================================================================
--- trunk/data/qcsrc/server/t_items.qc	2008-09-07 13:32:01 UTC (rev 4394)
+++ trunk/data/qcsrc/server/t_items.qc	2008-09-07 13:36:17 UTC (rev 4395)
@@ -884,7 +884,7 @@
 	self.use = func_wall_use;
 }
 
-float trigger_item_func_set(float a, float b)
+float target_item_func_set(float a, float b)
 {
 	if(b == 0)
 		return a;
@@ -894,7 +894,7 @@
 		return b;
 }
 
-float trigger_item_func_min(float a, float b)
+float target_item_func_min(float a, float b)
 {
 	if(b == 0)
 		return a;
@@ -904,43 +904,43 @@
 		return min(a, b);
 }
 
-float trigger_item_func_max(float a, float b)
+float target_item_func_max(float a, float b)
 {
 	return max(a, b);
 }
 
-float trigger_item_func_bitset(float a, float b)
+float target_item_func_bitset(float a, float b)
 {
 	return b;
 }
 
-float trigger_item_func_and(float a, float b)
+float target_item_func_and(float a, float b)
 {
 	return a & b;
 }
 
-float trigger_item_func_itembitset(float a, float b)
+float target_item_func_itembitset(float a, float b)
 {
 	return (b - (b & (IT_UNLIMITED_AMMO | IT_STRENGTH | IT_INVINCIBLE))) | a;
 }
 
-float trigger_item_func_itemand(float a, float b)
+float target_item_func_itemand(float a, float b)
 {
 	return (b - (b & (IT_UNLIMITED_AMMO | IT_STRENGTH | IT_INVINCIBLE))) | (a & b);
 }
 
-float trigger_item_func_or(float a, float b)
+float target_item_func_or(float a, float b)
 {
 	return a | b;
 }
 
-float trigger_item_func_andnot(float a, float b)
+float target_item_func_andnot(float a, float b)
 {
 	return a - (a & b);
 }
 
-float trigger_item_changed;
-void trigger_item_change(float binary, .float field, float(float a, float b) func, string sound_increase, string sound_decrease)
+float target_item_changed;
+void target_item_change(float binary, .float field, float(float a, float b) func, string sound_increase, string sound_decrease)
 {
 	float n, d;
 	n = func(activator.field, self.field);
@@ -962,18 +962,18 @@
 	{
 		if(sound_decrease != "")
 			sound (activator, CHAN_AUTO, sound_decrease, VOL_BASE, ATTN_NORM);
-		trigger_item_changed = 1;
+		target_item_changed = 1;
 	}
 	else if(d > 0)
 	{
 		if(sound_increase != "")
 			sound (activator, CHAN_AUTO, sound_increase, VOL_BASE, ATTN_NORM);
-		trigger_item_changed = 1;
+		target_item_changed = 1;
 	}
 	activator.field = n;
 }
 
-void trigger_items_use (void)
+void target_items_use (void)
 {
 	float h0, a0;
 	if(activator.classname != "player")
@@ -995,18 +995,18 @@
 
 	a0 = activator.armorvalue;
 	h0 = activator.health;
-	trigger_item_changed = 0;
+	target_item_changed = 0;
 
 	if(self.spawnflags == 0) // SET
 	{
-		trigger_item_change(0, ammo_shells, trigger_item_func_set, "misc/itempickup.wav", "");
-		trigger_item_change(0, ammo_nails, trigger_item_func_set, "misc/itempickup.wav", "");
-		trigger_item_change(0, ammo_rockets, trigger_item_func_set, "misc/itempickup.wav", "");
-		trigger_item_change(0, ammo_cells, trigger_item_func_set, "misc/itempickup.wav", "");
-		trigger_item_change(0, health, trigger_item_func_set, "misc/megahealth.wav", "");
-		trigger_item_change(0, armorvalue, trigger_item_func_set, "misc/armor25.wav", "");
-		trigger_item_change(1, items, trigger_item_func_bitset, "misc/powerup.wav", "");
-		trigger_item_change(1, weapons, trigger_item_func_itembitset, "weapons/weaponpickup.wav", "");
+		target_item_change(0, ammo_shells, target_item_func_set, "misc/itempickup.wav", "");
+		target_item_change(0, ammo_nails, target_item_func_set, "misc/itempickup.wav", "");
+		target_item_change(0, ammo_rockets, target_item_func_set, "misc/itempickup.wav", "");
+		target_item_change(0, ammo_cells, target_item_func_set, "misc/itempickup.wav", "");
+		target_item_change(0, health, target_item_func_set, "misc/megahealth.wav", "");
+		target_item_change(0, armorvalue, target_item_func_set, "misc/armor25.wav", "");
+		target_item_change(1, items, target_item_func_bitset, "misc/powerup.wav", "");
+		target_item_change(1, weapons, target_item_func_itembitset, "weapons/weaponpickup.wav", "");
 
 		if((self.items & activator.items) & IT_STRENGTH)
 			activator.strength_finished = time + self.strength_finished;
@@ -1015,14 +1015,14 @@
 	}
 	else if(self.spawnflags == 1) // AND/MIN
 	{
-		trigger_item_change(0, ammo_shells, trigger_item_func_min, "misc/itempickup.wav", "");
-		trigger_item_change(0, ammo_nails, trigger_item_func_min, "misc/itempickup.wav", "");
-		trigger_item_change(0, ammo_rockets, trigger_item_func_min, "misc/itempickup.wav", "");
-		trigger_item_change(0, ammo_cells, trigger_item_func_min, "misc/itempickup.wav", "");
-		trigger_item_change(0, health, trigger_item_func_min, "misc/megahealth.wav", "");
-		trigger_item_change(0, armorvalue, trigger_item_func_min, "misc/armor25.wav", "");
-		trigger_item_change(1, items, trigger_item_func_and, "misc/powerup.wav", "");
-		trigger_item_change(1, weapons, trigger_item_func_itemand, "weapons/weaponpickup.wav", "");
+		target_item_change(0, ammo_shells, target_item_func_min, "misc/itempickup.wav", "");
+		target_item_change(0, ammo_nails, target_item_func_min, "misc/itempickup.wav", "");
+		target_item_change(0, ammo_rockets, target_item_func_min, "misc/itempickup.wav", "");
+		target_item_change(0, ammo_cells, target_item_func_min, "misc/itempickup.wav", "");
+		target_item_change(0, health, target_item_func_min, "misc/megahealth.wav", "");
+		target_item_change(0, armorvalue, target_item_func_min, "misc/armor25.wav", "");
+		target_item_change(1, items, target_item_func_and, "misc/powerup.wav", "");
+		target_item_change(1, weapons, target_item_func_itemand, "weapons/weaponpickup.wav", "");
 
 		if((self.items & activator.items) & IT_STRENGTH)
 			activator.strength_finished = min(activator.strength_finished, time + self.strength_finished);
@@ -1031,14 +1031,14 @@
 	}
 	else if(self.spawnflags == 2) // OR/MAX
 	{
-		trigger_item_change(0, ammo_shells, trigger_item_func_max, "misc/itempickup.wav", "");
-		trigger_item_change(0, ammo_nails, trigger_item_func_max, "misc/itempickup.wav", "");
-		trigger_item_change(0, ammo_rockets, trigger_item_func_max, "misc/itempickup.wav", "");
-		trigger_item_change(0, ammo_cells, trigger_item_func_max, "misc/itempickup.wav", "");
-		trigger_item_change(0, health, trigger_item_func_max, "misc/megahealth.wav", "");
-		trigger_item_change(0, armorvalue, trigger_item_func_max, "misc/armor25.wav", "");
-		trigger_item_change(1, items, trigger_item_func_or, "misc/powerup.wav", "");
-		trigger_item_change(1, weapons, trigger_item_func_or, "weapons/weaponpickup.wav", "");
+		target_item_change(0, ammo_shells, target_item_func_max, "misc/itempickup.wav", "");
+		target_item_change(0, ammo_nails, target_item_func_max, "misc/itempickup.wav", "");
+		target_item_change(0, ammo_rockets, target_item_func_max, "misc/itempickup.wav", "");
+		target_item_change(0, ammo_cells, target_item_func_max, "misc/itempickup.wav", "");
+		target_item_change(0, health, target_item_func_max, "misc/megahealth.wav", "");
+		target_item_change(0, armorvalue, target_item_func_max, "misc/armor25.wav", "");
+		target_item_change(1, items, target_item_func_or, "misc/powerup.wav", "");
+		target_item_change(1, weapons, target_item_func_or, "weapons/weaponpickup.wav", "");
 
 		if((self.items & activator.items) & IT_STRENGTH)
 			activator.strength_finished = max(activator.strength_finished, time + self.strength_finished);
@@ -1047,14 +1047,14 @@
 	}
 	else if(self.spawnflags == 4) // ANDNOT/MIN
 	{
-		trigger_item_change(0, ammo_shells, trigger_item_func_min, "misc/itempickup.wav", "");
-		trigger_item_change(0, ammo_nails, trigger_item_func_min, "misc/itempickup.wav", "");
-		trigger_item_change(0, ammo_rockets, trigger_item_func_min, "misc/itempickup.wav", "");
-		trigger_item_change(0, ammo_cells, trigger_item_func_min, "misc/itempickup.wav", "");
-		trigger_item_change(0, health, trigger_item_func_min, "misc/megahealth.wav", "");
-		trigger_item_change(0, armorvalue, trigger_item_func_min, "misc/armor25.wav", "");
-		trigger_item_change(1, items, trigger_item_func_andnot, "misc/powerup.wav", "");
-		trigger_item_change(1, weapons, trigger_item_func_andnot, "weapons/weaponpickup.wav", "");
+		target_item_change(0, ammo_shells, target_item_func_min, "misc/itempickup.wav", "");
+		target_item_change(0, ammo_nails, target_item_func_min, "misc/itempickup.wav", "");
+		target_item_change(0, ammo_rockets, target_item_func_min, "misc/itempickup.wav", "");
+		target_item_change(0, ammo_cells, target_item_func_min, "misc/itempickup.wav", "");
+		target_item_change(0, health, target_item_func_min, "misc/megahealth.wav", "");
+		target_item_change(0, armorvalue, target_item_func_min, "misc/armor25.wav", "");
+		target_item_change(1, items, target_item_func_andnot, "misc/powerup.wav", "");
+		target_item_change(1, weapons, target_item_func_andnot, "weapons/weaponpickup.wav", "");
 
 		if((self.items & activator.items) & IT_STRENGTH)
 			activator.strength_finished = min(activator.strength_finished, time + self.strength_finished);
@@ -1080,29 +1080,15 @@
 	if(_switchweapon)
 		W_SwitchWeapon_Force(activator, w_getbestweapon(activator));
 
-	if(trigger_item_changed)
+	if(target_item_changed)
 		centerprint(activator, self.message);
 }
 
-void trigger_items_touch (void)
+void spawnfunc_target_items (void)
 {
-	activator = other;
-	trigger_items_use();
-}
-
-void spawnfunc_trigger_items (void)
-{
 	float n, i, j;
 	entity e;
-	IFTARGETED
-	{
-		self.use = trigger_items_use;
-	}
-	else
-	{
-		EXACTTRIGGER_INIT;
-		self.touch = trigger_items_touch;
-	}
+	self.use = target_items_use;
 	if(!self.strength_finished)
 		self.strength_finished = cvar("g_balance_powerup_strength_time");
 	if(!self.invincible_finished)

Modified: trunk/data/scripts/entities.def
===================================================================
--- trunk/data/scripts/entities.def	2008-09-07 13:32:01 UTC (rev 4394)
+++ trunk/data/scripts/entities.def	2008-09-07 13:36:17 UTC (rev 4395)
@@ -1020,7 +1020,7 @@
 model="models/weapons/g_porto.md3"
 */
 
-/*QUAKED trigger_items (0 0 1) ? AND OR ANDNOT
+/*QUAKED target_items (0 0 1) ? AND OR ANDNOT
 Sets the items of any player who triggers this.
 For the number fields, not specifying a value means not changing it. To clear armor, you need to explicitly set "armor" to "-1".
 -------- KEYS --------




More information about the nexuiz-commits mailing list