Fix a bug in CA where if the round starts with one player in each team and one player...

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

diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh
index 3140e16529e96a22539bb45258ccdb0e360dace1..de0edbb31f3a6eba94c9bc38381a8f753388c668 100644 (file)
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@ -444,19 +444,19 @@ float CH_PAIN = 6; // only on players and csqc
 float CH_PAIN_SINGLE = 6; // only on players and csqc
 float CH_PLAYER = 7; // only on players and entities
 #else
-#define CH_INFO                  (0)
-#define CH_TRIGGER               (3 | CHANFLAG_FORCEAUTO)
-#define CH_WEAPON_A              (1 | CHANFLAG_FORCEAUTO)
-#define CH_WEAPON_SINGLE         (1)
-#define CH_VOICE                 (2 | CHANFLAG_FORCEAUTO)
-#define CH_BGM_SINGLE            (0 | CHAN_EXTRA1)
-#define CH_AMBIENT               (1 | CHAN_EXTRA1 | CHANFLAG_FORCEAUTO)
-#define CH_TRIGGER_SINGLE        (3)
-#define CH_SHOTS_SINGLE          (4)
-#define CH_WEAPON_B              (1 | CHANFLAG_FORCEAUTO)
-#define CH_PAIN                  (6 | CHANFLAG_FORCEAUTO)
-#define CH_PAIN_SINGLE           (6)
-#define CH_PLAYER                (7 | CHANFLAG_FORCEAUTO)
+float CH_INFO = 0;
+float CH_TRIGGER = -3;
+float CH_WEAPON_A = -1;
+float CH_WEAPON_SINGLE = 1;
+float CH_VOICE = -2;
+float CH_BGM_SINGLE = 8;
+float CH_AMBIENT = -9;
+float CH_TRIGGER_SINGLE = 3;
+float CH_SHOTS_SINGLE = 4;
+float CH_WEAPON_B = -1;
+float CH_PAIN = -6;
+float CH_PAIN_SINGLE = 6;
+float CH_PLAYER = -7;
 #endif
 
 float  ATTN_NONE                               = 0;