Merge branch 'master' into divVerent/fruitbalance

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

diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh
index 775628e06871c5302191dadc321afa52c6e2651d..e8a20f55681ed45cb6991b98a03848f0f2ea9085 100644 (file)
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@ -59,6 +59,8 @@ 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 RACE_NET_CHECKPOINT_HIT_QUALIFYING = 0; // byte checkpoint, short time, short recordtime, string recordholder
 const float RACE_NET_CHECKPOINT_CLEAR = 1;
@@ -591,8 +593,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;
@@ -608,8 +610,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";