diff options
| author | gumi <git@gumi.ca> | 2019-08-28 17:48:49 +0000 |
|---|---|---|
| committer | gumi <git@gumi.ca> | 2019-08-28 17:51:21 +0000 |
| commit | b9be7649ea62189bcae67fa94babc438852b9777 (patch) | |
| tree | 8160f147116bc37cc556f49203f5e4e98fe34566 /src/map/skill.cpp | |
| parent | 543098e789f6fff900651990a16fdab17f249ea2 (diff) | |
| download | tmwa-b9be7649ea62189bcae67fa94babc438852b9777.tar.gz tmwa-b9be7649ea62189bcae67fa94babc438852b9777.tar.bz2 tmwa-b9be7649ea62189bcae67fa94babc438852b9777.tar.xz tmwa-b9be7649ea62189bcae67fa94babc438852b9777.zip | |
Revert the changes from the last 2 releases
battle.cpp is very messy and full of bugs
Diffstat (limited to 'src/map/skill.cpp')
| -rw-r--r-- | src/map/skill.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/map/skill.cpp b/src/map/skill.cpp index 05399c2..d9a7717 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) + if (md && !md->master_id) { mob_summonslave(md, md->skillidx->val, @@ -542,10 +542,7 @@ int skill_castend_nodamage_id(dumb_ptr<block_list> src, dumb_ptr<block_list> bl, break; case SkillID::NPC_EMOTION: - if (dstsd) - clif_emotion(dstsd, - md->skillidx->val[0]); - else if (md) + if (md) clif_emotion(md, md->skillidx->val[0]); break; |