X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fitems%2Fitem.qh;h=d095c81347e25414956bbae4ae0fe8fc5ef4b7c4;hp=cf4e288ba6cd1769c127ef9ca27ab16ca8411579;hb=002be87cfe10ccbfedaf09eec48a1c78b10f8476;hpb=e0012447bfce1b551df3dc01b043655aa93dafad diff --git a/qcsrc/common/items/item.qh b/qcsrc/common/items/item.qh index cf4e288ba..d095c8134 100644 --- a/qcsrc/common/items/item.qh +++ b/qcsrc/common/items/item.qh @@ -11,7 +11,7 @@ #include #endif -const int IT_UNLIMITED_WEAPON_AMMO = BIT(0); // when this bit is set, using a weapon does not reduce ammo. Checkpoints can give this powerup. +const int IT_UNLIMITED_AMMO = BIT(0); // when this bit is set, using a weapon does not reduce ammo. Checkpoints can give this powerup. const int IT_UNLIMITED_SUPERWEAPONS = BIT(1); // when this bit is set, superweapons don't expire. Checkpoints can give this powerup. const int IT_JETPACK = BIT(2); // actual item @@ -44,12 +44,11 @@ const int IT_SUPERWEAPON = BIT(21); // suit const int IT_STRENGTH = BIT(22); // item masks -const int IT_UNLIMITED_AMMO = IT_UNLIMITED_WEAPON_AMMO | IT_UNLIMITED_SUPERWEAPONS; -const int IT_PICKUPMASK = IT_UNLIMITED_AMMO | IT_JETPACK | IT_FUEL_REGEN; // strength and invincible are handled separately +const int IT_PICKUPMASK = IT_UNLIMITED_AMMO | IT_UNLIMITED_SUPERWEAPONS | IT_JETPACK | IT_FUEL_REGEN; // strength and invincible are handled separately #ifdef SVQC -const .float strength_finished = _STAT(STRENGTH_FINISHED); -const .float invincible_finished = _STAT(INVINCIBLE_FINISHED); +.float strength_finished; // NOTE: this field is used only by map entities, it does not directly apply the strength stat +.float invincible_finished; // ditto #define spawnfunc_body(item) \ if (!Item_IsDefinitionAllowed(item)) \