X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fcommon%2Fconstants.qh;h=5e8dff7dca2645fb81564d3c243c09381ca15a9d;hb=30d92d8ea9df4c1e354a3b1e186dd5d0ee61709f;hp=8a74e964a6b776134b75096cbe12d775a38434d7;hpb=bd70c02edf2904e48be2ba190e75bfa8efc10fb4;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh
index 8a74e964a..5e8dff7dc 100644
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@ -59,8 +59,10 @@ const float TE_CSQC_ANNOUNCE = 110;
 const float TE_CSQC_TARGET_MUSIC = 111;
 const float TE_CSQC_NOTIFY = 112;
 const float TE_CSQC_WEAPONCOMPLAIN = 113;
-const float TE_CSQC_BEAM = 114;
 const float TE_CSQC_CAMPINGRIFLE_SCOPE = 115;
+const float TE_CSQC_NEX_SCOPE = 116;
+const float TE_CSQC_NEX_VELOCITY = 117;
+const float TE_CSQC_CR_MAXBULLETS = 118;
 
 const float RACE_NET_CHECKPOINT_HIT_QUALIFYING = 0; // byte checkpoint, short time, short recordtime, string recordholder
 const float RACE_NET_CHECKPOINT_CLEAR = 1;
@@ -107,6 +109,9 @@ const float ENT_CLIENT_TUBANOTE = 23;
 const float ENT_CLIENT_WARPZONE = 24;
 const float ENT_CLIENT_WARPZONE_CAMERA = 25;
 const float ENT_CLIENT_TRIGGER_MUSIC = 26;
+const float ENT_CLIENT_HOOK = 27;
+const float ENT_CLIENT_LGBEAM = 28;
+const float ENT_CLIENT_GAUNTLET = 29;
 
 const float ENT_CLIENT_TURRET = 40;
 
@@ -395,7 +400,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
@@ -410,7 +415,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
@@ -451,20 +456,21 @@ float PROJECTILE_CRYLINK = 5;
 float PROJECTILE_ELECTRO_BEAM = 6;
 float PROJECTILE_GRENADE = 7;
 float PROJECTILE_GRENADE_BOUNCING = 8;
-float PROJECTILE_LASER = 9;
-float PROJECTILE_HLAC = 10;
-float PROJECTILE_SEEKER = 11;
-float PROJECTILE_FLAC = 12;
-float PROJECTILE_PORTO_RED = 13;
-float PROJECTILE_PORTO_BLUE = 14;
-float PROJECTILE_HOOKBOMB = 15;
-float PROJECTILE_HAGAR = 16;
-float PROJECTILE_HAGAR_BOUNCING = 17;
-float PROJECTILE_BULLET_GLOWING = 18;
-float PROJECTILE_CRYLINK_BOUNCING = 19;
-float PROJECTILE_FIREBALL = 20;
-float PROJECTILE_FIREMINE = 21;
-float PROJECTILE_BULLET_GLOWING_TRACER = 22;
+float PROJECTILE_MINE = 9;
+float PROJECTILE_LASER = 10;
+float PROJECTILE_HLAC = 11;
+float PROJECTILE_SEEKER = 12;
+float PROJECTILE_FLAC = 13;
+float PROJECTILE_PORTO_RED = 14;
+float PROJECTILE_PORTO_BLUE = 15;
+float PROJECTILE_HOOKBOMB = 16;
+float PROJECTILE_HAGAR = 17;
+float PROJECTILE_HAGAR_BOUNCING = 18;
+float PROJECTILE_BULLET_GLOWING = 19;
+float PROJECTILE_CRYLINK_BOUNCING = 20;
+float PROJECTILE_FIREBALL = 21;
+float PROJECTILE_FIREMINE = 22;
+float PROJECTILE_BULLET_GLOWING_TRACER = 23;
 
 float SPECIES_HUMAN        =  0;
 float SPECIES_ROBOT_SOLID  =  1;
@@ -593,8 +599,8 @@ float WR_RESETPLAYER    = 10; // (SVQC) does not need to do anything
 float WR_IMPACTEFFECT	= 11; // (CSQC) impact effect
 
 
-float HUD_PANEL_WEAPONICONS	= 0;
-float HUD_PANEL_INVENTORY	= 1;
+float HUD_PANEL_WEAPONS		= 0;
+float HUD_PANEL_AMMO		= 1;
 float HUD_PANEL_POWERUPS	= 2;
 float HUD_PANEL_HEALTHARMOR	= 3;
 float HUD_PANEL_NOTIFY		= 4;
@@ -610,8 +616,8 @@ float HUD_PANEL_ENGINEINFO	= 13;
 float HUD_PANEL_INFOMESSAGES	= 14;
 float HUD_PANEL_NUM		= 15; // always last panel id + 1, please increment when adding a new panel
 
-string HUD_PANELNAME_WEAPONICONS 	= "weaponicons";
-string HUD_PANELNAME_INVENTORY	 	= "inventory";
+string HUD_PANELNAME_WEAPONS 		= "weapons";
+string HUD_PANELNAME_AMMO	 	= "ammo";
 string HUD_PANELNAME_POWERUPS	 	= "powerups";
 string HUD_PANELNAME_HEALTHARMOR 	= "healtharmor";
 string HUD_PANELNAME_NOTIFY	 	= "notify";