pow(a, b) -> a ** b

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mutators / mutator / nades / nades.qc

diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc
index 5bf0360fdb74c8c6d0dd72c4a20b1ebc361134cb..45e6d997e836c7cb6a76326bc9ec4149bc4e285a 100644 (file)
--- a/qcsrc/common/mutators/mutator/nades/nades.qc
+++ b/qcsrc/common/mutators/mutator/nades/nades.qc
@@ -577,7 +577,7 @@ void nade_entrap_touch(entity this, entity toucher)
                if(!pushdeltatime) return;
 
                // div0: ticrate independent, 1 = identity (not 20)
-               toucher.velocity = toucher.velocity * pow(autocvar_g_nades_entrap_strength, pushdeltatime);
+               toucher.velocity = toucher.velocity * (autocvar_g_nades_entrap_strength ** pushdeltatime);
 
        #ifdef SVQC
                UpdateCSQCProjectile(toucher);
@@ -769,7 +769,6 @@ void nade_touch(entity this, entity toucher)
        if(autocvar_g_nades_pickup)
        if(time >= this.spawnshieldtime)
        if(!toucher.nade && this.health == this.max_health) // no boosted shot pickups, thank you very much
-       if(!STAT(FROZEN, toucher))
        if(CanThrowNade(toucher)) // prevent some obvious things, like dead players
        if(IS_REAL_CLIENT(toucher)) // above checks for IS_PLAYER, don't need to do it here
        {
@@ -1106,9 +1105,6 @@ bool CanThrowNade(entity this)
        if(this.vehicle)
                return false;
 
-       if(gameover)
-               return false;
-
        if(IS_DEAD(this))
                return false;