X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fitems%2Fitem.qh;h=a8b8b46757f7359607d468aeafe15ecf349cc1b4;hp=d095c81347e25414956bbae4ae0fe8fc5ef4b7c4;hb=294e75cd811b19c7f26271fec13c142470266bf6;hpb=3f8995555ede932a9505f396a93cd45442cbaf77 diff --git a/qcsrc/common/items/item.qh b/qcsrc/common/items/item.qh index d095c81347..a8b8b46757 100644 --- a/qcsrc/common/items/item.qh +++ b/qcsrc/common/items/item.qh @@ -18,30 +18,18 @@ const int IT_JETPACK = BIT(2); // actual item const int IT_USING_JETPACK = BIT(3); // confirmation that button is pressed const int IT_FUEL_REGEN = BIT(4); // fuel regeneration trigger -const int IT_FUEL = BIT(5); -const int IT_SHELLS = BIT(6); -const int IT_NAILS = BIT(7); -const int IT_ROCKETS = BIT(8); -const int IT_CELLS = BIT(9); -const int IT_PLASMA = BIT(10); +const int IT_RESOURCE = BIT(5); // bitflag to mark this item as a resource (unused) -const int IT_5HP = BIT(11); -const int IT_25HP = BIT(12); -const int IT_HEALTH = BIT(13); +const int IT_KEY1 = BIT(6); +const int IT_KEY2 = BIT(7); -const int IT_ARMOR_SHARD = BIT(14); -const int IT_ARMOR = BIT(15); - -const int IT_KEY1 = BIT(16); -const int IT_KEY2 = BIT(17); - -const int IT_CTF_SHIELDED = BIT(18); // set for the flag shield +const int IT_CTF_SHIELDED = BIT(8); // set for the flag shield // special colorblend meaning in engine -const int IT_INVISIBILITY = BIT(19); -const int IT_INVINCIBLE = BIT(20); -const int IT_SUPERWEAPON = BIT(21); // suit -const int IT_STRENGTH = BIT(22); +const int IT_INVISIBILITY = BIT(9); +const int IT_INVINCIBLE = BIT(10); +const int IT_SUPERWEAPON = BIT(11); // suit +const int IT_STRENGTH = BIT(12); // item masks const int IT_PICKUPMASK = IT_UNLIMITED_AMMO | IT_UNLIMITED_SUPERWEAPONS | IT_JETPACK | IT_FUEL_REGEN; // strength and invincible are handled separately