From bc88639096a34f465cd9697ac66117740353a856 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Sat, 12 Sep 2020 13:41:25 -0300 Subject: Partly Revert "update the call syntax of some internal functions" This reverts commit 02963c54fa43b41ed8346e243c415e777e9caa4c. --- src/emap/clif.c | 4 ++-- src/emap/init.c | 2 +- src/emap/parse.c | 8 ++++---- src/emap/script_buildins.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/emap/clif.c b/src/emap/clif.c index 660e23a..9bdb6b8 100644 --- a/src/emap/clif.c +++ b/src/emap/clif.c @@ -1483,7 +1483,7 @@ void eclif_parse_WalkToXY(int fd, if (sd->ud.state.change_walk_target == 0) { - if (unit->walk_toxy(&sd->bl, x, y, 4) == 0 && + if (unit->walktoxy(&sd->bl, x, y, 4) && sd->ud.state.change_walk_target == 1) { send_walk_fail(sd->fd, x, y); @@ -1491,7 +1491,7 @@ void eclif_parse_WalkToXY(int fd, } else { - unit->walk_toxy(&sd->bl, x, y, 4); + unit->walktoxy(&sd->bl, x, y, 4); } } diff --git a/src/emap/init.c b/src/emap/init.c index 9ecf6de..0296a98 100644 --- a/src/emap/init.c +++ b/src/emap/init.c @@ -352,7 +352,7 @@ HPExport void plugin_init (void) addHookPre(itemdb, readdb_additional_fields, eitemdb_readdb_additional_fields_pre); addHookPre(itemdb, destroy_item_data, edestroy_item_data_pre); addHookPre(unit, can_move, eunit_can_move_pre); - addHookPre(unit, walk_toxy, eunit_walktoxy_pre); + addHookPre(unit, walktoxy, eunit_walktoxy_pre); addHookPre(mail, invalid_operation, email_invalid_operation_pre); addHookPre(map, list_final, edo_final_maps_pre); addHookPre(map, cell2gat, emap_cell2gat_pre); diff --git a/src/emap/parse.c b/src/emap/parse.c index 368a5b1..833fe9c 100644 --- a/src/emap/parse.c +++ b/src/emap/parse.c @@ -161,7 +161,7 @@ void map_parse_pet_move(int fd) struct block_list *pdBl = &sd->pd->bl; if (map->getcell(pdBl->m, pdBl, x, y, CELL_CHKPASS)) - unit->walk_toxy(pdBl, x, y, 0); + unit->walktoxy(pdBl, x, y, 0); } void map_parse_pet_dir(int fd) @@ -169,7 +169,7 @@ void map_parse_pet_dir(int fd) TBL_PC* sd = (TBL_PC*)sockt->session[fd]->session_data; if (!sd || !sd->pd || !sd->bl.prev) return; - unit->set_dir(&sd->pd->bl, (enum unit_dir)RFIFOB(fd, 8)); + unit->setdir(&sd->pd->bl, RFIFOB(fd, 8)); } void map_parse_homun_say(int fd) @@ -216,9 +216,9 @@ void map_parse_homun_dir(int fd) if (!sd || !sd->bl.prev) return; if (sd->md && sd->md->db) - unit->set_dir(&sd->md->bl, (enum unit_dir)RFIFOB(fd, 8)); + unit->setdir(&sd->md->bl, RFIFOB(fd, 8)); else if (sd->hd && homun_alive(sd->hd)) - unit->set_dir(&sd->hd->bl, (enum unit_dir)RFIFOB(fd, 8)); + unit->setdir(&sd->hd->bl, RFIFOB(fd, 8)); } void map_clif_parse_useitem2(int fd) diff --git a/src/emap/script_buildins.c b/src/emap/script_buildins.c index 9fc1c90..ab3cd5a 100644 --- a/src/emap/script_buildins.c +++ b/src/emap/script_buildins.c @@ -1560,7 +1560,7 @@ BUILDIN(npcWalkTo) status_calc_npc(nd, SCO_NONE); } nd->vd.dead_sit = 0; - script_pushint(st, unit->walk_toxy(&nd->bl, x, y, 0) ^ 1); + script_pushint(st, unit->walktoxy(&nd->bl, x, y, 0)); return true; } else -- cgit v1.2.3-60-g2f50