X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmonsters%2Fmonster%2Fzombie.qc;h=d2078c9d70d13df241337adc64d4cfd970c87884;hb=8782d4625fb1b3e338da59e947a05e0dbcf4a493;hp=3b2c0451b89a8657afd9d681c3cd39a97a48d744;hpb=4b615d6ea3ee6794ea9368c782393c66ef55c170;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/monsters/monster/zombie.qc b/qcsrc/common/monsters/monster/zombie.qc index 3b2c0451b..d2078c9d7 100644 --- a/qcsrc/common/monsters/monster/zombie.qc +++ b/qcsrc/common/monsters/monster/zombie.qc @@ -125,7 +125,7 @@ bool M_Zombie_Attack(int attack_type, entity actor, entity targ, .entity weapone return false; } -spawnfunc(monster_zombie) { Monster_Spawn(this, true, MON_ZOMBIE.monsterid); } +spawnfunc(monster_zombie) { Monster_Spawn(this, true, MON_ZOMBIE); } #endif // SVQC #ifdef SVQC @@ -141,7 +141,8 @@ METHOD(Zombie, mr_pain, float(Zombie this, entity actor, float damage_take, enti { TC(Zombie, this); actor.pain_finished = time + 0.34; - setanim(actor, ((random() > 0.5) ? actor.anim_pain1 : actor.anim_pain2), true, true, false); + if(time >= actor.spawn_time) + setanim(actor, ((random() > 0.5) ? actor.anim_pain1 : actor.anim_pain2), true, true, false); return damage_take; }