r2155 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: lordhavoc
Date: 2007-02-03 07:49:52 -0500 (Sat, 03 Feb 2007)
New Revision: 2155

Modified:
   trunk/data/qcsrc/server/builtins.qh
   trunk/data/qcsrc/server/ctf.qc
   trunk/data/qcsrc/server/domination.qc
   trunk/data/qcsrc/server/miscfunctions.qc
   trunk/data/qcsrc/server/runematch.qc
   trunk/data/qcsrc/server/t_items.qc
Log:
fix droptofloor parameters
fix a lingering org reference that should have been self.origin


Modified: trunk/data/qcsrc/server/builtins.qh
===================================================================
--- trunk/data/qcsrc/server/builtins.qh	2007-02-03 12:47:37 UTC (rev 2154)
+++ trunk/data/qcsrc/server/builtins.qh	2007-02-03 12:49:52 UTC (rev 2155)
@@ -32,7 +32,7 @@
 void	eprint (entity e)								= #31;
 float	walkmove (float yaw, float dist)						= #32;
 
-float	droptofloor (float yaw, float dist)						= #34;
+float	droptofloor ()						= #34;
 void	lightstyle (float style, string value)						= #35;
 float	rint (float v)									= #36;
 float	floor (float v)									= #37;

Modified: trunk/data/qcsrc/server/ctf.qc
===================================================================
--- trunk/data/qcsrc/server/ctf.qc	2007-02-03 12:47:37 UTC (rev 2154)
+++ trunk/data/qcsrc/server/ctf.qc	2007-02-03 12:49:52 UTC (rev 2155)
@@ -20,7 +20,7 @@
 	if(!self.t_length)
 		self.t_length = 119; // maximum frame
 
-	setattachment(self, world, "");	
+	setattachment(self, world, "");
 	self.mdl = self.model;
 	self.flags = FL_ITEM;
 	self.solid = SOLID_TRIGGER;
@@ -33,7 +33,7 @@
 	self.cnt = FLAG_BASE;
 	self.mangle = self.angles;
 	//self.effects = self.effects | EF_DIMLIGHT;
-	if (!droptofloor(0, 0))
+	if (!droptofloor())
 	{
 		dprint("Flag fell out of level at ", vtos(self.origin), "\n");
 		remove(self);
@@ -56,7 +56,7 @@
 
 void(entity e) RegenFlag =
 {
-	setattachment(e, world, "");	
+	setattachment(e, world, "");
 	e.movetype = MOVETYPE_TOSS;
 	e.solid = SOLID_TRIGGER;
 	// TODO: play a sound here

Modified: trunk/data/qcsrc/server/domination.qc
===================================================================
--- trunk/data/qcsrc/server/domination.qc	2007-02-03 12:47:37 UTC (rev 2154)
+++ trunk/data/qcsrc/server/domination.qc	2007-02-03 12:49:52 UTC (rev 2155)
@@ -135,7 +135,7 @@
 	}
 
 	// if the player left the game, changed teams or became spectator, we have to find another player on the same team to give credit to
-	if (!self.enemy.flags || self.enemy.team != self.goalentity.team || self.enemy.killcount == -666) // flags is zero on removed clients		
+	if (!self.enemy.flags || self.enemy.team != self.goalentity.team || self.enemy.killcount == -666) // flags is zero on removed clients
 	{
 		other = self.enemy;
 		head = find(head, classname, "player");
@@ -288,7 +288,7 @@
 	self.flags = FL_ITEM;
 	setsize(self, '-32 -32 -32', '32 32 32');
 	setorigin(self, self.origin + '0 0 20');
-	droptofloor(0, 0);
+	droptofloor();
 };
 
 

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2007-02-03 12:47:37 UTC (rev 2154)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2007-02-03 12:49:52 UTC (rev 2155)
@@ -91,7 +91,7 @@
 	// nudge off the floor
 	setorigin(self, self.origin + '0 0 1');
 
-	tracebox(self.origin, PL_MIN, PL_MAXS, self.origin, TRUE, self);
+	tracebox(self.origin, PL_MIN, PL_MAX, self.origin, TRUE, self);
 	if (trace_startsolid)
 	{
 		objerror("player spawn point in solid, mapper sucks!\n");

Modified: trunk/data/qcsrc/server/runematch.qc
===================================================================
--- trunk/data/qcsrc/server/runematch.qc	2007-02-03 12:47:37 UTC (rev 2154)
+++ trunk/data/qcsrc/server/runematch.qc	2007-02-03 12:49:52 UTC (rev 2155)
@@ -39,7 +39,7 @@
 		return;
 	}
 
-	droptofloor(self);
+	droptofloor();
 	setorigin(self, self.origin + '0 0 35');
 }
 

Modified: trunk/data/qcsrc/server/t_items.qc
===================================================================
--- trunk/data/qcsrc/server/t_items.qc	2007-02-03 12:47:37 UTC (rev 2154)
+++ trunk/data/qcsrc/server/t_items.qc	2007-02-03 12:49:52 UTC (rev 2155)
@@ -236,13 +236,13 @@
 			// first nudge it off the floor a little bit to avoid math errors
 			setorigin(self, self.origin + '0 0 1');
 			// note droptofloor returns FALSE if stuck/or would fall too far
-			droptofloor(self);
+			droptofloor();
 		}
 
 		if(cvar("spawn_debug") >= 2)
 		{
 			entity otheritem;
-			for(otheritem = findradius(org, 3); otheritem; otheritem = otheritem.chain)
+			for(otheritem = findradius(self.origin, 3); otheritem; otheritem = otheritem.chain)
 			{
 				if(otheritem.is_item)
 				{