From: Mario <mario.mario@y7mail.com>
Date: Tue, 23 Apr 2013 11:17:54 +0000 (+1000)
Subject: Reset mage attack delay after using melee attack
X-Git-Tag: xonotic-v0.8.0~241^2^2~292
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0c26d7841bddd7684e13c720829bf583ee96d739;p=xonotic%2Fxonotic-data.pk3dir.git

Reset mage attack delay after using melee attack
---

diff --git a/qcsrc/server/monsters/monster/shalrath.qc b/qcsrc/server/monsters/monster/shalrath.qc
index 1ba434a35..ad302a52b 100644
--- a/qcsrc/server/monsters/monster/shalrath.qc
+++ b/qcsrc/server/monsters/monster/shalrath.qc
@@ -104,6 +104,9 @@ void shalrath_attack ()
 void shalrathattack_melee ()
 {
 	monster_melee(self.enemy, autocvar_g_monster_shalrath_attack_melee_damage, 0.3, DEATH_MONSTER_MAGE, TRUE);
+	
+	self.delay = -1;
+	self.monster_delayedattack = func_null;
 }
 
 void shalrath_attack_melee ()