From ab90d1125a09a2a6488351310d53a3f963a7ae49 Mon Sep 17 00:00:00 2001 From: div0 Date: Sun, 28 Feb 2010 19:46:36 +0000 Subject: [PATCH] use the correct crosshair trace where needed git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8731 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/cl_impulse.qc | 6 +++--- data/qcsrc/server/cl_player.qc | 2 +- data/qcsrc/server/miscfunctions.qc | 8 +++++++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/data/qcsrc/server/cl_impulse.qc b/data/qcsrc/server/cl_impulse.qc index 1c191b924..bce1f51cd 100644 --- a/data/qcsrc/server/cl_impulse.qc +++ b/data/qcsrc/server/cl_impulse.qc @@ -140,7 +140,7 @@ void ImpulseCommands (void) 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 @@ void ImpulseCommands (void) 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 @@ void ImpulseCommands (void) 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) { diff --git a/data/qcsrc/server/cl_player.qc b/data/qcsrc/server/cl_player.qc index bfeb75ca8..58f497990 100644 --- a/data/qcsrc/server/cl_player.qc +++ b/data/qcsrc/server/cl_player.qc @@ -811,7 +811,7 @@ void UpdateSelectedPlayer() 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; diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc index 266849cae..dccb03f24 100644 --- a/data/qcsrc/server/miscfunctions.qc +++ b/data/qcsrc/server/miscfunctions.qc @@ -8,6 +8,12 @@ void crosshair_trace(entity pl) { 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 @@ string formatmessage(string msg) p = 0; n = 7; - crosshair_trace(self); + WarpZone_crosshair_trace(self); cursor = trace_endpos; cursor_ent = trace_ent; -- 2.39.2