Merge branch 'master' into Mario/stats_eloranking

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / constants.qh

diff --git a/qcsrc/server/constants.qh b/qcsrc/server/constants.qh
index c1def6b821e469d43d1183f371ff1039e0009d53..62a15f680c1cb8117c68385a5f6e4119a50c16d3 100644 (file)
--- a/qcsrc/server/constants.qh
+++ b/qcsrc/server/constants.qh
@@ -1,26 +1,19 @@
-#ifndef SERVER_CONSTANTS_H
-#define SERVER_CONSTANTS_H
+#pragma once
 
-const int FL_WEAPON = 8192;
-const int FL_POWERUP = 16384;
-const int FL_PROJECTILE = 32768;
-const int FL_TOSSED = 65536;
-const int FL_NO_WEAPON_STAY = 131072;
-const int FL_SPAWNING = 262144;
+const int FL_WEAPON = BIT(13);
+const int FL_POWERUP = BIT(14);
+const int FL_PROJECTILE = BIT(15);
+const int FL_TOSSED = BIT(16);
+const int FL_NO_WEAPON_STAY = BIT(17);
+const int FL_SPAWNING = BIT(18);
+const int FL_PICKUPITEMS = BIT(19);
 
-const int SVC_SOUND = 6;
-const int SVC_STOPSOUND = 16;
 const int SVC_SETVIEW = 5;
 
-const int RESPAWN_FORCE = 1;
-const int RESPAWN_SILENT = 2;
+const int RESPAWN_FORCE = BIT(0);
+const int RESPAWN_SILENT = BIT(1);
+const int RESPAWN_DENY = BIT(2);
 
 #define EFMASK_CHEAP (EF_ADDITIVE | EF_DOUBLESIDED | EF_FULLBRIGHT | EF_NODEPTHTEST | EF_NODRAW | EF_NOGUNBOB | EF_NOSHADOW | EF_LOWPRECISION | EF_SELECTABLE | EF_TELEPORT_BIT)
 
-const int MSG_ENTITY = 5; // csqc
-
 const int NUM_PLAYERSKINS_TEAMPLAY = 3;
-
-const int ASSAULT_VALUE_INACTIVE = 1000;
-
-#endif