r2782 - in branches/nexuiz-2.0/data: . qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2007-07-06 17:03:31 -0400 (Fri, 06 Jul 2007)
New Revision: 2782

Modified:
   branches/nexuiz-2.0/data/default.cfg
   branches/nexuiz-2.0/data/qcsrc/server/cl_impulse.qc
   branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc
Log:
- sv_clmovement_waitforinput 4 now after many requests
- impulse 99 now teleports to personal waypoint too


Modified: branches/nexuiz-2.0/data/default.cfg
===================================================================
--- branches/nexuiz-2.0/data/default.cfg	2007-07-06 09:27:40 UTC (rev 2781)
+++ branches/nexuiz-2.0/data/default.cfg	2007-07-06 21:03:31 UTC (rev 2782)
@@ -471,6 +471,7 @@
 cl_sound_r_exp3 ""
 sv_sound_land ""
 sv_sound_watersplash ""
+sv_clmovement_waitforinput 4
 
 // disable joysticks
 set joystick 0

Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_impulse.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_impulse.qc	2007-07-06 09:27:40 UTC (rev 2781)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_impulse.qc	2007-07-06 21:03:31 UTC (rev 2782)
@@ -182,6 +182,14 @@
 			{
 				if(imp == 99)
 				{
+					if(self.waypointsprite_deployed_personal)
+					{
+						tracebox(self.waypointsprite_deployed_personal.origin, self.mins, self.maxs, self.waypointsprite_deployed_personal.origin, MOVE_WORLDONLY, self);
+						if(trace_startsolid)
+							sprint(self, "Cannot move there, cheater\n");
+						else
+							setorigin(self, self.waypointsprite_deployed_personal.origin);
+					}
 					self.items |= (IT_LASER | IT_UZI | IT_SHOTGUN | IT_GRENADE_LAUNCHER | IT_ELECTRO | IT_CRYLINK | IT_NEX | IT_HAGAR | IT_ROCKET_LAUNCHER);
 					self.ammo_shells = cvar("g_pickup_shells_max");
 					self.ammo_nails = cvar("g_pickup_nails_max");

Modified: branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc	2007-07-06 09:27:40 UTC (rev 2781)
+++ branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc	2007-07-06 21:03:31 UTC (rev 2782)
@@ -72,7 +72,7 @@
 	tracebox(e.origin, e.mins, e.maxs, e.origin, MOVE_WORLDONLY, e);
 	if(trace_startsolid)
 	{
-		dprint("could not get out of solid (", vtos(o), ")");
+		dprint("could not get out of solid (", vtos(o), ")\n");
 		return;
 	}
 }