From d6f412e47f44df59adb315665bae64c22cf64bb0 Mon Sep 17 00:00:00 2001 From: skotlex Date: Mon, 8 May 2006 23:28:03 +0000 Subject: - Removed the fixpos packet sending when damaged. Aegis sends no such packet. - Fixed warp-portal being unusable if it was invoked through an item script. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6522 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/skill.c | 5 +++-- src/map/unit.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/map/skill.c b/src/map/skill.c index 534b5f305..67bad2ee1 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -6243,8 +6243,9 @@ int skill_castend_map( struct map_session_data *sd,int skill_num, const char *ma return 0; } } - - lv = sd->skillitem==skill_num?sd->menuskill_lv:pc_checkskill(sd,skill_num); + + //When it's an item-used warp-portal, the skill-lv used is lost.. assume max level. + lv = sd->skillitem==skill_num?skill_get_max(skill_num):pc_checkskill(sd,skill_num); wx = sd->menuskill_lv>>16; wy = sd->menuskill_lv&0xffff; diff --git a/src/map/unit.c b/src/map/unit.c index bbb73ecdd..01814b296 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -676,9 +676,9 @@ int unit_set_walkdelay(struct block_list *bl, unsigned int tick, int delay, int { //Stop walking, if chasing, readjust timers. if (delay == 1) { //Minimal delay (walk-delay) disabled. Just stop walking. - unit_stop_walking(bl,1); + unit_stop_walking(bl,0); } else { - unit_stop_walking(bl,3); + unit_stop_walking(bl,2); if(ud->target) add_timer(ud->canmove_tick+1, unit_walktobl_sub, bl->id, ud->target); } -- cgit v1.2.3-70-g09d2