From: Mario <mario.mario@y7mail.com>
Date: Sun, 2 Jun 2013 10:50:16 +0000 (+1000)
Subject: Remove duplicate shambler attack
X-Git-Tag: xonotic-v0.8.0~241^2^2~211
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f93605877a27d094ee0daa8bde841c19f364f5d6;p=xonotic%2Fxonotic-data.pk3dir.git

Remove duplicate shambler attack
---

diff --git a/qcsrc/server/monsters/monster/shambler.qc b/qcsrc/server/monsters/monster/shambler.qc
index d1f5a9d09..7e4433ca1 100644
--- a/qcsrc/server/monsters/monster/shambler.qc
+++ b/qcsrc/server/monsters/monster/shambler.qc
@@ -50,31 +50,17 @@ void shambler_delayedsmash ()
 	self.attack_finished_single = time + 1.1;
 }
 
-void() shambler_swing_right;
-void shambler_swing_left ()
+void shambler_swing()
 {
-	monsters_setframe(shambler_anim_swingl);
-	monster_melee(self.enemy, autocvar_g_monster_shambler_attack_claw_damage, 0.3, DEATH_MONSTER_SHAMBLER_CLAW, TRUE);
-	self.attack_finished_single = time + 0.8;
-	self.delay = -1;
-	self.monster_delayedattack = func_null;
-	if(random() < 0.5)
-	{
-		self.monster_delayedattack = shambler_swing_right;
-		self.delay = time + 0.5;
-	}
-}
-
-void shambler_swing_right ()
-{
-	monsters_setframe(shambler_anim_swingr);
+	float r = ((random() < 0.5) ? TRUE : FALSE);
+	monsters_setframe((r) ? shambler_anim_swingr : shambler_anim_swingl);
 	monster_melee(self.enemy, autocvar_g_monster_shambler_attack_claw_damage, 0.3, DEATH_MONSTER_SHAMBLER_CLAW, TRUE);
 	self.attack_finished_single = time + 0.8;
 	self.monster_delayedattack = func_null;
 	self.delay = -1;
-	if(random() < 0.5)
+	if(r)
 	{
-		self.monster_delayedattack = shambler_swing_left;
+		self.monster_delayedattack = shambler_swing;
 		self.delay = time + 0.5;
 	}
 }
@@ -115,10 +101,8 @@ float shambler_attack(float attack_type)
 
 			if(chance > 0.6)
 				shambler_delayedsmash();
-			else if(chance > 0.3)
-				shambler_swing_right();
 			else
-				shambler_swing_left();
+				shambler_swing();
 			
 			return TRUE;
 		}