Merge branch 'martin-t/limit'

diff --combined qcsrc/common/stats.qh
index 14eafaf255ac95ef7781d7a8fef834bf9c40a24a,245d92604e47c454d41da080e6f4daf996f0bf8e..c5e45e866a9a00df69697a5efe3f58ee86b80151
--- 1/qcsrc/common/stats.qh
--- 2/qcsrc/common/stats.qh
+++ b/qcsrc/common/stats.qh
@@@ -85,6 -85,7 +85,7 @@@ REGISTER_STAT(NB_METERSTART, float
  /** compressShotOrigin */
  REGISTER_STAT(SHOTORG, int)
  REGISTER_STAT(LEADLIMIT, float, autocvar_leadlimit)
+ REGISTER_STAT(LEADLIMIT_AND_FRAGLIMIT, float, autocvar_leadlimit_and_fraglimit)
  
  REGISTER_STAT(LAST_PICKUP, float)
  REGISTER_STAT(HUD, int)
@@@ -144,13 -145,11 +145,13 @@@ float autocvar_g_multijump_add
  float autocvar_g_multijump_speed;
  float autocvar_g_multijump_maxspeed;
  float autocvar_g_multijump_dodging = 1;
 +bool autocvar_g_multijump_client = true;
  #endif
  REGISTER_STAT(MULTIJUMP_DODGING, int, autocvar_g_multijump_dodging)
  REGISTER_STAT(MULTIJUMP_MAXSPEED, float, autocvar_g_multijump_maxspeed)
  REGISTER_STAT(MULTIJUMP_ADD, int, autocvar_g_multijump_add)
  REGISTER_STAT(MULTIJUMP_SPEED, float, autocvar_g_multijump_speed)
 +REGISTER_STAT(MULTIJUMP_CLIENT, bool, autocvar_g_multijump_client)
  .int multijump_count;
  REGISTER_STAT(MULTIJUMP_COUNT, int, this.multijump_count)
  REGISTER_STAT(MULTIJUMP, int, autocvar_g_multijump)
@@@ -245,7 -244,6 +246,7 @@@ bool autocvar_sv_dodging_wall_dodging
  bool autocvar_sv_dodging_air_dodging;
  float autocvar_sv_dodging_maxspeed;
  float autocvar_sv_dodging_air_maxspeed;
 +bool autocvar_sv_dodging_clientselect;
  #endif
  
  #if 0
@@@ -265,7 -263,6 +266,7 @@@ REGISTER_STAT(DODGING_WALL, bool, autoc
  REGISTER_STAT(DODGING_AIR, bool, autocvar_sv_dodging_air_dodging)
  REGISTER_STAT(DODGING_MAXSPEED, float, autocvar_sv_dodging_maxspeed)
  REGISTER_STAT(DODGING_AIR_MAXSPEED, float, autocvar_sv_dodging_air_maxspeed)
 +REGISTER_STAT(DODGING_CLIENTSELECT, bool, autocvar_sv_dodging_clientselect)
  #endif
  /** cvar loopback */
  REGISTER_STAT(DODGING_FROZEN, int, autocvar_sv_dodging_frozen)