WR_INIT no longer needs to be called from mutator
authorMario <zacjardine@y7mail.com>
Wed, 17 Dec 2014 17:38:00 +0000 (04:38 +1100)
committerMario <zacjardine@y7mail.com>
Wed, 17 Dec 2014 17:38:00 +0000 (04:38 +1100)
qcsrc/server/mutators/mutator_nades.qc
qcsrc/server/mutators/mutator_overkill.qc

index baf2716..c769784 100644 (file)
@@ -606,7 +606,7 @@ void nade_damage(entity inflictor, entity attacker, float damage, float deathtyp
                self.think = nade_beep;
        }
 
-       self.health       -= damage;
+       self.health -= damage;
        
        if ( self.nade_type != NADE_TYPE_HEAL || IS_PLAYER(attacker) )
                self.realowner = attacker;
index bfa9324..22cd79c 100644 (file)
@@ -323,14 +323,6 @@ void ok_Initialize()
        addstat(STAT_OK_AMMO_CHARGE, AS_FLOAT, ok_use_ammocharge);
        addstat(STAT_OK_AMMO_CHARGEPOOl, AS_FLOAT, ok_ammo_charge);
 
-       WEP_ACTION(WEP_MACHINEGUN, WR_INIT);
-       WEP_ACTION(WEP_VORTEX, WR_INIT);
-       WEP_ACTION(WEP_SHOTGUN, WR_INIT);
-       WEP_ACTION(WEP_BLASTER, WR_INIT);
-       
-       WEP_ACTION(WEP_RPC, WR_INIT);
-       WEP_ACTION(WEP_HMG, WR_INIT);
-
        (get_weaponinfo(WEP_RPC)).spawnflags &= ~WEP_FLAG_MUTATORBLOCKED;
        (get_weaponinfo(WEP_HMG)).spawnflags &= ~WEP_FLAG_MUTATORBLOCKED;