diff options
| author | Haruna <haru@dotalux.com> | 2015-09-24 20:48:34 +0200 |
|---|---|---|
| committer | Haruna <haru@dotalux.com> | 2015-09-24 20:48:34 +0200 |
| commit | fd1125553f27fbeb8a1e1846eb2b6c95fa62b80b (patch) | |
| tree | 57a4bb8c60320d1c434e590721db3edd3f173acf /src/map/status.c | |
| parent | f988416ad966633e3c851bd09357efa21d6e827c (diff) | |
| parent | 52df0af9dd41b0243df94b800b74a5db1c1dcfd6 (diff) | |
| download | hercules-fd1125553f27fbeb8a1e1846eb2b6c95fa62b80b.tar.gz hercules-fd1125553f27fbeb8a1e1846eb2b6c95fa62b80b.tar.bz2 hercules-fd1125553f27fbeb8a1e1846eb2b6c95fa62b80b.tar.xz hercules-fd1125553f27fbeb8a1e1846eb2b6c95fa62b80b.zip | |
Merge pull request #735 from 4144/getcellbl
Add bl parameter to getcell functions.
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/status.c b/src/map/status.c index 5ba0c688c..9a95b023c 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -1630,7 +1630,7 @@ int status_check_skilluse(struct block_list *src, struct block_list *target, uin break; case AL_TELEPORT: //Should fail when used on top of Land Protector [Skotlex] - if (src && map->getcell(src->m, src->x, src->y, CELL_CHKLANDPROTECTOR) + if (src && map->getcell(src->m, src, src->x, src->y, CELL_CHKLANDPROTECTOR) && !(st->mode&MD_BOSS) && (src->type != BL_PC || ((TBL_PC*)src)->skillitem != skill_id)) return 0; @@ -10440,7 +10440,7 @@ int status_change_end_(struct block_list* bl, enum sc_type type, int tid, const skill->unit_move(bl,timer->gettick(),1); if (opt_flag & 2 && sd) { - if (map->getcell(bl->m,bl->x,bl->y,CELL_CHKNPC)) + if (map->getcell(bl->m, bl, bl->x, bl->y, CELL_CHKNPC)) npc->touch_areanpc(sd,bl->m,bl->x,bl->y); //Trigger on-touch event. else npc->untouch_areanpc(sd, bl->m, bl->x, bl->y); |