Merge branch 'master' into samual/weapons

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / monsters / monster / spider.qc

diff --git a/qcsrc/common/monsters/monster/spider.qc b/qcsrc/common/monsters/monster/spider.qc
index 7e3c9f0c3e3684cc0c5d261efd7f115c1a182b70..c6c454547f4898bb96e946cb5994bd585b073e02 100644 (file)
--- a/qcsrc/common/monsters/monster/spider.qc
+++ b/qcsrc/common/monsters/monster/spider.qc
@@ -35,11 +35,11 @@ void spider_web_explode()
        if(self)
        {
                pointparticles(particleeffectnum("electro_impact"), self.origin, '0 0 0', 1);
-               RadiusDamage(self, self.realowner, 0, 0, 25, world, 25, self.projectiledeathtype, world);
-               
-               for(e = findradius(self.origin, 25); e; e = e.chain) if(e != self) if(e.takedamage && e.deadflag == DEAD_NO) if(e.health > 0)
+               RadiusDamage(self, self.realowner, 0, 0, 25, world, world, 25, self.projectiledeathtype, world);
+
+               for(e = findradius(self.origin, 25); e; e = e.chain) if(e != self) if(e.takedamage && e.deadflag == DEAD_NO) if(e.health > 0) if(e.monsterid != MON_SPIDER)
                        e.spider_slowness = time + (autocvar_g_monster_spider_attack_web_damagetime);
-               
+
                remove(self);
        }
 }
@@ -47,14 +47,14 @@ void spider_web_explode()
 void spider_web_touch()
 {
        PROJECTILE_TOUCH;
-       
+
        spider_web_explode();
 }
 
 void spider_shootweb()
 {
        monster_makevectors(self.enemy);
-       
+
        sound(self, CH_SHOTS, "weapons/electro_fire2.wav", VOL_BASE, ATTEN_NORM);
 
        entity proj = spawn ();
@@ -72,7 +72,7 @@ void spider_shootweb()
        //proj.glow_size = 50;
        //proj.glow_color = 45;
        proj.movetype = MOVETYPE_BOUNCE;
-       W_SetupProjectileVelocityEx(proj, v_forward, v_up, (autocvar_g_monster_spider_attack_web_speed), (autocvar_g_monster_spider_attack_web_speed_up), 0, 0, FALSE);
+       W_SetupProjVelocity_Explicit(proj, v_forward, v_up, (autocvar_g_monster_spider_attack_web_speed), (autocvar_g_monster_spider_attack_web_speed_up), 0, 0, FALSE);
        proj.touch = spider_web_touch;
        setsize(proj, '-4 -4 -4', '4 4 4');
        proj.takedamage = DAMAGE_NO;
@@ -94,7 +94,7 @@ float spider_attack(float attack_type)
        switch(attack_type)
        {
                case MONSTER_ATTACK_MELEE:
-               {       
+               {
                        return monster_melee(self.enemy, (autocvar_g_monster_spider_attack_bite_damage), ((random() > 0.5) ? spider_anim_attack : spider_anim_attack2), self.attack_range, (autocvar_g_monster_spider_attack_bite_delay), DEATH_MONSTER_SPIDER, TRUE);
                }
                case MONSTER_ATTACK_RANGED:
@@ -107,24 +107,19 @@ float spider_attack(float attack_type)
                                self.spider_web_delay = time + 3;
                                return TRUE;
                        }
-                       
+
                        return FALSE;
                }
        }
-       
+
        return FALSE;
 }
 
-void spawnfunc_monster_spider() 
+void spawnfunc_monster_spider()
 {
        self.classname = "monster_spider";
-       
-       self.monster_spawnfunc = spawnfunc_monster_spider;
-       
-       if(Monster_CheckAppearFlags(self))
-               return;
-       
-       if(!monster_initialize(MON_SPIDER, FALSE)) { remove(self); return; }
+
+       if(!monster_initialize(MON_SPIDER)) { remove(self); return; }
 }
 
 float m_spider(float req)
@@ -145,21 +140,21 @@ float m_spider(float req)
                case MR_SETUP:
                {
                        if(!self.health) self.health = (autocvar_g_monster_spider_health);
-                       
+
                        self.monster_loot = spawnfunc_item_health_medium;
                        self.monster_attackfunc = spider_attack;
                        self.frame = spider_anim_idle;
-                       
+
                        return TRUE;
                }
                case MR_PRECACHE:
                {
-                       precache_model ("models/monsters/spider.dpm");
+                       precache_model("models/monsters/spider.dpm");
                        precache_sound ("weapons/electro_fire2.wav");
                        return TRUE;
                }
        }
-       
+
        return TRUE;
 }
 
@@ -171,11 +166,10 @@ float m_spider(float req)
        {
                case MR_PRECACHE:
                {
-                       precache_model ("models/monsters/spider.dpm");
                        return TRUE;
                }
        }
-       
+
        return TRUE;
 }