X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fitems.qh;h=0b27748f9cf9149dde8f6d8e8d17be309f5a59c1;hb=396fefda7f6c70cb882f78a77fec57a3996f8f80;hp=45510437fcf50e830ad97026d587040468495423;hpb=1f988ad58a9fb5cef7ed843ad839b23dd23f6dc9;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/items.qh b/qcsrc/common/items.qh
index 45510437f..0b27748f9 100644
--- a/qcsrc/common/items.qh
+++ b/qcsrc/common/items.qh
@@ -37,10 +37,16 @@ const float   IT_HEALTH                    = 32768;
 	// for players:
 	const float	IT_RED_FLAG_TAKEN		= 32768;
 	const float	IT_RED_FLAG_LOST		= 65536;
-	const float	IT_RED_FLAG_CARRYING		= 98304;
+	const float	IT_RED_FLAG_CARRYING	= 98304;
 	const float	IT_BLUE_FLAG_TAKEN		= 131072;
 	const float	IT_BLUE_FLAG_LOST		= 262144;
 	const float	IT_BLUE_FLAG_CARRYING	= 393216;
+	const float	IT_YELLOW_FLAG_TAKEN	= 524288;
+	const float	IT_YELLOW_FLAG_LOST		= 1048576;
+	const float	IT_YELLOW_FLAG_CARRYING	= 1572864;
+	const float	IT_PINK_FLAG_TAKEN		= 2097152;
+	const float	IT_PINK_FLAG_LOST		= 4194304;
+	const float	IT_PINK_FLAG_CARRYING	= 6291456;
 // end
 const float   IT_5HP                       = 524288;
 const float   IT_25HP                      = 1048576;
@@ -51,8 +57,6 @@ const float   IT_AMMO                      = 3968; // IT_SHELLS | IT_NAILS | IT_
 const float   IT_PICKUPMASK                = 51; // IT_FUEL_REGEN | IT_JETPACK | IT_UNLIMITED_AMMO; // strength and invincible are handled separately
 const float   IT_UNLIMITED_AMMO            = 3; // IT_UNLIMITED_SUPERWEAPONS | IT_UNLIMITED_WEAPON_AMMO;
 
-const float AMMO_COUNT = 4; // amount of ammo types to show in the inventory panel
-
 // variables:
 string weaponorder_byid;
 
@@ -136,7 +140,7 @@ void register_weapons_done();
 #include "../server/w_all.qc"
 
 #undef REGISTER_WEAPON
-ACCUMULATE_FUNCTION(RegisterWeapons, register_weapons_done)
+ACCUMULATE_FUNCTION(RegisterWeapons, register_weapons_done);
 
 
 string W_FixWeaponOrder(string order, float complete);