From: Mario <zacjardine@y7mail.com>
Date: Wed, 17 Dec 2014 17:38:00 +0000 (+1100)
Subject: WR_INIT no longer needs to be called from mutator
X-Git-Tag: xonotic-v0.8.0~70^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=76e821a895938cc62c5f0e9b5bc6afc431c14c07;p=xonotic%2Fxonotic-data.pk3dir.git

WR_INIT no longer needs to be called from mutator
---

diff --git a/qcsrc/server/mutators/mutator_nades.qc b/qcsrc/server/mutators/mutator_nades.qc
index baf2716cb..c7697842d 100644
--- a/qcsrc/server/mutators/mutator_nades.qc
+++ b/qcsrc/server/mutators/mutator_nades.qc
@@ -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;
diff --git a/qcsrc/server/mutators/mutator_overkill.qc b/qcsrc/server/mutators/mutator_overkill.qc
index bfa9324f1..22cd79cff 100644
--- a/qcsrc/server/mutators/mutator_overkill.qc
+++ b/qcsrc/server/mutators/mutator_overkill.qc
@@ -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;