diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2013-05-23 15:14:29 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2013-05-23 19:12:48 -0700 |
| commit | 87218e07b2bc89593eae1cb4abe859cd1a7eaa0f (patch) | |
| tree | 9343c393ddebf50086fdef8f2a4668781e4afd66 /src/map/skill.cpp | |
| parent | 543e4b419239f37321bc5a224d56773d1fe6ebfe (diff) | |
| download | tmwa-87218e07b2bc89593eae1cb4abe859cd1a7eaa0f.tar.gz tmwa-87218e07b2bc89593eae1cb4abe859cd1a7eaa0f.tar.bz2 tmwa-87218e07b2bc89593eae1cb4abe859cd1a7eaa0f.tar.xz tmwa-87218e07b2bc89593eae1cb4abe859cd1a7eaa0f.zip | |
Make block_list a base class
Diffstat (limited to 'src/map/skill.cpp')
| -rw-r--r-- | src/map/skill.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/map/skill.cpp b/src/map/skill.cpp index 724228a..66f1e4c 100644 --- a/src/map/skill.cpp +++ b/src/map/skill.cpp @@ -541,7 +541,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, case SkillID::NPC_EMOTION: if (md) - clif_emotion(&md->bl, + clif_emotion(md, mob_db[md->mob_class].skill[md->skillidx].val[0]); break; } @@ -676,8 +676,8 @@ void skill_devotion(struct map_session_data *md, int) struct map_session_data *sd = map_id2sd(md->dev.val1[n]); // 相手が見つからない // 相手をディボしてるのが自分じゃない // 距離が離れてる if (sd == NULL - || (md->bl.bl_id != 0/* was something else - TODO remove this */) - || skill_devotion3(&md->bl, md->dev.val1[n])) + || (md->bl_id != 0/* was something else - TODO remove this */) + || skill_devotion3(md, md->dev.val1[n])) { skill_devotion_end(md, sd, n); } @@ -698,7 +698,7 @@ int skill_devotion3(struct block_list *bl, int target) || (sd = map_id2sd(target)) == NULL) return 1; else - r = distance(bl->bl_x, bl->bl_y, sd->bl.bl_x, sd->bl.bl_y); + r = distance(bl->bl_x, bl->bl_y, sd->bl_x, sd->bl_y); if ( + 6 < r) { // 許容範囲を超えてた @@ -867,7 +867,7 @@ int skill_update_heal_animation(struct map_session_data *sd) else sd->opt2 &= ~mask; - return clif_changeoption(&sd->bl); + return clif_changeoption(sd); } /*========================================== |