From: Mario <mario.mario@y7mail.com>
Date: Thu, 18 Apr 2013 05:24:15 +0000 (+1000)
Subject: Use monster_melee for all monster melee attacks
X-Git-Tag: xonotic-v0.8.0~241^2^2~362
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b50faad90ab0a5208b7aec1e817ef71ca04b36a8;p=xonotic%2Fxonotic-data.pk3dir.git

Use monster_melee for all monster melee attacks
---

diff --git a/qcsrc/server/monsters/monster/ogre.qc b/qcsrc/server/monsters/monster/ogre.qc
index a340d552c..94621f95f 100644
--- a/qcsrc/server/monsters/monster/ogre.qc
+++ b/qcsrc/server/monsters/monster/ogre.qc
@@ -29,17 +29,6 @@ const float ogre_anim_pain 		= 3;
 const float ogre_anim_swing 	= 4;
 const float ogre_anim_die 		= 5;
 
-void chainsaw()
-{
-	if (!self.enemy)
-		return;
-
-	if (vlen(self.enemy.origin - self.origin) > 100 * self.scale)
-		return;
-
-	Damage(self.enemy, self, self, autocvar_g_monster_ogre_chainsaw_damage * monster_skill, DEATH_MONSTER_OGRE_CHAINSAW, self.enemy.origin, normalize(self.enemy.origin - self.origin));
-}
-
 void ogre_think()
 {
 	self.think = ogre_think;
@@ -62,12 +51,7 @@ void ogre_swing()
 	self.delay = time + 0.2;
 	self.monster_delayedattack = ogre_swing;
 	
-	if(self.ogre_cycles <= 2)
-		chainsaw();
-	else if(self.ogre_cycles <= 4)
-		chainsaw();
-	else
-		chainsaw();
+	monster_melee(self.enemy, autocvar_g_monster_ogre_chainsaw_damage, 0.3, DEATH_MONSTER_OGRE_CHAINSAW, TRUE);
 	
 	if(self.ogre_cycles >= 4)
 	{
diff --git a/qcsrc/server/monsters/monster/spider.qc b/qcsrc/server/monsters/monster/spider.qc
index f41ee4469..d49459152 100644
--- a/qcsrc/server/monsters/monster/spider.qc
+++ b/qcsrc/server/monsters/monster/spider.qc
@@ -29,16 +29,8 @@ const float SPIDER_TYPE_ICE		= 0;
 const float SPIDER_TYPE_FIRE	= 1;
 
 void spider_attack_standing()
-{
-	float dot = 0, bigdmg = autocvar_g_monster_spider_attack_stand_damage * self.scale;
-
-	self.velocity_x = 0;
-	self.velocity_y = 0;
-
-	makevectors (self.angles);
-	dot = normalize (self.enemy.origin - self.origin) * v_forward;
-	if(dot > 0.3)
-		Damage(self.enemy, self, self, bigdmg * monster_skill, DEATH_MONSTER_SPIDER, self.origin, '0 0 0');
+{	
+	monster_melee(self.enemy, autocvar_g_monster_spider_attack_stand_damage, 0.3, DEATH_MONSTER_SPIDER, TRUE);
 	
 	monsters_setframe((random() > 0.5) ? spider_anim_attack : spider_anim_attack2);