summaryrefslogtreecommitdiff
path: root/src/map/skill.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/skill.cpp')
-rw-r--r--src/map/skill.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/map/skill.cpp b/src/map/skill.cpp
index 789dd8a..05399c2 100644
--- a/src/map/skill.cpp
+++ b/src/map/skill.cpp
@@ -532,7 +532,7 @@ int skill_castend_nodamage_id(dumb_ptr<block_list> src, dumb_ptr<block_list> bl,
switch (skillid)
{
case SkillID::NPC_SUMMONSLAVE:
- if (md && !md->parent_id)
+ if (md)
{
mob_summonslave(md,
md->skillidx->val,
@@ -542,7 +542,10 @@ int skill_castend_nodamage_id(dumb_ptr<block_list> src, dumb_ptr<block_list> bl,
break;
case SkillID::NPC_EMOTION:
- if (md)
+ if (dstsd)
+ clif_emotion(dstsd,
+ md->skillidx->val[0]);
+ else if (md)
clif_emotion(md,
md->skillidx->val[0]);
break;