Merge branch 'master' into LegendaryGuard/armorizing_and_dark_nades

diff --combined qcsrc/common/stats.qh
index 5152a616ffa773a1210d46279c9a2a17eca8b999,463d98c850157f9c595dd4e57759ce75fb57c60c..ad490605be903ccececa698d129ee794b41a46f3
--- 1/qcsrc/common/stats.qh
--- 2/qcsrc/common/stats.qh
+++ b/qcsrc/common/stats.qh
@@@ -4,6 -4,7 +4,7 @@@
  
  #ifdef SVQC
  #include <server/client.qh>
+ #include <server/compat/quake3.qh>
  #include <server/main.qh>
  #include <common/gamemodes/sv_rules.qh>
  #include <common/mapobjects/teleporters.qh>
@@@ -66,14 -67,17 +67,17 @@@ REGISTER_STAT(PL_CROUCH_MIN, vector
  REGISTER_STAT(PL_MAX, vector)
  REGISTER_STAT(PL_CROUCH_MAX, vector)
  
- REGISTER_STAT(KH_KEYS, int)
+ // networked bitflag for game objective display (modicons)
+ REGISTER_STAT(OBJECTIVE_STATUS, int)
+ #ifdef SVQC
+ SPECTATE_COPYFIELD(_STAT(OBJECTIVE_STATUS))
+ #endif
  
  #ifdef SVQC
  float W_WeaponRateFactor(entity this);
  float game_stopped;
  float game_starttime; //point in time when the countdown to game start is over
  float round_starttime; //point in time when the countdown to round start is over
- bool autocvar_g_allow_oldvortexbeam;
  int autocvar_leadlimit;
  // TODO: world.qh can't be included here due to circular includes!
  #define autocvar_fraglimit cvar("fraglimit")
@@@ -84,12 -88,8 +88,8 @@@
  REGISTER_STAT(WEAPONRATEFACTOR, float, W_WeaponRateFactor(this))
  REGISTER_STAT(GAME_STOPPED, int, game_stopped)
  REGISTER_STAT(GAMESTARTTIME, float, game_starttime)
- REGISTER_STAT(STRENGTH_FINISHED, float)
- REGISTER_STAT(INVINCIBLE_FINISHED, float)
  /** arc heat in [0,1] */
  REGISTER_STAT(PRESSED_KEYS, int)
- /** this stat could later contain some other bits of info, like, more server-side particle config */
- REGISTER_STAT(ALLOW_OLDVORTEXBEAM, bool, autocvar_g_allow_oldvortexbeam)
  REGISTER_STAT(FUEL, int)
  REGISTER_STAT(NB_METERSTART, float)
  /** compressShotOrigin */
@@@ -102,7 -102,6 +102,6 @@@ REGISTER_STAT(HUD, int
  REGISTER_STAT(HIT_TIME, float)
  REGISTER_STAT(DAMAGE_DEALT_TOTAL, int)
  REGISTER_STAT(TYPEHIT_TIME, float)
- REGISTER_STAT(SUPERWEAPONS_FINISHED, float)
  REGISTER_STAT(AIR_FINISHED, float)
  REGISTER_STAT(VEHICLESTAT_HEALTH, int)
  REGISTER_STAT(VEHICLESTAT_SHIELD, int)
@@@ -119,7 -118,6 +118,6 @@@ REGISTER_STAT(RESPAWN_TIME, float
  REGISTER_STAT(ROUNDSTARTTIME, float, round_starttime)
  REGISTER_STAT(MONSTERS_TOTAL, int)
  REGISTER_STAT(MONSTERS_KILLED, int)
- REGISTER_STAT(BUFFS, int)
  REGISTER_STAT(NADE_BONUS, float)
  REGISTER_STAT(NADE_BONUS_TYPE, int)
  REGISTER_STAT(NADE_BONUS_SCORE, float)
@@@ -129,8 -127,6 +127,6 @@@ REGISTER_STAT(PLASMA, int
  REGISTER_STAT(FROZEN, int)
  REGISTER_STAT(REVIVE_PROGRESS, float)
  REGISTER_STAT(ROUNDLOST, int)
- REGISTER_STAT(BUFF_TIME, float)
- REGISTER_STAT(CTF_FLAGSTATUS, int)
  REGISTER_STAT(CAPTURE_PROGRESS, float)
  REGISTER_STAT(ENTRAP_ORB, float)
  REGISTER_STAT(ENTRAP_ORB_ALPHA, float)
@@@ -138,10 -134,6 +134,10 @@@ REGISTER_STAT(ITEMSTIME, int, autocvar_
  REGISTER_STAT(KILL_TIME, float)
  REGISTER_STAT(VEIL_ORB, float)
  REGISTER_STAT(VEIL_ORB_ALPHA, float)
 +REGISTER_STAT(AMMUNITIONING_ORB, float) //LegendGuard registers new STAT 11-02-2021
 +REGISTER_STAT(AMMUNITIONING_ORB_ALPHA, float)
 +REGISTER_STAT(DARK_ORB, float) //LegendGuard registers new STAT 08-02-2021
 +REGISTER_STAT(DARK_ORB_ALPHA, float)
  
  #ifdef SVQC
  float autocvar_sv_showfps = 0;
@@@ -188,6 -180,7 +184,7 @@@ float g_bugrigs_speed_ref
  float g_bugrigs_speed_pow;
  float g_bugrigs_steer;
  #endif
+ #if 0
  REGISTER_STAT(BUGRIGS, int, g_bugrigs)
  REGISTER_STAT(BUGRIGS_ACCEL, float, g_bugrigs_accel)
  REGISTER_STAT(BUGRIGS_AIR_STEERING, int, g_bugrigs_air_steering)
@@@ -203,6 -196,7 +200,7 @@@ REGISTER_STAT(BUGRIGS_REVERSE_STOPPING
  REGISTER_STAT(BUGRIGS_SPEED_POW, float, g_bugrigs_speed_pow)
  REGISTER_STAT(BUGRIGS_SPEED_REF, float, g_bugrigs_speed_ref)
  REGISTER_STAT(BUGRIGS_STEER, float, g_bugrigs_steer)
+ #endif
  
  #ifdef SVQC
  int autocvar_sv_gameplayfix_downtracesupportsongroundflag = 1;
@@@ -359,10 -353,7 +357,7 @@@ bool autocvar_sv_slick_applygravity
  #endif
  REGISTER_STAT(SLICK_APPLYGRAVITY, bool, autocvar_sv_slick_applygravity)
  
- #ifdef SVQC
- bool autocvar_sv_q3defragcompat;
- #endif
- REGISTER_STAT(Q3DEFRAGCOMPAT, bool, autocvar_sv_q3defragcompat)
+ REGISTER_STAT(Q3COMPAT, int, q3compat)
  
  #ifdef SVQC
  #include "physics/movetypes/movetypes.qh"
@@@ -428,7 -419,6 +423,6 @@@ REGISTER_STAT(MOVEVARS_MAXAIRSPEED, flo
  REGISTER_STAT(MOVEVARS_STEPHEIGHT, float, autocvar_sv_stepheight)
  REGISTER_STAT(MOVEVARS_AIRACCEL_QW, float)
  REGISTER_STAT(MOVEVARS_AIRACCEL_SIDEWAYS_FRICTION, float)
- REGISTER_STAT(MOVEVARS_SPECIALCOMMAND, bool)
  #ifdef SVQC
  int autocvar_sv_wallclip;
  #endif