summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-09-24 23:51:38 +0300
committerAndrei Karas <akaras@inbox.ru>2015-09-24 23:51:38 +0300
commit38e12363df013928b2c236afeefef5c71fac6020 (patch)
treeb38a29a371dfe5db0b9e665c8a5f5159415d19b9
parent55626607c4d26b070c860437fe31ba825d24c18d (diff)
downloadevol-hercules-38e12363df013928b2c236afeefef5c71fac6020.tar.gz
evol-hercules-38e12363df013928b2c236afeefef5c71fac6020.tar.bz2
evol-hercules-38e12363df013928b2c236afeefef5c71fac6020.tar.xz
evol-hercules-38e12363df013928b2c236afeefef5c71fac6020.zip
Change getcell functions calls for working with latest server sources.
-rw-r--r--src/emap/parse.c2
-rw-r--r--src/emap/unit.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/emap/parse.c b/src/emap/parse.c
index 3025aaa..f9599d0 100644
--- a/src/emap/parse.c
+++ b/src/emap/parse.c
@@ -162,7 +162,7 @@ void map_parse_pet_move(int fd)
short y = RFIFOW(fd, 8);
struct block_list *pdBl = &sd->pd->bl;
- if (map->getcell(pdBl->m, x, y, CELL_CHKPASS))
+ if (map->getcell(pdBl->m, pdBl, x, y, CELL_CHKPASS))
unit->walktoxy(pdBl, x, y, 0);
}
diff --git a/src/emap/unit.c b/src/emap/unit.c
index 9fc77da..ad661f0 100644
--- a/src/emap/unit.c
+++ b/src/emap/unit.c
@@ -134,8 +134,8 @@ int eunit_can_move(struct block_list *bl)
if(bl->type == BL_MOB)
{
TBL_MOB *md = BL_CAST(BL_MOB, bl);
- if(md && ((md->status.mode&MD_BOSS && battle->bc->boss_icewall_walk_block == 1 && map->getcell(bl->m,bl->x,bl->y,CELL_CHKICEWALL))
- || (!(md->status.mode&MD_BOSS) && battle->bc->mob_icewall_walk_block == 1 && map->getcell(bl->m,bl->x,bl->y,CELL_CHKICEWALL))))
+ if(md && ((md->status.mode&MD_BOSS && battle->bc->boss_icewall_walk_block == 1 && map->getcell(bl->m, bl, bl->x, bl->y, CELL_CHKICEWALL))
+ || (!(md->status.mode&MD_BOSS) && battle->bc->mob_icewall_walk_block == 1 && map->getcell(bl->m, bl, bl->x, bl->y, CELL_CHKICEWALL))))
{
md->walktoxy_fail_count = 1; //Make sure rudeattacked skills are invoked
hookStop();