[nexuiz-commits] r8731 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2010-02-28 14:46:36 -0500 (Sun, 28 Feb 2010)
New Revision: 8731

Modified:
   trunk/data/qcsrc/server/cl_impulse.qc
   trunk/data/qcsrc/server/cl_player.qc
   trunk/data/qcsrc/server/miscfunctions.qc
Log:
use the correct crosshair trace where needed

Modified: trunk/data/qcsrc/server/cl_impulse.qc
===================================================================
--- trunk/data/qcsrc/server/cl_impulse.qc	2010-02-28 19:46:31 UTC (rev 8730)
+++ trunk/data/qcsrc/server/cl_impulse.qc	2010-02-28 19:46:36 UTC (rev 8731)
@@ -140,7 +140,7 @@
 				sprint(self, "personal waypoint spawned at location\n");
 				break;
 			case 31:
-				crosshair_trace(self);
+				WarpZone_crosshair_trace(self);
 				wp = WaypointSprite_DeployPersonal("waypoint", trace_endpos);
 				if(wp)
 				{
@@ -184,7 +184,7 @@
 				sprint(self, "HERE spawned at location\n");
 				break;
 			case 35:
-				crosshair_trace(self);
+				WarpZone_crosshair_trace(self);
 				wp = WaypointSprite_DeployFixed("here", FALSE, trace_endpos);
 				if(wp)
 				{
@@ -215,7 +215,7 @@
 				sprint(self, "DANGER spawned at location\n");
 				break;
 			case 38:
-				crosshair_trace(self);
+				WarpZone_crosshair_trace(self);
 				wp = WaypointSprite_DeployFixed("danger", FALSE, trace_endpos);
 				if(wp)
 				{

Modified: trunk/data/qcsrc/server/cl_player.qc
===================================================================
--- trunk/data/qcsrc/server/cl_player.qc	2010-02-28 19:46:31 UTC (rev 8730)
+++ trunk/data/qcsrc/server/cl_player.qc	2010-02-28 19:46:36 UTC (rev 8731)
@@ -811,7 +811,7 @@
 	makevectors(self.v_angle); // sets v_forward
 
 	// 1. cursor trace is always right
-	crosshair_trace(self);
+	WarpZone_crosshair_trace(self);
 	if(trace_ent && trace_ent.classname == "player" && !trace_ent.deadflag)
 	{
 		selected = trace_ent;

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2010-02-28 19:46:31 UTC (rev 8730)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2010-02-28 19:46:36 UTC (rev 8731)
@@ -8,6 +8,12 @@
 {
 	traceline_antilag(pl, pl.cursor_trace_start, pl.cursor_trace_start + normalize(pl.cursor_trace_endpos - pl.cursor_trace_start) * MAX_SHOT_DISTANCE, MOVE_NORMAL, pl, ANTILAG_LATENCY(pl));
 }
+void WarpZone_traceline_antilag (entity source, vector v1, vector v2, float nomonst, entity forent, float lag);
+void WarpZone_crosshair_trace(entity pl)
+{
+	makevectors(pl.v_angle);
+	WarpZone_traceline_antilag(pl, pl.origin + pl.view_ofs, pl.origin + pl.view_ofs + v_forward * MAX_SHOT_DISTANCE, MOVE_NORMAL, pl, ANTILAG_LATENCY(pl));
+}
 
 void() spawnfunc_info_player_deathmatch; // needed for the other spawnpoints
 void() spawnpoint_use;
@@ -401,7 +407,7 @@
 	p = 0;
 	n = 7;
 
-	crosshair_trace(self);
+	WarpZone_crosshair_trace(self);
 	cursor = trace_endpos;
 	cursor_ent = trace_ent;