X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmutators%2Fmutator%2Fpowerups%2Fpowerup%2Finvisibility.qh;h=bf8d8fb10a903820e9ad9e546c444c05b9274c19;hb=15e8bc08862fbec1a40805e8f7912590529e8163;hp=d920aab9f22ed3cf8710e67501e19c054a01b5d2;hpb=f2b27d4b960a11b7c0dd45dc4439edab40bcbfcb;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qh b/qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qh index d920aab9f..bf8d8fb10 100644 --- a/qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qh +++ b/qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qh @@ -16,11 +16,14 @@ SOUND(Invisibility, Item_Sound("powerup")); #ifdef SVQC .float invisibility_finished; -bool autocvar_g_powerups_invisibility = 1; -float autocvar_g_balance_powerup_invisibility_alpha = 0.15; -float autocvar_g_balance_powerup_invisibility_time = 30; -void powerup_invisibility_init(Pickup this, entity item) +bool autocvar_g_powerups_invisibility; +float autocvar_g_balance_powerup_invisibility_alpha; +float autocvar_g_balance_powerup_invisibility_time; +void powerup_invisibility_init(Pickup def, entity item) { + if(!autocvar_g_powerups || !autocvar_g_powerups_invisibility) + def.spawnflags |= ITEM_FLAG_MUTATORBLOCKED; + if(!item.invisibility_finished) item.invisibility_finished = (item.count) ? item.count : autocvar_g_balance_powerup_invisibility_time; } @@ -28,14 +31,10 @@ void powerup_invisibility_init(Pickup this, entity item) REGISTER_ITEM(Invisibility, Powerup) { this.m_canonical_spawnfunc = "item_invisibility"; #ifdef SVQC - if(autocvar_g_powerups_invisibility) - this.spawnflags = ITEM_FLAG_NORMAL; - else - this.spawnflags = ITEM_FLAG_MUTATORBLOCKED; - this.m_iteminit = powerup_invisibility_init; #endif #ifdef GAMEQC + this.spawnflags = ITEM_FLAG_NORMAL; this.m_itemid = IT_INVISIBILITY; this.m_model = MDL_BUFF; // TODO: MDL_Invisibility_ITEM when new model available this.m_skin = 12;