From: z411 <z411@omaera.org>
Date: Thu, 3 Feb 2022 16:40:54 +0000 (-0300)
Subject: Merge branch 'master' into z411/bai-server
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c2c3bcc0e056dced6c0bedbe213b5ca80809de73;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into z411/bai-server
---

c2c3bcc0e056dced6c0bedbe213b5ca80809de73
diff --cc qcsrc/common/constants.qh
index 43236b2b8,feaa9f865..de93c94c3
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@@ -7,15 -7,15 +7,16 @@@ const int FRAGS_PLAYER_OUT_OF_GAME = -6
  ///////////////////////////
  // cvar constants
  
- const int CVAR_SAVE = 1;
- const int CVAR_NOTIFY = 2;
- const int CVAR_READONLY = 4;
+ const int CVAR_SAVE = BIT(0);
+ const int CVAR_NOTIFY = BIT(1);
+ const int CVAR_READONLY = BIT(2);
  
  // server flags
- const int SERVERFLAG_ALLOW_FULLBRIGHT = 1;
- const int SERVERFLAG_TEAMPLAY = 2;
- const int SERVERFLAG_PLAYERSTATS = 4;
- const int SERVERFLAG_FORBID_PICKUPTIMER = 8;
+ const int SERVERFLAG_ALLOW_FULLBRIGHT = BIT(0);
+ const int SERVERFLAG_TEAMPLAY = BIT(1);
+ const int SERVERFLAG_PLAYERSTATS = BIT(2);
+ const int SERVERFLAG_PLAYERSTATS_CUSTOM = BIT(3);
++const int SERVERFLAG_FORBID_PICKUPTIMER = BIT(4);
  
  const int SPECIES_HUMAN = 0;
  const int SPECIES_ROBOT_SOLID = 1;