]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Further clean overkill code up
authorterencehill <piuntn@gmail.com>
Tue, 27 Sep 2016 16:45:34 +0000 (18:45 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 27 Sep 2016 16:45:34 +0000 (18:45 +0200)
qcsrc/common/mutators/mutator/overkill/sv_overkill.qc

index 97301d6f189f16838609acdc854d3714912ada15..f86c71b7eb694d0cf0032165fe3b5fc114b2dcf0 100644 (file)
@@ -21,8 +21,6 @@ float autocvar_g_overkill_ammo_charge_limit;
 .float ok_use_ammocharge = _STAT(OK_AMMO_CHARGE);
 .float ok_ammo_charge = _STAT(OK_AMMO_CHARGEPOOL);
 
-.float pauseregen_finished;
-
 void(entity ent, float wep) ok_DecreaseCharge;
 
 void ok_Initialize();
@@ -116,15 +114,6 @@ MUTATOR_HOOKFUNCTION(ok, PlayerDamage_Calculate, CBC_ORDER_LAST)
        }
 }
 
-MUTATOR_HOOKFUNCTION(ok, PlayerDamage_SplitHealthArmor)
-{
-       entity frag_target = M_ARGV(2, entity);
-       float damage_take = M_ARGV(4, float);
-
-       if(damage_take)
-               frag_target.pauseregen_finished = max(frag_target.pauseregen_finished, time + 2);
-}
-
 void ok_DropItem(entity this, entity targ)
 {
        entity e = new(droppedweapon); // hax
@@ -264,8 +253,6 @@ MUTATOR_HOOKFUNCTION(ok, PlayerSpawn)
        // if player changed their weapon while dead, don't switch to their death weapon
        if(player.impulse)
                player.ok_lastwep = 0;
-
-       player.pauseregen_finished = time + 2;
 }
 
 void self_spawnfunc_weapon_hmg(entity this) { spawnfunc_weapon_hmg(this); }