X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmonsters%2Fmonster%2Fshambler.qc;h=d234e2604984f27e0e3a71c68708df6ab9ce6f86;hb=7b052d5dba58d84e4c38b45f6520f92c660d7188;hp=6baa4534754e499164665095255cc8a580256104;hpb=f03ecd022b871d302176764d819b1a07eeda7997;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/monsters/monster/shambler.qc b/qcsrc/common/monsters/monster/shambler.qc index 6baa45347..d234e2604 100644 --- a/qcsrc/common/monsters/monster/shambler.qc +++ b/qcsrc/common/monsters/monster/shambler.qc @@ -116,11 +116,9 @@ void M_Shambler_Attack_Lightning_Think(entity this) void M_Shambler_Attack_Lightning(entity this) { - entity gren; - monster_makevectors(this, this.enemy); - gren = new(grenade); + entity gren = new(grenade); gren.owner = gren.realowner = this; gren.bot_dodge = true; gren.bot_dodgerating = (autocvar_g_monster_shambler_attack_lightning_damage); @@ -244,7 +242,6 @@ METHOD(Shambler, mr_anim, bool(Shambler this, entity actor)) } #endif #ifdef SVQC -spawnfunc(item_health_mega); .float animstate_endtime; METHOD(Shambler, mr_setup, bool(Shambler this, entity actor)) { @@ -256,7 +253,7 @@ METHOD(Shambler, mr_setup, bool(Shambler this, entity actor)) if(!actor.stopspeed) { actor.stopspeed = (autocvar_g_monster_shambler_speed_stop); } if(!actor.damageforcescale) { actor.damageforcescale = (autocvar_g_monster_shambler_damageforcescale); } - actor.monster_loot = spawnfunc_item_health_mega; + actor.monster_loot = ITEM_HealthMega; actor.weapon = WEP_ELECTRO.m_id; // matches attacks better than WEP_VORTEX setanim(actor, actor.anim_shoot, false, true, true);