Merge branch 'master' into terencehill/centerprint_stuff

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

diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh
index fe368caa0ac9b7361943828ab7227a01f458956d..de486577bd022513c06ec886552e9287459a72bb 100644 (file)
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@ -434,11 +434,12 @@ const float STAT_DOM_PPS_YELLOW = 104;
 float CH_INFO = 0; // only on world and csqc
 float CH_TRIGGER = 0; // only on players; compat: FALSELY CONTROLLED BY "Info"
 float CH_WEAPON_A = 1; // only on players and entities
-float CH_WEAPON_SINGLE = 1; // only on players and entities
+float CH_WEAPON_SINGLE = 5; // only on players and entities
 float CH_VOICE = 2; // only on players
 float CH_BGM_SINGLE = 2; // only on csqc; compat: FALSELY CONTROLLED BY "Voice"
 float CH_AMBIENT = 2; // only on csqc; compat: FALSELY CONTROLLED BY "Voice"
 float CH_TRIGGER_SINGLE = 3; // only on players, entities, csqc
+float CH_SHOTS = 4; // only on players, entities, csqc
 float CH_SHOTS_SINGLE = 4; // only on players, entities, csqc
 float CH_WEAPON_B = 5; // only on players and entities
 float CH_PAIN = 6; // only on players and csqc
@@ -453,6 +454,7 @@ float CH_VOICE = -2;
 float CH_BGM_SINGLE = 8;
 float CH_AMBIENT = -9;
 float CH_TRIGGER_SINGLE = 3;
+float CH_SHOTS = -4;
 float CH_SHOTS_SINGLE = 4;
 float CH_WEAPON_B = -1;
 float CH_PAIN = -6;