From 64f7f988ec09f2b35ebd1214115dde6b2b0db88a Mon Sep 17 00:00:00 2001 From: skotlex Date: Sat, 28 Oct 2006 03:55:01 +0000 Subject: - Fixed mob-skill event "skillused" not triggering at all. - Summoned mobs will only be removed from a map if their master is also removed (dynamic mobs) - Minor cleanups git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9088 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/mob.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/map/mob.c') diff --git a/src/map/mob.c b/src/map/mob.c index a9ae329d5..61789b7fc 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -2472,7 +2472,7 @@ int mob_summonslave(struct mob_data *md2,int *value,int amount,int skill_id) continue; md= mob_spawn_dataset(&data); - md->special_state.cached= battle_config.dynamic_mobs; //[Skotlex] + md->special_state.cached= md2->special_state.cached; //[Skotlex] if(skill_id == NPC_SUMMONSLAVE){ md->master_id=md2->bl.id; md->state.killer = md2->state.killer; @@ -2671,7 +2671,7 @@ int mobskill_use(struct mob_data *md, unsigned int tick, int event) flag = (event == ms[i].cond1); //Avoid entering on defined events to avoid "hyper-active skill use" due to the overflow of calls to this function //in battle. The only exception is MSC_SKILLUSED which explicitly uses the event value to trigger. [Skotlex] - if (!flag && (event == -1 || event == MSC_SKILLUSED)){ + if (!flag && (event == -1 || (event & 0xffff) == MSC_SKILLUSED)){ switch (ms[i].cond1) { case MSC_ALWAYS: -- cgit v1.2.3-60-g2f50