rename cl_predictionerrorcompensation -> cl_movement_errorcompensation

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index b6642452010bfbfe513027d966206d399ddcefb5..d003f80f3229b337b90b5f9eefe19936e879d726 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1776,7 +1776,7 @@ seta cl_forceplayercolors 0 "make everyone look like your own color (requires se
 seta cl_forcemyplayermodel "" "set to the model file name you want to show yourself as (requires server to have sv_use_csqc_players 1; does not affect how enemies look with cl_forceplayermodels)"
 seta cl_forcemyplayerskin 0 "set to the skin number you want to show yourself as (requires server to have sv_use_csqc_players 1; does not affect how enemies look with cl_forceplayermodels)"
 seta cl_forcemyplayercolors 0 "set to the color value (encoding is same as _cl_color) for your own player model (requires server to have sv_use_csqc_players 1, and is ignored in teamplay; does not affect how enemies look with cl_forceplayermodels)"
-seta cl_predictionerrorcompensation 0 "try to compensate for prediction errors and reduce preceived lag (requires server to have sv_use_csqc_players 1)"
+seta cl_movement_errorcompensation 0 "try to compensate for prediction errors and reduce preceived lag (requires server to have sv_use_csqc_players 1)"
 
 // debug cvars for keyhunt attaching
 set _angles "0 0 0"

diff --git a/qcsrc/client/Defs.qc b/qcsrc/client/Defs.qc
index e4519b2b3d93fef8061208aaf78ec95c1d2b1773..2a1c9e67c7970f44d8418607809b5299306c6f31 100644 (file)
--- a/qcsrc/client/Defs.qc
+++ b/qcsrc/client/Defs.qc
@@ -272,4 +272,6 @@ float serverflags;
 
 float uid2name_dialog;
 
-.float csqcmodel_isdead; // used by shownames and miscfunctions (float getplayerisdead(float) {}) to know when a player is dead
\ No newline at end of file
+.float csqcmodel_isdead; // used by shownames and miscfunctions (float getplayerisdead(float) {}) to know when a player is dead
+
+#define player_currententnum (spectatee_status > 0 ? spectatee_status : player_localnum + 1)

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 1d0ad220022b8f1cf33cbb6282d01863cd303c59..02558c7ea5977809d47e7e078d09743d63cfc7e5 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -2781,6 +2781,7 @@ void HUD_Score(void)
        string sign;
        vector distribution_color;
        entity tm, pl, me;
+
 #ifdef COMPAT_XON050_ENGINE
        me = (spectatee_status > 0) ? playerslots[spectatee_status - 1] : playerslots[player_localentnum - 1];
 #else

diff --git a/qcsrc/csqcmodellib/cl_player.qc b/qcsrc/csqcmodellib/cl_player.qc
index 40ba3f7a9f73c4d0a283dc6578b54a396211f00e..404a29a474d78ccd3fee0d2ccd295f8fa5cdba9a 100644 (file)
--- a/qcsrc/csqcmodellib/cl_player.qc
+++ b/qcsrc/csqcmodellib/cl_player.qc
@@ -20,7 +20,7 @@
  * IN THE SOFTWARE.
  */
 
-var float autocvar_cl_predictionerrorcompensation = 0;
+var float autocvar_cl_movement_errorcompensation = 0;
 
 // engine stuff
 .float pmove_flags;
@@ -56,7 +56,7 @@ vector CSQCPlayer_GetPredictionErrorV()
 
 void CSQCPlayer_SetPredictionError(vector o, vector v)
 {
-       if(!autocvar_cl_predictionerrorcompensation)
+       if(!autocvar_cl_movement_errorcompensation)
        {
                csqcplayer_predictionerrorfactor = 0;
                return;
@@ -70,7 +70,7 @@ void CSQCPlayer_SetPredictionError(vector o, vector v)
 
        csqcplayer_predictionerroro = CSQCPlayer_GetPredictionErrorO() + o;
        csqcplayer_predictionerrorv = CSQCPlayer_GetPredictionErrorV() + v;
-       csqcplayer_predictionerrorfactor = autocvar_cl_predictionerrorcompensation / ticrate;
+       csqcplayer_predictionerrorfactor = autocvar_cl_movement_errorcompensation / ticrate;
        csqcplayer_predictionerrortime = time + 1.0 / csqcplayer_predictionerrorfactor;
 }