Merge remote branch 'refs/remotes/origin/mirceakitsune/highres_weapon_textures'

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

diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh
index facf3bc9506d2a36da606352e2653413b1f24038..3e2cf69057766cefaa0199061feb050a96dcb148 100644 (file)
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@ -485,6 +485,8 @@ float DEATH_WAKIGUN    = 10040;
 float DEATH_WAKIROCKET = 10041;
 float DEATH_WAKIBLOWUP = 10042;
 
+float DEATH_GENERIC = 10050;
+
 float DEATH_WEAPON = 10100;
 
 float DEATH_CUSTOM = 10300;
@@ -530,28 +532,29 @@ float MSG_KILL_ACTION = 3;
 float MSG_KILL_ACTION_SPREE = 4;
 float MSG_INFO = 5;
 
-float KILL_TEAM = 10301;
-float KILL_TEAM_SPREE = 10302;
-float KILL_FIRST_BLOOD = 10303;
-float KILL_FIRST_VICTIM = 10304;
-float KILL_TYPEFRAG = 10305;
-float KILL_TYPEFRAGGED = 10306;
-float KILL_FRAG = 10307;
-float KILL_FRAGGED = 10308;
-float KILL_SPREE = 10309;
-float KILL_END_SPREE = 10310;
-float KILL_SPREE_3 = 10311;
-float KILL_SPREE_5 = 10312;
-float KILL_SPREE_10 = 10313;
-float KILL_SPREE_15 = 10314;
-float KILL_SPREE_20 = 10315;
-float KILL_SPREE_25 = 10316;
-float KILL_SPREE_30 = 10317;
-
-float INFO_GOTFLAG = 10318;
-float INFO_PICKUPFLAG = 10319;
-float INFO_LOSTFLAG = 10320;
-float INFO_RETURNFLAG = 10321;
+float KILL_TEAM_RED = 10301;
+float KILL_TEAM_BLUE = 10302;
+float KILL_TEAM_SPREE = 10303;
+float KILL_FIRST_BLOOD = 10304;
+float KILL_FIRST_VICTIM = 10305;
+float KILL_TYPEFRAG = 10306;
+float KILL_TYPEFRAGGED = 10307;
+float KILL_FRAG = 10308;
+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;
 
 // weapon requests
 float WR_SETUP         = 1; // (SVQC) setup weapon data
@@ -580,4 +583,7 @@ float HUD_PANEL_VOTE                = 9;
 float HUD_PANEL_MODICONS       = 10;
 float HUD_PANEL_PRESSEDKEYS    = 11;
 float HUD_PANEL_CHAT           = 12;
-float HUD_PANEL_NUM            = 13;
+float HUD_PANEL_ENGINEINFO     = 13;
+float HUD_PANEL_NUM            = 14; // always last panel id + 1, please increment when adding a new panel
+
+float HUD_MENU_ENABLE          = 0;