Merge branch 'master' into mirceakitsune/universal_reload_system

Conflicts:
	qcsrc/common/constants.qh

diff --cc qcsrc/client/Main.qc
Simple merge

diff --cc qcsrc/client/View.qc
Simple merge

diff --cc qcsrc/common/constants.qh
index da8cfaac1890db4b7d57dd4f6f548e15ed185248,60633f57472b111687223018d3491f9488a28fbf..b8c4f44699cf61a95df7230d9b1c1a5602d820be
--- 1/qcsrc/common/constants.qh
--- 2/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@@ -307,12 -308,13 +307,14 @@@ const float STAT_FUEL = 44
  const float STAT_NB_METERSTART = 45;
  const float STAT_SHOTORG = 46; // compressShotOrigin
  const float STAT_LEADLIMIT = 47;
 -const float STAT_BULLETS_LOADED = 48;
 -const float STAT_NEX_CHARGE = 49;
 -const float STAT_LAST_PICKUP = 50;
 -const float STAT_HUD = 51;
 -const float STAT_NEX_CHARGEPOOL = 52;
 -const float STAT_HIT_TIME = 53;
 -const float STAT_TYPEHIT_TIME = 54;
 +const float STAT_WEAPON_CLIPLOAD = 48;
 +const float STAT_WEAPON_CLIPSIZE = 49;
 +const float STAT_NEX_CHARGE = 50;
 +const float STAT_LAST_PICKUP = 51;
 +const float STAT_HUD = 52;
 +const float STAT_NEX_CHARGEPOOL = 53;
++const float STAT_HIT_TIME = 54;
++const float STAT_TYPEHIT_TIME = 55;
  
  // see DP source, quakedef.h
  const float STAT_MOVEVARS_AIRSPEEDLIMIT_NONQW = 222;

diff --cc qcsrc/server/autocvars.qh
Simple merge

diff --cc qcsrc/server/cl_client.qc
Simple merge

diff --cc qcsrc/server/defs.qh
Simple merge

diff --cc qcsrc/server/g_world.qc
index ffbc58e32004f50933075a02aa9a2ea0cf9247ba,268743b41542393e8389fef479be07b8109eb18f..57d0071d2f063d78c0a5a9031f7b087ca795ac8f
--- 1/qcsrc/server/g_world.qc
--- 2/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@@ -823,9 -823,10 +823,11 @@@ void spawnfunc_worldspawn (void
        addstat(STAT_FUEL, AS_INT, ammo_fuel);
        addstat(STAT_SHOTORG, AS_INT, stat_shotorg);
        addstat(STAT_LEADLIMIT, AS_FLOAT, stat_leadlimit);
 -      addstat(STAT_BULLETS_LOADED, AS_INT, sniperrifle_bulletcounter);
 +      addstat(STAT_WEAPON_CLIPLOAD, AS_INT, clip_load);
 +      addstat(STAT_WEAPON_CLIPSIZE, AS_INT, clip_size);
        addstat(STAT_LAST_PICKUP, AS_FLOAT, last_pickup);
+       addstat(STAT_HIT_TIME, AS_FLOAT, hit_time);
+       addstat(STAT_TYPEHIT_TIME, AS_FLOAT, typehit_time);
  
        addstat(STAT_NEX_CHARGE, AS_FLOAT, nex_charge);
        addstat(STAT_NEX_CHARGEPOOL, AS_FLOAT, nex_chargepool_ammo);