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 69d446f53ef52d87250070ebd686b8a2b4807762..48867793b122d120ae9dbdac3f7505b7d84b8751 100644 (file)
--- a/qcsrc/common/monsters/monster/wyvern.qc
+++ b/qcsrc/common/monsters/monster/wyvern.qc
@@ -19,7 +19,10 @@ METHOD(WyvernAttack, wr_think, void(WyvernAttack thiswep, entity actor, .entity
     if (fire & 1)
     if (time > actor.attack_finished_single[0] || weapon_prepareattack(thiswep, actor, weaponentity, false, 1.2)) {
         if (IS_PLAYER(actor)) W_SetupShot_Dir(actor, weaponentity, v_forward, false, 0, SND_WyvernAttack_FIRE, CH_WEAPON_B, 0, DEATH_MONSTER_WYVERN.m_id);
-               if (IS_MONSTER(actor)) monster_makevectors(actor, actor.enemy);
+               if (IS_MONSTER(actor)) {
+                       actor.attack_finished_single[0] = time + 1.2;
+                       actor.anim_finished = time + 1.2;
+               }
 
                entity missile = spawn();
                missile.owner = missile.realowner = actor;