Merge branch 'master' into Mario/race_target_waypoint

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / weapons / hitplot.qc

diff --git a/qcsrc/server/weapons/hitplot.qc b/qcsrc/server/weapons/hitplot.qc
index d148ab54f4597de3da7193d05c8104bd09a7fc80..2a0fad7dee0c832e086d8feb2ff85ea347d7f3d3 100644 (file)
--- a/qcsrc/server/weapons/hitplot.qc
+++ b/qcsrc/server/weapons/hitplot.qc
@@ -67,7 +67,7 @@ void W_HitPlotAnalysis(entity player, .entity weaponentity, vector screenforward
                        lag = 0; // only antilag for clients
 
                org = player.origin + player.view_ofs;
-               traceline_antilag_force(player, org, org + screenforward * MAX_SHOT_DISTANCE, MOVE_NORMAL, player, lag);
+               traceline_antilag_force(player, org, org + screenforward * max_shot_distance, MOVE_NORMAL, player, lag);
                if(IS_CLIENT(trace_ent) || IS_MONSTER(trace_ent))
                {
                    entity store = IS_CLIENT(trace_ent) ? CS(trace_ent) : trace_ent;
@@ -85,7 +85,7 @@ void W_HitPlotOpen(entity player)
        if(autocvar_g_hitplots || strhasword(autocvar_g_hitplots_individuals, player.netaddress))
        {
                player.hitplotfh = fopen(strcat("hits-", matchid, "-", player.netaddress, "-", ftos(player.playerid), ".plot"), FILE_WRITE);
-               fputs(player.hitplotfh, strcat("#name ", player.netname, "\n"));
+               fputs(player.hitplotfh, strcat("#name ", playername(player, false), "\n"));
        }
        else { player.hitplotfh = -1; }
 }