Properly support team field on trigger_multiple

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

diff --git a/qcsrc/server/constants.qh b/qcsrc/server/constants.qh
index a3c957d7faeb6f3c582d1e9d78186833b9e600bd..86ed86da1d9e7b73f77e2baa77a9f69a87265b40 100644 (file)
--- a/qcsrc/server/constants.qh
+++ b/qcsrc/server/constants.qh
@@ -1,74 +1,21 @@
-#ifndef SERVER_CONSTANTS_H
-#define SERVER_CONSTANTS_H
+#pragma once
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/urllib.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/net_notice.qh"
-    #include "../common/animdecide.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "../common/monsters/sv_monsters.qh"
-    #include "../common/monsters/spawn.qh"
-    #include "../common/weapons/config.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "weapons/accuracy.qh"
-    #include "weapons/common.qh"
-    #include "weapons/csqcprojectile.qh"
-    #include "weapons/hitplot.qh"
-    #include "weapons/selection.qh"
-    #include "weapons/spawning.qh"
-    #include "weapons/throwing.qh"
-    #include "weapons/tracing.qh"
-    #include "weapons/weaponstats.qh"
-    #include "weapons/weaponsystem.qh"
-    #include "t_items.qh"
-    #include "autocvars.qh"
-#endif
+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 float FL_WEAPON = 8192;
-const float FL_POWERUP = 16384;
-const float FL_PROJECTILE = 32768;
-const float FL_TOSSED = 65536;
-const float FL_NO_WEAPON_STAY = 131072;
-const float FL_SPAWNING = 262144;
+const int SVC_SETVIEW = 5;
 
-const float SVC_SOUND = 6;
-const float SVC_STOPSOUND = 16;
-const float SVC_SETVIEW = 5;
-
-const float RESPAWN_FORCE = 1;
-const float RESPAWN_SILENT = 2;
+const int RESPAWN_FORCE = 1;
+const int RESPAWN_SILENT = 2;
+const int RESPAWN_DENY = 4;
 
 #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 float MSG_ENTITY = 5; // csqc
-
-const float NUM_PLAYERSKINS_TEAMPLAY = 3;
-
-const float ASSAULT_VALUE_INACTIVE = 1000;
+const int NUM_PLAYERSKINS_TEAMPLAY = 3;
 
-const float DOOR_NOSPLASH = 256; // generic anti-splashdamage spawnflag
-#endif
\ No newline at end of file
+const int ASSAULT_VALUE_INACTIVE = 1000;