Merge branch 'master' into divVerent/4team_ctf

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

diff --git a/qcsrc/common/items.qh b/qcsrc/common/items.qh
index c20715d5852c3cbf09eae967424bf50d2a6754b2..a936a4c0e575201332ed884d5398e25fb9525644 100644 (file)
--- a/qcsrc/common/items.qh
+++ b/qcsrc/common/items.qh
@@ -41,6 +41,12 @@ float   IT_HEALTH                    = 32768;
        float   IT_BLUE_FLAG_TAKEN              = 131072;
        float   IT_BLUE_FLAG_LOST               = 262144;
        float   IT_BLUE_FLAG_CARRYING   = 393216;
+       float   IT_YELLOW_FLAG_TAKEN    = 524288;
+       float   IT_YELLOW_FLAG_LOST             = 1048576;
+       float   IT_YELLOW_FLAG_CARRYING = 1572864;
+       float   IT_PINK_FLAG_TAKEN              = 2097152;
+       float   IT_PINK_FLAG_LOST               = 4194304;
+       float   IT_PINK_FLAG_CARRYING   = 6291456;
 // end
 float   IT_5HP                       = 524288;
 float   IT_25HP                      = 1048576;
@@ -242,3 +248,7 @@ string W_FixWeaponOrder_AllowIncomplete(string order);
 string W_FixWeaponOrder_ForceComplete(string order);
 
 void W_RandomWeapons(entity e, float n);
+
+string W_Name(float weaponid);
+
+float W_AmmoItemCode(float wpn);