From 35d7b2c7661bad6596a48c81f24a044a91fa346b Mon Sep 17 00:00:00 2001 From: Sara Date: Tue, 24 Mar 2009 01:56:16 +0000 Subject: * Added support for new status change packet, uses new setting display_status_timers in client.conf. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13613 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/unit.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index 194145e58..faf6ec3e3 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -435,7 +435,7 @@ int unit_run(struct block_list *bl) if(to_x == bl->x && to_y == bl->y) { //If you can't run forward, you must be next to a wall, so bounce back. [Skotlex] - clif_status_change(bl, SI_BUMP, 1); + clif_status_change(bl, SI_BUMP, 1, 0); //Set running to 0 beforehand so status_change_end knows not to enable spurt [Kevin] unit_bl2ud(bl)->state.running = 0; @@ -443,7 +443,7 @@ int unit_run(struct block_list *bl) skill_blown(bl,bl,skill_get_blewcount(TK_RUN,lv),unit_getdir(bl),0); clif_fixpos(bl); //Why is a clif_slide (skill_blown) AND a fixpos needed? Ask Aegis. - clif_status_change(bl, SI_BUMP, 0); + clif_status_change(bl, SI_BUMP, 0, 0); return 0; } if (unit_walktoxy(bl, to_x, to_y, 1)) @@ -455,7 +455,7 @@ int unit_run(struct block_list *bl) } while (--i > 0 && !unit_walktoxy(bl, to_x, to_y, 1)); if (i==0) { // copy-paste from above - clif_status_change(bl, SI_BUMP, 1); + clif_status_change(bl, SI_BUMP, 1, 0); //Set running to 0 beforehand so status_change_end knows not to enable spurt [Kevin] unit_bl2ud(bl)->state.running = 0; @@ -463,7 +463,7 @@ int unit_run(struct block_list *bl) skill_blown(bl,bl,skill_get_blewcount(TK_RUN,lv),unit_getdir(bl),0); clif_fixpos(bl); - clif_status_change(bl, SI_BUMP, 0); + clif_status_change(bl, SI_BUMP, 0, 0); return 0; } return 1; @@ -1070,6 +1070,8 @@ int unit_skilluse_id2(struct block_list *src, int target_id, short skill_num, sh ud->state.skillcastcancel = 0; ud->canact_tick = tick + casttime + 100; + if ( sd ) + clif_status_change(bl, SI_ACTIONDELAY, 1, ud->canact_tick); ud->skilltarget = target_id; ud->skillx = 0; ud->skilly = 0; @@ -1175,6 +1177,8 @@ int unit_skilluse_pos2( struct block_list *src, short skill_x, short skill_y, sh ud->state.skillcastcancel=0; ud->canact_tick = tick + casttime + 100; + if ( sd ) + clif_status_change(bl, SI_ACTIONDELAY, 1, ud->canact_tick); ud->skillid = skill_num; ud->skilllv = skill_lv; ud->skillx = skill_x; @@ -1591,6 +1595,8 @@ int unit_skillcastcancel(struct block_list *bl,int type) } ud->canact_tick = tick; + if ( sd ) + clif_status_change(bl, SI_ACTIONDELAY, 1, ud->canact_tick); if(type&1 && sd) skill = sd->skillid_old; -- cgit v1.2.3-60-g2f50