X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fconstants.qh;h=5ebeb54659e4ba7e936c0666077f967fa5cd22b5;hb=aaf697e6f12d23c7d7d75f352f7703f2c8491485;hp=61ce6900affe5f0a682cc23e324de42c2c94f2c5;hpb=6dfd6d200900e01039fe2805ecd8da21a0f8f510;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh
index 61ce6900a..5ebeb5465 100644
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@ -60,6 +60,7 @@ const float TE_CSQC_TARGET_MUSIC = 111;
 const float TE_CSQC_NOTIFY = 112;
 const float TE_CSQC_WEAPONCOMPLAIN = 113;
 const float TE_CSQC_CAMPINGRIFLE_SCOPE = 115;
+const float TE_CSQC_NEX_SCOPE = 116;
 
 const float RACE_NET_CHECKPOINT_HIT_QUALIFYING = 0; // byte checkpoint, short time, short recordtime, string recordholder
 const float RACE_NET_CHECKPOINT_CLEAR = 1;
@@ -397,7 +398,7 @@ float	CHAN_AUTO				= 0;
 	// on world: announcers, ...                     INFO
 	// on players: item pickup                       ITEMS
 	// on entities: UNUSED
-	// on csqc: UNUSED
+	// on csqc: announcers                           INFO
 float	CHAN_WEAPON				= 1; // Weapon fire
 	// on world: UNUSED
 	// on players: weapon firing                     WEAPONS
@@ -412,7 +413,7 @@ float	CHAN_TRIGGER			= 3; // Triggers/Items
 	// on world: UNUSED
 	// on players: item pickup                       ITEMS
 	// on entities: platforms moving etc.            ITEMS
-	// on csqc: UNUSED
+	// on csqc: platforms moving etc.                ITEMS
 float	CHAN_PROJECTILE			= 4; // Projectiles
 	// on world: UNUSED
 	// on players: projectiles hitting player        SHOTS
@@ -550,12 +551,11 @@ float MAX_SHOT_DISTANCE = 32768;
 
 // CSQC centerprint/notify message types
 float MSG_SUICIDE = 0;
-float MSG_KILL_MELEE = 1;
-float MSG_KILL = 2;
-float MSG_SPREE = 3;
-float MSG_KILL_ACTION = 4;
-float MSG_KILL_ACTION_SPREE = 5;
-float MSG_INFO = 6;
+float MSG_KILL = 1;
+float MSG_SPREE = 2;
+float MSG_KILL_ACTION = 3;
+float MSG_KILL_ACTION_SPREE = 4;
+float MSG_INFO = 5;
 
 float KILL_TEAM_RED = 10301;
 float KILL_TEAM_BLUE = 10302;
@@ -565,24 +565,22 @@ float KILL_FIRST_VICTIM = 10305;
 float KILL_TYPEFRAG = 10306;
 float KILL_TYPEFRAGGED = 10307;
 float KILL_FRAG = 10308;
-float KILL_FRAG_GAUNTLET = 10309;
-float KILL_FRAG_SHOTGUN_MELEE = 10310;
-float KILL_FRAGGED = 10311;
-float KILL_SPREE = 10312;
-float KILL_END_SPREE = 10313;
-float KILL_SPREE_3 = 10314;
-float KILL_SPREE_5 = 10315;
-float KILL_SPREE_10 = 10316;
-float KILL_SPREE_15 = 10317;
-float KILL_SPREE_20 = 10318;
-float KILL_SPREE_25 = 10319;
-float KILL_SPREE_30 = 10320;
-
-float INFO_GOTFLAG = 10321;
-float INFO_PICKUPFLAG = 10322;
-float INFO_LOSTFLAG = 10323;
-float INFO_RETURNFLAG = 10324;
-float INFO_CAPTUREFLAG = 10325;
+float KILL_FRAGGED = 10309;
+float KILL_SPREE = 10310;
+float KILL_END_SPREE = 10311;
+float KILL_SPREE_3 = 10312;
+float KILL_SPREE_5 = 10313;
+float KILL_SPREE_10 = 10314;
+float KILL_SPREE_15 = 10315;
+float KILL_SPREE_20 = 10316;
+float KILL_SPREE_25 = 10317;
+float KILL_SPREE_30 = 10318;
+
+float INFO_GOTFLAG = 10319;
+float INFO_PICKUPFLAG = 10320;
+float INFO_LOSTFLAG = 10321;
+float INFO_RETURNFLAG = 10322;
+float INFO_CAPTUREFLAG = 10323;
 
 // weapon requests
 float WR_SETUP		= 1; // (SVQC) setup weapon data