Merge branch 'master' into Mario/monsters

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

diff --git a/qcsrc/common/monsters/monster/wyvern.qc b/qcsrc/common/monsters/monster/wyvern.qc
index 0afc5f9281d89af88539d45587804523b2a5da30..162331a11723a7459dc2d316acd15bf2205c6dea 100644 (file)
--- a/qcsrc/common/monsters/monster/wyvern.qc
+++ b/qcsrc/common/monsters/monster/wyvern.qc
@@ -42,7 +42,7 @@ void wyvern_fireball_explode()
                RadiusDamage(self, self.realowner, MON_CVAR(wyvern, attack_fireball_damage), MON_CVAR(wyvern, attack_fireball_edgedamage), MON_CVAR(wyvern, attack_fireball_force), world, MON_CVAR(wyvern, attack_fireball_radius), self.projectiledeathtype, world);
                
                for(e = world; (e = findfloat(e, takedamage, DAMAGE_AIM)); ) if(vlen(e.origin - self.origin) <= MON_CVAR(wyvern, attack_fireball_radius))
-                       Fire_AddDamage(e, self, 5 * monster_skill, MON_CVAR(wyvern, attack_fireball_damagetime), self.projectiledeathtype);
+                       Fire_AddDamage(e, self, 5 * Monster_SkillModifier(), MON_CVAR(wyvern, attack_fireball_damagetime), self.projectiledeathtype);
                
                remove(self);
        }
@@ -122,7 +122,7 @@ float m_wyvern(float req)
                }
                case MR_DEATH:
                {
-                       monsters_setframe(wyvern_anim_death);
+                       self.frame = wyvern_anim_death;
                        self.velocity_x = -200 + 400 * random();
                        self.velocity_y = -200 + 400 * random();
                        self.velocity_z = 100 + 100 * random();
@@ -134,13 +134,13 @@ float m_wyvern(float req)
                        
                        self.monster_loot = spawnfunc_item_cells;
                        self.monster_attackfunc = wyvern_attack;
-                       monsters_setframe(wyvern_anim_hover);
+                       self.frame = wyvern_anim_hover;
                        
                        return TRUE;
                }
-               case MR_INIT:
+               case MR_PRECACHE:
                {
-                       // nothing
+                       precache_model ("models/monsters/wizard.mdl");
                        return TRUE;
                }
                case MR_CONFIG:
@@ -159,12 +159,7 @@ float m_wyvern(float req)
 {
        switch(req)
        {
-               case MR_DEATH:
-               {
-                       // nothing
-                       return TRUE;
-               }
-               case MR_INIT:
+               case MR_PRECACHE:
                {
                        precache_model ("models/monsters/wizard.mdl");
                        return TRUE;