Merge branch 'master' into Mario/vehicles

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

diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh
index 5c48e63964e5360d21bfc1df173d58a250dc286a..1953b1f33d0c66a03341515ab044b54bca26c69c 100644 (file)
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@ -115,6 +115,7 @@ const int ENT_CLIENT_TRIGGER_IMPULSE = 68;
 const int ENT_CLIENT_SWAMP = 69;
 const int ENT_CLIENT_CORNER = 70;
 const int ENT_CLIENT_KEYLOCK = 71;
 const int ENT_CLIENT_SWAMP = 69;
 const int ENT_CLIENT_CORNER = 70;
 const int ENT_CLIENT_KEYLOCK = 71;

+const int ENT_CLIENT_EFFECT = 72;

 const int ENT_CLIENT_VIEWLOC = 78;
 const int ENT_CLIENT_VIEWLOC_TRIGGER = 79;
 
 const int ENT_CLIENT_VIEWLOC = 78;
 const int ENT_CLIENT_VIEWLOC_TRIGGER = 79;
 


@@ -122,6 +123,7 @@ const int ENT_CLIENT_HEALING_ORB = 80;
 
 const int SPRITERULE_DEFAULT = 0;
 const int SPRITERULE_TEAMPLAY = 1;
 
 const int SPRITERULE_DEFAULT = 0;
 const int SPRITERULE_TEAMPLAY = 1;

+const int SPRITERULE_SPECTATOR = 2;

 
 const int RADARICON_NONE = 0;
 const int RADARICON_FLAG = 1;
 
 const int RADARICON_NONE = 0;
 const int RADARICON_FLAG = 1;


@@ -163,13 +165,7 @@ const int CTF_STATE_DEFEND = 2;
 const int CTF_STATE_COMMANDER = 3;
 
 const int HUD_NORMAL = 0;
 const int CTF_STATE_COMMANDER = 3;
 
 const int HUD_NORMAL = 0;

-const int HUD_VEHICLE_FIRST = 10;
-const int HUD_SPIDERBOT = 10;
-const int HUD_WAKIZASHI = 11;
-const int HUD_RAPTOR = 12;
-const int HUD_BUMBLEBEE = 13;
-const int HUD_BUMBLEBEE_GUN = 14;
-const int HUD_VEHICLE_LAST = 14;
+const int HUD_BUMBLEBEE_GUN = 25;

 
 const vector eX = '1 0 0';
 const vector eY = '0 1 0';
 
 const vector eX = '1 0 0';
 const vector eY = '0 1 0';